diff options
Diffstat (limited to 'sysutils/gnome-control-center')
| -rw-r--r-- | sysutils/gnome-control-center/Makefile | 15 | ||||
| -rw-r--r-- | sysutils/gnome-control-center/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/gnome-control-center/files/patch-configure | 27 | ||||
| -rw-r--r-- | sysutils/gnome-control-center/pkg-plist | 3 |
4 files changed, 14 insertions, 33 deletions
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 5ebca05347ce..ecdf05649395 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= 2.0.0/releases/gnome-2.0-desktop-final +MASTER_SITE_SUBDIR= 2.0.0/sources/control-center DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,20 +21,15 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomehier USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: +post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ - 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ - s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index 00226dd4317c..7c306cc37edc 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1 +1 @@ -MD5 (gnome2/control-center-2.0.0.tar.bz2) = aeb1e8ddfd98511baaf73030674813ad +MD5 (gnome2/control-center-2.0.1.tar.bz2) = 5bdade1003b85f84a37a02bf87d09168 diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure index 595398730551..f43c53c1ec2b 100644 --- a/sysutils/gnome-control-center/files/patch-configure +++ b/sysutils/gnome-control-center/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Jun 17 17:54:50 2002 -+++ configure Tue Jun 25 22:10:20 2002 -@@ -8102,6 +8102,7 @@ +--- configure.orig Tue Aug 6 01:33:52 2002 ++++ configure Wed Aug 7 01:22:14 2002 +@@ -5768,6 +5768,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,27 +8,12 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -12782,7 +12783,7 @@ +@@ -9090,7 +9091,7 @@ fi - cat >>confdefs.h <<_ACEOF + cat >> confdefs.h <<EOF -#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}" +#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}" - _ACEOF + EOF GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons' -@@ -13487,11 +13488,11 @@ - s,@XF86MISC_LIBS@,$XF86MISC_LIBS,;t t - s,@PKG_CONFIG@,$PKG_CONFIG,;t t - s,@CAPPLET_CFLAGS@,$CAPPLET_CFLAGS,;t t --s,@CAPPLET_LIBS@,$CAPPLET_LIBS,;t t -+s~@CAPPLET_LIBS@~$CAPPLET_LIBS~;t t - s,@GNOMECC_CFLAGS@,$GNOMECC_CFLAGS,;t t --s,@GNOMECC_LIBS@,$GNOMECC_LIBS,;t t -+s~@GNOMECC_LIBS@~$GNOMECC_LIBS~;t t - s,@GNOME_SETTINGS_DAEMON_CFLAGS@,$GNOME_SETTINGS_DAEMON_CFLAGS,;t t --s,@GNOME_SETTINGS_DAEMON_LIBS@,$GNOME_SETTINGS_DAEMON_LIBS,;t t -+s~@GNOME_SETTINGS_DAEMON_LIBS@~$GNOME_SETTINGS_DAEMON_LIBS~;t t - s,@OLD_CAPPLET_CFLAGS@,$OLD_CAPPLET_CFLAGS,;t t - s,@OLD_CAPPLET_LIBS@,$OLD_CAPPLET_LIBS,;t t - s,@GNOME_CFLAGS@,$GNOME_CFLAGS,;t t diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index f3419e8bd636..c60826d84e5d 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -53,7 +53,7 @@ share/gnome/control-center-2.0/icons/sound-capplet.png share/gnome/control-center-2.0/interfaces/background-properties.glade share/gnome/control-center-2.0/interfaces/file-types-properties.glade share/gnome/control-center-2.0/interfaces/font-properties.glade -share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade2 +share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade @@ -61,6 +61,7 @@ share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade share/gnome/control-center-2.0/interfaces/sound-properties.glade +share/gnome/control-center-2.0/interfaces/theme-install.glade share/gnome/control-center-2.0/interfaces/theme-properties.glade share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png |