diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-08-18 03:06:48 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-08-18 03:06:48 +0800 |
| commit | e1fad6b7b570f2f5685fb302a460b50679e04ae8 (patch) | |
| tree | 6bdaaaa51925e10719a04696aa74e5d389db0195 /deskutils | |
| parent | d6f2b76b19d2ae10403b675e549d5d5a8279079d (diff) | |
| download | marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.gz marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.bz2 marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.lz marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.xz marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.zst marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.zip | |
Sync with freebsd ports. portrevision bumping, getting CPPFLAGS/LDFLAGS from
CONFIGURE_ENV, s/CPPFLAGS=/CPPFLAGS+=/ etc
Sprinkle USE_PKGCONFIG in some ports.
Some small nits here and there.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17047 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/gnome-utils/Makefile | 7 | ||||
| -rw-r--r-- | deskutils/gucharmap/Makefile | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 65f0ec586..bb3d9515c 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.156 2011/12/06 13:43:48 kwm Exp $ +# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.157 2012/05/31 15:11:23 kwm Exp $ # PORTNAME= gnome-utils PORTVERSION= 2.32.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME @@ -32,8 +33,8 @@ INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel ltverhack USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --enable-maintainer-flags=no -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= gnome-dictionary.1 gnome-screenshot.1 gnome-search-tool.1 \ gnome-system-log.1 baobab.1 diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index 3ac3c82f4..0217585cd 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gucharmap/Makefile,v 1.78 2011/04/30 20:43:14 mezz Exp $ +# $MCom: ports/deskutils/gucharmap/Makefile,v 1.79 2011/06/11 19:51:12 mezz Exp $ # PORTNAME= gucharmap @@ -26,8 +26,8 @@ USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2 GNU_CONFIGURE= yes INSTALLS_OMF= yes USE_LDCONFIG= yes -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= gucharmap.schemas |