diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-07-26 17:09:58 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-07-26 17:09:58 +0800 |
| commit | ad8cbff4bc5211873b0df5c22096f9fd707d966f (patch) | |
| tree | 80ffbbd15096d6bd9247562db0150db14a0b231a /devel | |
| parent | 4f07400564dbba6a49a91aedb09fa3316b11234c (diff) | |
| download | marcuscom-ports-ad8cbff4bc5211873b0df5c22096f9fd707d966f.tar marcuscom-ports-ad8cbff4bc5211873b0df5c22096f9fd707d966f.tar.gz marcuscom-ports-ad8cbff4bc5211873b0df5c22096f9fd707d966f.tar.bz2 marcuscom-ports-ad8cbff4bc5211873b0df5c22096f9fd707d966f.tar.lz marcuscom-ports-ad8cbff4bc5211873b0df5c22096f9fd707d966f.tar.xz marcuscom-ports-ad8cbff4bc5211873b0df5c22096f9fd707d966f.tar.zst marcuscom-ports-ad8cbff4bc5211873b0df5c22096f9fd707d966f.zip | |
Ok I got this mixed up.
Readd pkgconfig_RUN_DEPEND.
Switch glib20 to use USE_PKGCONFIG=build
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17002 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gio-fam-backend/Makefile | 9 | ||||
| -rw-r--r-- | devel/glib20/Makefile | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index 78e48e3a7..d32ce63ef 100644 --- a/devel/gio-fam-backend/Makefile +++ b/devel/gio-fam-backend/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.92 2012/06/18 15:23:59 kwm Exp $ +# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.93 2012/07/15 11:44:25 kwm Exp $ # PORTNAME= gio-fam-backend @@ -27,17 +27,14 @@ USE_XZ= yes BUILD_WRKSRC= ${WRKSRC}/gio/fam INSTALL_WRKSRC= ${BUILD_WRKSRC} GNU_CONFIGURE= yes +USE_PKGCONFIG= build USE_GNOME= gnomehack _glib20 USE_FAM= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - LIBFFI_CFLAGS="-I${LOCALBASE}/include" \ - LIBFFI_LIBS="-L${LOCALBASE}/lib -lffi" \ - PCRE_CFLAGS="-I${LOCALBASE}/include" \ - PCRE_LIBS="-L${LOCALBASE}/lib -lpcre" + PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 92391cc44..4e43f9fc3 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,7 +3,7 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.224 2012/06/28 13:51:28 marcus Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.225 2012/07/15 11:44:25 kwm Exp $ # # !! DON'T FORGET ABOUT devel/gio-fam-backend !! @@ -32,6 +32,7 @@ USE_GETTEXT= yes USE_ICONV= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes +USE_PKGCONFIG= build USE_GNOME= gnomehack ltverhack USE_GMAKE= yes MAKE_JOBS_SAFE= yes @@ -45,11 +46,7 @@ CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - LIBFFI_CFLAGS="-I${LOCALBASE}/include" \ - LIBFFI_LIBS="-L${LOCALBASE}/lib -lffi" \ - PCRE_CFLAGS="-I${LOCALBASE}/include" \ - PCRE_LIBS="-L${LOCALBASE}/lib -lpcre" + PTHREAD_LIBS="${PTHREAD_LIBS}" OPTIONS= COLLATION_FIX "fix string collation" off |