diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-05-30 11:21:48 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-05-30 11:21:48 +0800 |
| commit | 78528de43298daf57dd78edf92bdf16d3f5c2bbb (patch) | |
| tree | 7e4858a66869a1f04f72f771d443782a53b64ddf /sysutils | |
| parent | e86de175775ca952cf8d092ad3c8216e3fd74dbd (diff) | |
| download | marcuscom-ports-78528de43298daf57dd78edf92bdf16d3f5c2bbb.tar marcuscom-ports-78528de43298daf57dd78edf92bdf16d3f5c2bbb.tar.gz marcuscom-ports-78528de43298daf57dd78edf92bdf16d3f5c2bbb.tar.bz2 marcuscom-ports-78528de43298daf57dd78edf92bdf16d3f5c2bbb.tar.lz marcuscom-ports-78528de43298daf57dd78edf92bdf16d3f5c2bbb.tar.xz marcuscom-ports-78528de43298daf57dd78edf92bdf16d3f5c2bbb.tar.zst marcuscom-ports-78528de43298daf57dd78edf92bdf16d3f5c2bbb.zip | |
Get rid of X11BASE and replace a few to LOCALBASE. I only touch these ports
that are maintaining by gnome@, ports@ and my team ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8939 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gnome-control-center/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/gnome-pkgview/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/gnome-pkgview/files/patch-src_config-path.c | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index cbf72cf20..00cfb4d9e 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.136 2007/05/06 04:04:45 marcus Exp $ +# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.137 2007/05/19 21:36:22 marcus Exp $ # PORTNAME= gnome-control-center @@ -33,8 +33,8 @@ INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-gstreamer=0.10 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ apps_gnome_settings_daemon_keybindings.schemas \ diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile index 1bb84cf90..a96b6412e 100644 --- a/sysutils/gnome-pkgview/Makefile +++ b/sysutils/gnome-pkgview/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-pkgview/Makefile,v 1.4 2007/05/01 16:47:34 ahze Exp $ +# $MCom: ports/sysutils/gnome-pkgview/Makefile,v 1.5 2007/05/19 21:36:23 marcus Exp $ PORTNAME= gnome-pkgview PORTVERSION= 1.0.6 @@ -26,7 +26,6 @@ GCONF_SCHEMAS= gnome-pkgview.schemas post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/src/config-path.c + ${WRKSRC}/src/config-path.c .include <bsd.port.mk> diff --git a/sysutils/gnome-pkgview/files/patch-src_config-path.c b/sysutils/gnome-pkgview/files/patch-src_config-path.c index 2eed9821d..b61d1cedc 100644 --- a/sysutils/gnome-pkgview/files/patch-src_config-path.c +++ b/sysutils/gnome-pkgview/files/patch-src_config-path.c @@ -7,7 +7,7 @@ - if ( getenv ("PKG_CONFIG_PATH") ) { - path = g_strconcat(getenv("PKG_CONFIG_PATH"),":DIRS_DONE",NULL); - } -+ path = "%%LOCALBASE%%/libdata/pkgconfig:%%X11BASE%%/libdata/pkgconfig:DIRS_DONE"; ++ path = "%%LOCALBASE%%/libdata/pkgconfig:DIRS_DONE"; /* walk the PKG_CONFIG_PATH for other files */ if ( path ) { |