diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-28 16:37:05 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-28 16:37:05 +0000 |
| commit | b6a34ca4a52b4edcb39239eecc571b646b7a8051 (patch) | |
| tree | 8fd2a9464d25082d603ee5c040a06f221c9bbb51 | |
| parent | 665b9ac3d5e305da8a1ddb8decdad3969f6c2614 (diff) | |
| download | pkgsrc-b6a34ca4a52b4edcb39239eecc571b646b7a8051.tar.gz | |
buildlink1 -> buildlink2, and set USE_LIBTOOL to fix the building of this
package.
| -rw-r--r-- | textproc/scrollkeeper/Makefile | 14 | ||||
| -rw-r--r-- | textproc/scrollkeeper/distinfo | 4 | ||||
| -rw-r--r-- | textproc/scrollkeeper/patches/patch-aa | 13 | ||||
| -rw-r--r-- | textproc/scrollkeeper/patches/patch-af | 13 |
4 files changed, 10 insertions, 34 deletions
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index eb08e7f47e4..de109842dfb 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/04/03 20:38:35 rh Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/28 16:37:05 jlam Exp $ # DISTNAME= scrollkeeper-0.2 @@ -12,14 +12,18 @@ HOMEPAGE= http://scrollkeeper.sourceforge.net/ COMMENT= Open Document Cataloging Project BUILD_USES_MSGFMT= yes -DEPENDS+= libxml>=1.8.9:../../textproc/libxml - -GNU_CONFIGURE= yes USE_GMAKE= yes -USE_LIBINTL= yes USE_X11BASE= yes +USE_BUILDLINK2= yes + +USE_LIBTOOL= yes +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --localstatedir=${X11PREFIX}/var CONFIGURE_ARGS+= --sharedstatedir=${X11PREFIX}/var +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../textproc/libxml/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/textproc/scrollkeeper/distinfo b/textproc/scrollkeeper/distinfo index bc344f8c844..6e8bb63d4a0 100644 --- a/textproc/scrollkeeper/distinfo +++ b/textproc/scrollkeeper/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.5 2002/04/03 20:38:35 rh Exp $ +$NetBSD: distinfo,v 1.6 2002/08/28 16:37:05 jlam Exp $ SHA1 (scrollkeeper-0.2.tar.gz) = 2f1f7ce884d64d3f7e6222a373372635cdf8508e Size (scrollkeeper-0.2.tar.gz) = 308061 bytes -SHA1 (patch-aa) = 1899045e50dddbeedbf93d9a7defcc3a79aac09e SHA1 (patch-ab) = 5e293438129fb2573a36cd74731f1cc262f50dd3 SHA1 (patch-ac) = 32bbe5475c706212990930c0388afedb9827a845 SHA1 (patch-ad) = 388af631a3e3111ec38736320e688c842da7773f SHA1 (patch-ae) = 75c8dbf68b2de211b355e9fad18094239c8e3c4e -SHA1 (patch-af) = 40f6d50184389557efd755b1708df729c25f0707 diff --git a/textproc/scrollkeeper/patches/patch-aa b/textproc/scrollkeeper/patches/patch-aa deleted file mode 100644 index 8cbb51a8d94..00000000000 --- a/textproc/scrollkeeper/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/04/03 20:38:35 rh Exp $ - ---- cl/src/Makefile.in.orig Wed Mar 28 22:22:56 2001 -+++ cl/src/Makefile.in -@@ -105,7 +105,7 @@ - INCLUDES = -I$(top_srcdir)/libs $(XML_CFLAGS) - - --LDADD = $(XML_LIBS) $(top_builddir)/libs/libscrollkeeper.la -+LDADD = $(XML_LIBS) -L$(top_builddir)/libs/.libs -Wl,-R`cd $(top_builddir) ; pwd`/libs/.libs -lscrollkeeper - - - bin_PROGRAMS = scrollkeeper-preinstall scrollkeeper-update scrollkeeper-install scrollkeeper-uninstall scrollkeeper-get-cl diff --git a/textproc/scrollkeeper/patches/patch-af b/textproc/scrollkeeper/patches/patch-af deleted file mode 100644 index ad083eea324..00000000000 --- a/textproc/scrollkeeper/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2002/04/03 20:38:36 rh Exp $ - ---- toc/src/Makefile.in.orig Wed Mar 28 22:22:57 2001 -+++ toc/src/Makefile.in -@@ -105,7 +105,7 @@ - INCLUDES = -I$(top_srcdir)/libs $(XML_CFLAGS) - - --LDADD = $(XML_LIBS) $(top_builddir)/libs/libscrollkeeper.la -+LDADD = $(XML_LIBS) -L$(top_builddir)/libs/.libs -Wl,-R`cd $(top_builddir) ; pwd`/libs/.libs -lscrollkeeper - - - bin_PROGRAMS = scrollkeeper_toc |