diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-01-17 01:33:11 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-01-17 01:33:11 +0800 |
| commit | ea7825637e873d54dc62e03bb22109fbc9e3dda4 (patch) | |
| tree | ebcccbcc8043f06e5321749d45dc25c9766ff8b7 | |
| parent | d09dd7af26bef67a20bb62d0dafd8a870a4ff366 (diff) | |
| download | marcuscom-ports-ea7825637e873d54dc62e03bb22109fbc9e3dda4.tar marcuscom-ports-ea7825637e873d54dc62e03bb22109fbc9e3dda4.tar.gz marcuscom-ports-ea7825637e873d54dc62e03bb22109fbc9e3dda4.tar.bz2 marcuscom-ports-ea7825637e873d54dc62e03bb22109fbc9e3dda4.tar.lz marcuscom-ports-ea7825637e873d54dc62e03bb22109fbc9e3dda4.tar.xz marcuscom-ports-ea7825637e873d54dc62e03bb22109fbc9e3dda4.tar.zst marcuscom-ports-ea7825637e873d54dc62e03bb22109fbc9e3dda4.zip | |
Remove depends on pkgconfig
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16643 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/gio-fam-backend/Makefile | 12 | ||||
| -rw-r--r-- | devel/glib20/Makefile | 13 |
2 files changed, 17 insertions, 8 deletions
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index 493e311a7..af5cb2194 100644 --- a/devel/gio-fam-backend/Makefile +++ b/devel/gio-fam-backend/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.87 2011/10/28 19:03:26 kwm Exp $ +# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.88 2011/11/12 14:44:17 kwm Exp $ # PORTNAME= gio-fam-backend PORTVERSION= 2.30.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ @@ -28,13 +28,17 @@ BUILD_WRKSRC= ${WRKSRC}/gio/fam INSTALL_WRKSRC= ${BUILD_WRKSRC} WITH_FBSD10_FIX=yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack pkgconfig _glib20 +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}" + 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" CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 7faeed1f6..b7936b1e2 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,13 +3,13 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.216 2011/11/12 14:44:16 kwm Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.217 2012/01/15 15:56:09 ahze Exp $ # # !! DON'T FORGET ABOUT devel/gio-fam-backend !! PORTNAME= glib PORTVERSION= 2.30.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ @@ -37,7 +37,7 @@ LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre \ USE_GETTEXT= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig ltverhack +USE_GNOME= gnomehack ltverhack USE_GMAKE= yes MAKE_JOBS_SAFE= yes USE_PYTHON= 2.5+ @@ -50,7 +50,12 @@ 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}" + 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" + OPTIONS= COLLATION_FIX "fix string collation" off |