diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-06-21 20:22:08 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-06-21 20:22:08 +0800 |
| commit | 7f7716d2c91188867f65b2ebb42bf324026564c2 (patch) | |
| tree | 3b0f51097bfcf00e141ad17cde7c2b9c7d1c938d /finance | |
| parent | 14f9fc5b371816c508373bf0419d11bcd972a2ff (diff) | |
| download | freebsd-ports-gnome-7f7716d2c91188867f65b2ebb42bf324026564c2.tar.gz freebsd-ports-gnome-7f7716d2c91188867f65b2ebb42bf324026564c2.tar.zst freebsd-ports-gnome-7f7716d2c91188867f65b2ebb42bf324026564c2.zip | |
- Fix incompatibility with guile-1.4.1 and bump PORTREVISION;
- use USE_REINPLACE while I am here.
Reported by: Glenn Johnson <glennpj@charter.net>
Diffstat (limited to 'finance')
| -rw-r--r-- | finance/gnucash-devel/Makefile | 12 | ||||
| -rw-r--r-- | finance/gnucash-devel/files/patch-lib::srfi::srfi-8.scm | 15 | ||||
| -rw-r--r-- | finance/gnucash/Makefile | 12 | ||||
| -rw-r--r-- | finance/gnucash/files/patch-lib::srfi::srfi-8.scm | 15 |
4 files changed, 44 insertions, 10 deletions
diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile index daf0c82c6c82..b6acbed87844 100644 --- a/finance/gnucash-devel/Makefile +++ b/finance/gnucash-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnucash PORTVERSION= 1.6.6 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= http://www.gnucash.org/pub/gnucash/sources/stable/ \ ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \ @@ -35,6 +36,7 @@ USE_GMAKE= yes USE_XPM= yes USE_PERL5= yes USE_GNOME= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-glib-config=${GLIB_CONFIG} @@ -44,11 +46,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAN1= gnc-prices.1 gnucash.1 pre-patch: - @${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ + @${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^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\}/aclocal^\$\(prefix\)/share/aclocal^g ; \ - s^\$\{datadir\}/locale^\$\(prefix\)/share/locale^g' + @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ + 's|[{]datadir[}]/gnome/|(datadir)/|g ; \ + s|[{]datadir[}]/aclocal|(prefix)/share/aclocal|g ; \ + s|[{]datadir[}]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/finance/gnucash-devel/files/patch-lib::srfi::srfi-8.scm b/finance/gnucash-devel/files/patch-lib::srfi::srfi-8.scm new file mode 100644 index 000000000000..5d352c0f263d --- /dev/null +++ b/finance/gnucash-devel/files/patch-lib::srfi::srfi-8.scm @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- lib/srfi/srfi-8.scm 2002/06/21 12:07:11 1.1 ++++ lib/srfi/srfi-8.scm 2002/06/21 12:17:48 +@@ -22,7 +22,8 @@ + (cond + ((or (string=? "1.3" (version)) + (string=? "1.3.4" (version)) +- (string=? "1.4" (version))) ++ (string=? "1.4" (version)) ++ (string=? "1.4.1" (version))) + + (use-modules (ice-9 slib)) + (require 'macro-by-example) diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index daf0c82c6c82..b6acbed87844 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnucash PORTVERSION= 1.6.6 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= http://www.gnucash.org/pub/gnucash/sources/stable/ \ ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \ @@ -35,6 +36,7 @@ USE_GMAKE= yes USE_XPM= yes USE_PERL5= yes USE_GNOME= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-glib-config=${GLIB_CONFIG} @@ -44,11 +46,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAN1= gnc-prices.1 gnucash.1 pre-patch: - @${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ + @${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^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\}/aclocal^\$\(prefix\)/share/aclocal^g ; \ - s^\$\{datadir\}/locale^\$\(prefix\)/share/locale^g' + @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ + 's|[{]datadir[}]/gnome/|(datadir)/|g ; \ + s|[{]datadir[}]/aclocal|(prefix)/share/aclocal|g ; \ + s|[{]datadir[}]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/finance/gnucash/files/patch-lib::srfi::srfi-8.scm b/finance/gnucash/files/patch-lib::srfi::srfi-8.scm new file mode 100644 index 000000000000..5d352c0f263d --- /dev/null +++ b/finance/gnucash/files/patch-lib::srfi::srfi-8.scm @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- lib/srfi/srfi-8.scm 2002/06/21 12:07:11 1.1 ++++ lib/srfi/srfi-8.scm 2002/06/21 12:17:48 +@@ -22,7 +22,8 @@ + (cond + ((or (string=? "1.3" (version)) + (string=? "1.3.4" (version)) +- (string=? "1.4" (version))) ++ (string=? "1.4" (version)) ++ (string=? "1.4.1" (version))) + + (use-modules (ice-9 slib)) + (require 'macro-by-example) |