diff options
| author | marcus <marcus@FreeBSD.org> | 2003-02-01 12:20:15 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-02-01 12:20:15 +0800 |
| commit | d0e4973e2c6dd71001ead9167e81c151fd8337c0 (patch) | |
| tree | 11e598d8ba2f862cb8819344cdee087979a6eb70 /textproc/scrollkeeper | |
| parent | 659dfddcb3bda67ed97ab62e54a98dfa3d0bd27d (diff) | |
| download | freebsd-ports-gnome-d0e4973e2c6dd71001ead9167e81c151fd8337c0.tar.gz freebsd-ports-gnome-d0e4973e2c6dd71001ead9167e81c151fd8337c0.tar.zst freebsd-ports-gnome-d0e4973e2c6dd71001ead9167e81c151fd8337c0.zip | |
Fix a long-standing bug that required scrollkeeper to build as root.
Instead, make configure check for a file installed by docbook-sk, and
move the catalog creation to a pre-install target.
Prompted by: Andrew J Caines <A.J.Caines@halplant.com>
Tested by: myself
Andrew J Caines <A.J.Caines@halplant.com>
Diffstat (limited to 'textproc/scrollkeeper')
| -rw-r--r-- | textproc/scrollkeeper/Makefile | 4 | ||||
| -rw-r--r-- | textproc/scrollkeeper/files/patch-configure | 19 |
2 files changed, 10 insertions, 13 deletions
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index 39fc0aad5c63..defca8756c66 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -7,7 +7,7 @@ PORTNAME= scrollkeeper PORTVERSION= 0.3.11 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -75,7 +75,7 @@ post-patch: ${WRKSRC}/extract/dtds/Makefile.in \ ${WRKSRC}/libs/Makefile.in -pre-configure: +pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .include <bsd.port.post.mk> diff --git a/textproc/scrollkeeper/files/patch-configure b/textproc/scrollkeeper/files/patch-configure index 1392a0cc525a..f8502dd10ac1 100644 --- a/textproc/scrollkeeper/files/patch-configure +++ b/textproc/scrollkeeper/files/patch-configure @@ -1,5 +1,5 @@ --- configure.orig Wed Jul 24 22:26:07 2002 -+++ configure Thu Jan 16 02:24:32 2003 ++++ configure Fri Jan 31 17:58:10 2003 @@ -5299,6 +5299,7 @@ # This can be used to rebuild libtool when needed @@ -8,22 +8,19 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -6277,14 +6278,14 @@ - - ;; +@@ -6279,12 +6280,12 @@ *) -- echo $ac_n "checking for docbook-dtd412-xml""... $ac_c" 1>&6 --echo "configure:6282: checking for docbook-dtd412-xml" >&5 + echo $ac_n "checking for docbook-dtd412-xml""... $ac_c" 1>&6 + echo "configure:6282: checking for docbook-dtd412-xml" >&5 - if xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.1.2//EN" | grep "No entry" >/dev/null ; then -+ echo $ac_n "checking for docbook-dtd412-xml""... $ac_c" 1>&6 -+echo "configure:6282: checking for docbook-dtd412-xml" >&5 -+ if test ! -f $LOCALBASE/share/sk/docbook/catalog ; then ++if test ! -f $LOCALBASE/share/sk/docbook/4.1.2/docbook.cat ; then echo "* ERROR * " echo " " - echo "Couldn't find the DocBook XML V4.1.2 DTD. Please make sure that you have the docbook-dtd412-xml package installed. If it is installed, the package probably did not register the DTD in the catalog properly. Consult http://scrollkeeper.sourceforge.net/docbook.shtml for more information." +- echo "Couldn't find the DocBook XML V4.1.2 DTD. Please make sure that you have the docbook-dtd412-xml package installed. If it is installed, the package probably did not register the DTD in the catalog properly. Consult http://scrollkeeper.sourceforge.net/docbook.shtml for more information." ++ echo "Couldn't find the DocBook XML V4.1.2 DTD. Please make sure that you have the docbook-dtd412-xml package installed." echo " " - { echo "configure: error: DocBook XML V4.1.2 DTD not present in /etc/xml/catalog. Make sure docbook-dtd412-xml is installed and registers DTD in catalog." 1>&2; exit 1; } -+ { echo "configure: error: DocBook XML V4.1.2 DTD not present in $LOCALBASE/share/sk. Make sure docbook-dtd412-xml is installed and registers DTD in catalog." 1>&2; exit 1; } ++ { echo "configure: error: DocBook XML V4.1.2 DTD not present in $LOCALBASE/share/sk. Make sure docbook-dtd412-xml is installed." 1>&2; exit 1; } fi echo "$ac_t""found" 1>&6 ;; |