diff options
author | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 07:17:31 +0000 |
---|---|---|
committer | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 07:17:31 +0000 |
commit | c76cf46929051f9dd322487d888c82f104026e6d (patch) | |
tree | f415aeddadc6782b1474ebd88710bfa86cf08711 /net | |
parent | Implement USE_GNOME, part 1. (diff) |
Implement USE_GNOME, part 2.
Notes
Notes:
svn path=/head/; revision=33429
Diffstat (limited to 'net')
-rw-r--r-- | net/ayttm/Makefile | 19 | ||||
-rw-r--r-- | net/ayttm/files/patch-ae | 2 | ||||
-rw-r--r-- | net/ayttm/files/patch-af | 14 | ||||
-rw-r--r-- | net/ayttm/pkg-plist | 13 | ||||
-rw-r--r-- | net/crescendo/Makefile | 11 | ||||
-rw-r--r-- | net/everybuddy/Makefile | 19 | ||||
-rw-r--r-- | net/everybuddy/files/patch-ae | 2 | ||||
-rw-r--r-- | net/everybuddy/files/patch-af | 14 | ||||
-rw-r--r-- | net/everybuddy/pkg-plist | 13 | ||||
-rw-r--r-- | net/gabber/Makefile | 19 | ||||
-rw-r--r-- | net/gabber/files/patch-ae | 2 | ||||
-rw-r--r-- | net/gabber/files/patch-ai | 6 | ||||
-rw-r--r-- | net/gabber/pkg-plist | 30 | ||||
-rw-r--r-- | net/gnomba/Makefile | 17 | ||||
-rw-r--r-- | net/gnomba/files/patch-ac | 11 | ||||
-rw-r--r-- | net/gnomeicu/Makefile | 10 | ||||
-rw-r--r-- | net/gnomeicu/gnomeicu/Makefile | 10 | ||||
-rw-r--r-- | net/gnomeicu2/Makefile | 10 | ||||
-rw-r--r-- | net/gnometelnet/Makefile | 14 | ||||
-rw-r--r-- | net/gnosamba/Makefile | 6 |
20 files changed, 123 insertions, 119 deletions
diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile index 2b1f8a032240..9277130cfde5 100644 --- a/net/ayttm/Makefile +++ b/net/ayttm/Makefile @@ -6,28 +6,19 @@ # PORTNAME= everybuddy -PORTVERSION= 0.1.4-2 +PORTVERSION= 0.1.4.2 PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.everybuddy.com/files/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.2/-2/} MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - esd.2:${PORTSDIR}/audio/esound - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -GNU_CONFIGURE= yes USE_X_PREFIX= yes - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" +USE_GMAKE= yes +USE_GNOME= yes +GNU_CONFIGURE= yes MAN1= everybuddy.1 -post-patch: - @${CP} ${FILESDIR}/config.h ${WRKSRC}/src - .include <bsd.port.mk> diff --git a/net/ayttm/files/patch-ae b/net/ayttm/files/patch-ae index 4918144ca31d..554421bb9cda 100644 --- a/net/ayttm/files/patch-ae +++ b/net/ayttm/files/patch-ae @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 -Utilitiesdir = /etc/X11/applnk/Internet -+Utilitiesdir = ${PREFIX}/share/applnk/Internet ++Utilitiesdir = $(datadir)/apps/Internet Utilities_DATA = Everybuddy.desktop EXTRA_DIST = Everybuddy.desktop diff --git a/net/ayttm/files/patch-af b/net/ayttm/files/patch-af new file mode 100644 index 000000000000..9380f8dd1e94 --- /dev/null +++ b/net/ayttm/files/patch-af @@ -0,0 +1,14 @@ +--- src/config.sh.in.orig Sun Oct 1 23:04:45 2000 ++++ src/config.sh.in Sun Oct 1 23:06:02 2000 +@@ -1,6 +1,6 @@ + #!/bin/sh +-rm config.h >& /dev/null +-echo \#define BuddyArriveDefault \"@prefix@/share/sounds/everybuddy/BuddyArrive.au\" >> config.h +-echo \#define BuddyLeaveDefault \"@prefix@/share/sounds/everybuddy/BuddyLeave.au\" >> config.h +-echo \#define SendDefault \"@prefix@/share/sounds/everybuddy/Send.au\" >> config.h +-echo \#define RecieveDefault \"@prefix@/share/sounds/everybuddy/Receive.au\" >> config.h ++rm config.h 2> /dev/null ++echo \#define BuddyArriveDefault \"@datadir@/sounds/everybuddy/BuddyArrive.au\" >> config.h ++echo \#define BuddyLeaveDefault \"@datadir@/sounds/everybuddy/BuddyLeave.au\" >> config.h ++echo \#define SendDefault \"@datadir@/sounds/everybuddy/Send.au\" >> config.h ++echo \#define RecieveDefault \"@datadir@/sounds/everybuddy/Receive.au\" >> config.h diff --git a/net/ayttm/pkg-plist b/net/ayttm/pkg-plist index 461b438122d9..519ff0959c11 100644 --- a/net/ayttm/pkg-plist +++ b/net/ayttm/pkg-plist @@ -1,9 +1,10 @@ bin/everybuddy bin/update.pl bin/contact-update.pl -share/applnk/Internet/Everybuddy.desktop -share/pixmaps/ebicon.xpm -share/sounds/everybuddy/BuddyArrive.au -share/sounds/everybuddy/BuddyLeave.au -share/sounds/everybuddy/Send.au -share/sounds/everybuddy/Receive.au +share/gnome/apps/Internet/Everybuddy.desktop +share/gnome/pixmaps/ebicon.xpm +share/gnome/sounds/everybuddy/BuddyArrive.au +share/gnome/sounds/everybuddy/BuddyLeave.au +share/gnome/sounds/everybuddy/Send.au +share/gnome/sounds/everybuddy/Receive.au +@dirrm share/gnome/sounds/everybuddy diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile index 2ef10ab86e72..5285c798b8c2 100644 --- a/net/crescendo/Makefile +++ b/net/crescendo/Makefile @@ -11,21 +11,14 @@ MASTER_SITES= http://crescendo.dpnd.com/files/ MAINTAINER= dirk.meyer@dinoex.sub.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs RUN_DEPENDS= tf:${PORTSDIR}/net/tinyfugue -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes -CONFIGURE_ARGS+= --enable-compile-warnings=yes -CONFIGURE_ARGS+= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} +CONFIGURE_ARGS= --enable-compile-warnings=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" CFLAGS+= -g PLIST_SUB= DOCDIR=${DOCDIR} diff --git a/net/everybuddy/Makefile b/net/everybuddy/Makefile index 2b1f8a032240..9277130cfde5 100644 --- a/net/everybuddy/Makefile +++ b/net/everybuddy/Makefile @@ -6,28 +6,19 @@ # PORTNAME= everybuddy -PORTVERSION= 0.1.4-2 +PORTVERSION= 0.1.4.2 PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.everybuddy.com/files/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.2/-2/} MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - esd.2:${PORTSDIR}/audio/esound - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -GNU_CONFIGURE= yes USE_X_PREFIX= yes - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" +USE_GMAKE= yes +USE_GNOME= yes +GNU_CONFIGURE= yes MAN1= everybuddy.1 -post-patch: - @${CP} ${FILESDIR}/config.h ${WRKSRC}/src - .include <bsd.port.mk> diff --git a/net/everybuddy/files/patch-ae b/net/everybuddy/files/patch-ae index 4918144ca31d..554421bb9cda 100644 --- a/net/everybuddy/files/patch-ae +++ b/net/everybuddy/files/patch-ae @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 -Utilitiesdir = /etc/X11/applnk/Internet -+Utilitiesdir = ${PREFIX}/share/applnk/Internet ++Utilitiesdir = $(datadir)/apps/Internet Utilities_DATA = Everybuddy.desktop EXTRA_DIST = Everybuddy.desktop diff --git a/net/everybuddy/files/patch-af b/net/everybuddy/files/patch-af new file mode 100644 index 000000000000..9380f8dd1e94 --- /dev/null +++ b/net/everybuddy/files/patch-af @@ -0,0 +1,14 @@ +--- src/config.sh.in.orig Sun Oct 1 23:04:45 2000 ++++ src/config.sh.in Sun Oct 1 23:06:02 2000 +@@ -1,6 +1,6 @@ + #!/bin/sh +-rm config.h >& /dev/null +-echo \#define BuddyArriveDefault \"@prefix@/share/sounds/everybuddy/BuddyArrive.au\" >> config.h +-echo \#define BuddyLeaveDefault \"@prefix@/share/sounds/everybuddy/BuddyLeave.au\" >> config.h +-echo \#define SendDefault \"@prefix@/share/sounds/everybuddy/Send.au\" >> config.h +-echo \#define RecieveDefault \"@prefix@/share/sounds/everybuddy/Receive.au\" >> config.h ++rm config.h 2> /dev/null ++echo \#define BuddyArriveDefault \"@datadir@/sounds/everybuddy/BuddyArrive.au\" >> config.h ++echo \#define BuddyLeaveDefault \"@datadir@/sounds/everybuddy/BuddyLeave.au\" >> config.h ++echo \#define SendDefault \"@datadir@/sounds/everybuddy/Send.au\" >> config.h ++echo \#define RecieveDefault \"@datadir@/sounds/everybuddy/Receive.au\" >> config.h diff --git a/net/everybuddy/pkg-plist b/net/everybuddy/pkg-plist index 461b438122d9..519ff0959c11 100644 --- a/net/everybuddy/pkg-plist +++ b/net/everybuddy/pkg-plist @@ -1,9 +1,10 @@ bin/everybuddy bin/update.pl bin/contact-update.pl -share/applnk/Internet/Everybuddy.desktop -share/pixmaps/ebicon.xpm -share/sounds/everybuddy/BuddyArrive.au -share/sounds/everybuddy/BuddyLeave.au -share/sounds/everybuddy/Send.au -share/sounds/everybuddy/Receive.au +share/gnome/apps/Internet/Everybuddy.desktop +share/gnome/pixmaps/ebicon.xpm +share/gnome/sounds/everybuddy/BuddyArrive.au +share/gnome/sounds/everybuddy/BuddyLeave.au +share/gnome/sounds/everybuddy/Send.au +share/gnome/sounds/everybuddy/Receive.au +@dirrm share/gnome/sounds/everybuddy diff --git a/net/gabber/Makefile b/net/gabber/Makefile index f4311e1d3614..e0e2fd9645b7 100644 --- a/net/gabber/Makefile +++ b/net/gabber/Makefile @@ -13,23 +13,26 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= erich@tacni.net -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gtkmm-1.2.1:${PORTSDIR}/x11-toolkits/gtk-- \ - gnomemm-1.1.3:${PORTSDIR}/x11-toolkits/gnome-- \ +LIB_DEPENDS= gtkmm.1:${PORTSDIR}/x11-toolkits/gtk-- \ + gnomemm.3:${PORTSDIR}/x11-toolkits/gnome-- \ sigc.1:${PORTSDIR}/devel/libsigc++ \ gnet.0:${PORTSDIR}/net/gnet \ glade.4:${PORTSDIR}/devel/libglade -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes LIBTOOLFILES= configure jabberoo/configure -CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \ - GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \ +CONFIGURE_ENV+= GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include <bsd.port.mk> diff --git a/net/gabber/files/patch-ae b/net/gabber/files/patch-ae index 09ef23a237e2..d2b9e22711ba 100644 --- a/net/gabber/files/patch-ae +++ b/net/gabber/files/patch-ae @@ -5,6 +5,6 @@ static const char* GABBER_GLADEFILE = "@prefix@/share/gabber/gabber.glade"; static const char* GABBER_CONFIG = "/Gabber/"; -static const char* GABBER_PIXPATH = "@prefix@/share/pixmaps/gabber/"; -+static const char* GABBER_PIXPATH = "@prefix@/share/gnome/pixmaps/gabber/"; ++static const char* GABBER_PIXPATH = "@datadir@/pixmaps/gabber/"; diff --git a/net/gabber/files/patch-ai b/net/gabber/files/patch-ai index 074375922acb..3ff1a30660ca 100644 --- a/net/gabber/files/patch-ai +++ b/net/gabber/files/patch-ai @@ -1,3 +1,9 @@ +--- jabberoo/Makefile.am.orig Wed Sep 13 12:18:07 2000 ++++ jabberoo/Makefile.am Wed Sep 13 12:18:11 2000 +@@ -1,2 +1,2 @@ + EXTRA_DIST = include +-SUBDIRS = expat src test ++SUBDIRS = expat src --- jabberoo/Makefile.in.orig Mon Jul 31 23:38:31 2000 +++ jabberoo/Makefile.in Tue Sep 12 15:00:38 2000 @@ -69,7 +69,7 @@ diff --git a/net/gabber/pkg-plist b/net/gabber/pkg-plist index 1a74ade0f18a..6490e1ac00d2 100644 --- a/net/gabber/pkg-plist +++ b/net/gabber/pkg-plist @@ -1,19 +1,19 @@ bin/gabber -share/gabber/gabber.glade -share/gabber/glade-delete-user-menu.xpm -share/gabber/glade-delete-user.xpm -share/gabber/glade-edit-user-menu.xpm -share/gabber/glade-edit-user.xpm -share/gabber/glade-gabber-logo.png -share/gabber/glade-message.xpm -share/gabber/glade-new-user-menu.xpm -share/gabber/glade-new-user.xpm -share/gabber/glade-noclose.xpm -share/gabber/glade-ooochat.xpm -share/gabber/glade-s10n.xpm -share/gabber/glade-sendasooo.xpm -share/gabber/glade-users.xpm share/gnome/apps/Internet/gabber.desktop +share/gnome/gabber/gabber.glade +share/gnome/gabber/glade-delete-user-menu.xpm +share/gnome/gabber/glade-delete-user.xpm +share/gnome/gabber/glade-edit-user-menu.xpm +share/gnome/gabber/glade-edit-user.xpm +share/gnome/gabber/glade-gabber-logo.png +share/gnome/gabber/glade-message.xpm +share/gnome/gabber/glade-new-user-menu.xpm +share/gnome/gabber/glade-new-user.xpm +share/gnome/gabber/glade-noclose.xpm +share/gnome/gabber/glade-ooochat.xpm +share/gnome/gabber/glade-s10n.xpm +share/gnome/gabber/glade-sendasooo.xpm +share/gnome/gabber/glade-users.xpm share/gnome/help/gabber/C/agents-available.png share/gnome/help/gabber/C/agents-register.png share/gnome/help/gabber/C/agents.html @@ -84,4 +84,4 @@ share/locale/en_SE/LC_MESSAGES/gabber.mo @dirrm share/gnome/help/gabber/C/stylesheet-images @dirrm share/gnome/help/gabber/C @dirrm share/gnome/help/gabber -@dirrm share/gabber +@dirrm share/gnome/gabber diff --git a/net/gnomba/Makefile b/net/gnomba/Makefile index 15c972b44a2d..ce5e7580d703 100644 --- a/net/gnomba/Makefile +++ b/net/gnomba/Makefile @@ -13,16 +13,21 @@ MASTER_SITES= http://gnomba.darkcorner.net/tars/ \ MAINTAINER= dima@Chg.RU -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' pre-configure: - ${RM} ${WRKSRC}/config.cache + ${RM} ${WRKSRC}/config.cache .include <bsd.port.mk> diff --git a/net/gnomba/files/patch-ac b/net/gnomba/files/patch-ac new file mode 100644 index 000000000000..e56e855838d4 --- /dev/null +++ b/net/gnomba/files/patch-ac @@ -0,0 +1,11 @@ +--- configure.orig Thu Feb 10 01:53:13 2000 ++++ configure Thu Feb 10 01:54:54 2000 +@@ -3440,7 +3440,7 @@ + < $srcdir/po/POTFILES.in > po/POTFILES + + +-localedir=${datadir}/locale ++localedir=${prefix}/${DATADIRNAME}/locale + + + trap '' 1 2 15 diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile index fd93b079b355..124cd7d0d9f4 100644 --- a/net/gnomeicu/Makefile +++ b/net/gnomeicu/Makefile @@ -15,18 +15,14 @@ MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \ MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gdbm.2:${PORTSDIR}/databases/gdbm - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm USE_X_PREFIX= yes USE_BZIP2= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile index fd93b079b355..124cd7d0d9f4 100644 --- a/net/gnomeicu/gnomeicu/Makefile +++ b/net/gnomeicu/gnomeicu/Makefile @@ -15,18 +15,14 @@ MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \ MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gdbm.2:${PORTSDIR}/databases/gdbm - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm USE_X_PREFIX= yes USE_BZIP2= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile index fd93b079b355..124cd7d0d9f4 100644 --- a/net/gnomeicu2/Makefile +++ b/net/gnomeicu2/Makefile @@ -15,18 +15,14 @@ MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \ MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - gdbm.2:${PORTSDIR}/databases/gdbm - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm USE_X_PREFIX= yes USE_BZIP2= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile index 695a8408a264..35ae89ec927e 100644 --- a/net/gnometelnet/Makefile +++ b/net/gnometelnet/Makefile @@ -13,23 +13,13 @@ DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - USE_BZIP2= yes USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes USE_GMAKE= yes - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/net/gnosamba/Makefile b/net/gnosamba/Makefile index 2ffd95dfc02e..8c6fadef388e 100644 --- a/net/gnosamba/Makefile +++ b/net/gnosamba/Makefile @@ -12,13 +12,9 @@ MASTER_SITES= http://www.open-systems.com/gnosamba/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-patch: @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c |