diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2000-08-04 01:19:21 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2000-08-04 01:19:21 +0000 |
| commit | 38ae599271006aa4aa581f0b03a8a5014fcf143d (patch) | |
| tree | 1a1f5120bedb0bac581913ebf46122f0c3c9a656 /math | |
| parent | Update 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 'math')
| -rw-r--r-- | math/gnumeric/Makefile | 9 | ||||
| -rw-r--r-- | math/gnumeric/files/patch-ba | 9 | ||||
| -rw-r--r-- | math/gnumeric2/Makefile | 9 | ||||
| -rw-r--r-- | math/gnumeric2/files/patch-ba | 9 |
4 files changed, 16 insertions, 20 deletions
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 6e0b47d731d4..b36c8f1245d7 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ python:${PORTSDIR}/lang/python LIB_DEPENDS= gnomeprint.9:${PORTSDIR}/print/gnomeprint \ glade.4:${PORTSDIR}/devel/libglade \ - guile.6:${PORTSDIR}/lang/guile \ + guile.9:${PORTSDIR}/lang/guile \ gnomeole2.0:${PORTSDIR}/devel/libole2 \ gb.0:${PORTSDIR}/lang/gnomebasic @@ -41,4 +41,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PLIST_SUB= VERSION=${PORTVERSION} +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/math/gnumeric/files/patch-ba b/math/gnumeric/files/patch-ba index 51c58a7c4472..78468ee4e24e 100644 --- a/math/gnumeric/files/patch-ba +++ b/math/gnumeric/files/patch-ba @@ -9,12 +9,3 @@ confexec_DATA = gnumericConf.sh CLEANFILES = gnumericConf.sh -@@ -169,7 +169,7 @@ - appicon_DATA = gnome-gnumeric.png gnome-application-x-gnumeric.png gnome-application-x-xls.png - - --Applicationsdir = $(datadir)/gnome/apps/Applications -+Applicationsdir = $(datadir)/apps/Applications - Applications_DATA = gnumeric.desktop - - Mimedir = $(datadir)/mime-info diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile index 6e0b47d731d4..b36c8f1245d7 100644 --- a/math/gnumeric2/Makefile +++ b/math/gnumeric2/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ python:${PORTSDIR}/lang/python LIB_DEPENDS= gnomeprint.9:${PORTSDIR}/print/gnomeprint \ glade.4:${PORTSDIR}/devel/libglade \ - guile.6:${PORTSDIR}/lang/guile \ + guile.9:${PORTSDIR}/lang/guile \ gnomeole2.0:${PORTSDIR}/devel/libole2 \ gb.0:${PORTSDIR}/lang/gnomebasic @@ -41,4 +41,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PLIST_SUB= VERSION=${PORTVERSION} +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/math/gnumeric2/files/patch-ba b/math/gnumeric2/files/patch-ba index 51c58a7c4472..78468ee4e24e 100644 --- a/math/gnumeric2/files/patch-ba +++ b/math/gnumeric2/files/patch-ba @@ -9,12 +9,3 @@ confexec_DATA = gnumericConf.sh CLEANFILES = gnumericConf.sh -@@ -169,7 +169,7 @@ - appicon_DATA = gnome-gnumeric.png gnome-application-x-gnumeric.png gnome-application-x-xls.png - - --Applicationsdir = $(datadir)/gnome/apps/Applications -+Applicationsdir = $(datadir)/apps/Applications - Applications_DATA = gnumeric.desktop - - Mimedir = $(datadir)/mime-info |