summaryrefslogtreecommitdiff
path: root/deskutils/gnome-utils
diff options
context:
space:
mode:
authorAde Lovett <ade@FreeBSD.org>2000-08-04 01:19:21 +0000
committerAde Lovett <ade@FreeBSD.org>2000-08-04 01:19:21 +0000
commit38ae599271006aa4aa581f0b03a8a5014fcf143d (patch)
tree1a1f5120bedb0bac581913ebf46122f0c3c9a656 /deskutils/gnome-utils
parentUpdate to 2.2.1 (diff)
Extensive patchfile cleanups using sobomax's wonderful
post-extract rule
Notes
Notes: svn path=/head/; revision=31287
Diffstat (limited to 'deskutils/gnome-utils')
-rw-r--r--deskutils/gnome-utils/Makefile9
-rw-r--r--deskutils/gnome-utils/files/patch-aa9
2 files changed, 8 insertions, 10 deletions
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 57efddb91aa9..e87071ccd9af 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
gtop.1:${PORTSDIR}/devel/libgtop \
- guile.6:${PORTSDIR}/lang/guile \
+ guile.9:${PORTSDIR}/lang/guile \
glade.4:${PORTSDIR}/devel/libglade
RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
@@ -31,4 +31,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GTK_CONFIG="${GTK_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
+post-extract:
+ @${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/deskutils/gnome-utils/files/patch-aa b/deskutils/gnome-utils/files/patch-aa
index 149087c84669..6f97cad1373c 100644
--- a/deskutils/gnome-utils/files/patch-aa
+++ b/deskutils/gnome-utils/files/patch-aa
@@ -1,14 +1,5 @@
--- configure.orig Fri May 19 14:49:06 2000
+++ configure Tue May 30 13:31:24 2000
-@@ -5101,7 +5101,7 @@
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
@@ -6350,17 +6350,13 @@
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6