Sun Nov 17 05:40:20 2019 UTC ()
Pullup ticket #6080 - requested by bouyer
geography/opencpn: build fix

Revisions pulled up:
- geography/opencpn/Makefile                                    1.37

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Sun Oct 27 17:44:33 UTC 2019

   Modified Files:
   	pkgsrc/geography/opencpn: Makefile

   Log Message:
   Hack to make it build with new pango (pango-coverage.h does
   #include <hb.h>)

   To generate a diff of this commit:
   cvs rdiff -u -r1.36 -r1.37 pkgsrc/geography/opencpn/Makefile


(spz)
diff -r1.35 -r1.35.2.1 pkgsrc/geography/opencpn/Makefile
cvs diff -r1.35 -r1.35.2.1 pkgsrc/geography/opencpn/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/opencpn/Makefile 2019/08/22 12:23:15 1.35
+++ pkgsrc/geography/opencpn/Makefile 2019/11/17 05:40:20 1.35.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.35 2019/08/22 12:23:15 ryoon Exp $ 1# $NetBSD: Makefile,v 1.35.2.1 2019/11/17 05:40:20 spz Exp $
2 2
3DISTNAME= OpenCPN-5.0.0 3DISTNAME= OpenCPN-5.0.0
4PKGNAME= ${DISTNAME:S/OpenCPN/opencpn/} 4PKGNAME= ${DISTNAME:S/OpenCPN/opencpn/}
5PKGREVISION= 4 5PKGREVISION= 4
6#PKGREVISION= 1 6#PKGREVISION= 1
7CATEGORIES= geography 7CATEGORIES= geography
8MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenCPN/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenCPN/}
9GITHUB_PROJECT= OpenCPN 9GITHUB_PROJECT= OpenCPN
10GITHUB_TAG= v5.0.0 10GITHUB_TAG= v5.0.0
11EXTRACT_SUFX= .zip 11EXTRACT_SUFX= .zip
12 12
13MAINTAINER= bouyer@NetBSD.org 13MAINTAINER= bouyer@NetBSD.org
14HOMEPAGE= http://www.opencpn.org/ 14HOMEPAGE= http://www.opencpn.org/
@@ -31,24 +31,28 @@ CMAKE_MODULE_PATH_OVERRIDE = \ @@ -31,24 +31,28 @@ CMAKE_MODULE_PATH_OVERRIDE = \
31 31
32SUBST_CLASSES+= prefix 32SUBST_CLASSES+= prefix
33SUBST_STAGE.prefix= pre-configure 33SUBST_STAGE.prefix= pre-configure
34SUBST_MESSAGE.prefix= replace /usr/local with ${PREFIX} 34SUBST_MESSAGE.prefix= replace /usr/local with ${PREFIX}
35SUBST_FILES.prefix= src/mygdal/cpl_csv.cpp \ 35SUBST_FILES.prefix= src/mygdal/cpl_csv.cpp \
36 src/mygdal/cpl_findfile.cpp \ 36 src/mygdal/cpl_findfile.cpp \
37 data/doc/help_en_US.html \ 37 data/doc/help_en_US.html \
38 Findgps.cmake 38 Findgps.cmake
39SUBST_SED.prefix= -e s,"/usr/local,"${PREFIX},g 39SUBST_SED.prefix= -e s,"/usr/local,"${PREFIX},g
40 40
41# Ensure we export symbols in the linked shared object. 41# Ensure we export symbols in the linked shared object.
42LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} 42LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
43 43
 44# hack so that pango find harfbuzz's headers
 45CFLAGS+= -I${PREFIX}/include/harfbuzz
 46CXXFLAGS+= -I${PREFIX}/include/harfbuzz
 47
44.include "../../audio/libsndfile/buildlink3.mk" 48.include "../../audio/libsndfile/buildlink3.mk"
45.include "../../devel/cmake/buildlink3.mk" 49.include "../../devel/cmake/buildlink3.mk"
46.include "../../x11/wxGTK30/buildlink3.mk" 50.include "../../x11/wxGTK30/buildlink3.mk"
47.include "../../graphics/libexif/buildlink3.mk" 51.include "../../graphics/libexif/buildlink3.mk"
48.include "../../archivers/bzip2/buildlink3.mk" 52.include "../../archivers/bzip2/buildlink3.mk"
49.include "../../audio/portaudio-devel/buildlink3.mk" 53.include "../../audio/portaudio-devel/buildlink3.mk"
50.include "../../textproc/tinyxml/buildlink3.mk" 54.include "../../textproc/tinyxml/buildlink3.mk"
51.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 55.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
52.include "../../sysutils/desktop-file-utils/desktopdb.mk" 56.include "../../sysutils/desktop-file-utils/desktopdb.mk"
53.include "../../www/curl/buildlink3.mk" 57.include "../../www/curl/buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 58.include "../../mk/bsd.pkg.mk"