From 683edb26a9f1377ea1dab22ebff377776619876f Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 9 Jun 2000 06:54:51 +0000 Subject: USE_LIBTOOL and LTCONFIG_OVERRIDE, instead of pkglibtool and patching configure. --- archivers/liblzo/Makefile | 25 +++++++++++++------------ archivers/liblzo/files/patch-sum | 7 +++++-- archivers/liblzo/patches/patch-aa | 20 -------------------- archivers/liblzo/pkg/PLIST | 11 ++++++----- 4 files changed, 24 insertions(+), 39 deletions(-) delete mode 100644 archivers/liblzo/patches/patch-aa (limited to 'archivers') diff --git a/archivers/liblzo/Makefile b/archivers/liblzo/Makefile index 4465343449a..d35a51f1dfd 100644 --- a/archivers/liblzo/Makefile +++ b/archivers/liblzo/Makefile @@ -1,18 +1,19 @@ -# $NetBSD: Makefile,v 1.3 2000/06/01 11:23:13 rh Exp $ +# $NetBSD: Makefile,v 1.4 2000/06/09 06:54:51 jlam Exp $ # -DISTNAME= lzo-1.06 -PKGNAME= liblzo-1.06 -CATEGORIES= archivers -MASTER_SITES= http://wildsau.idv.uni-linz.ac.at/mfx/lzo-download/ \ - ftp://wildsau.idv.uni-linz.ac.at/pub/mfx/lzo/ \ - ftp://metalab.unc.edu/pub/Linux/libs/compression/ \ - ftp://ftp.elf.stuba.sk/pub/pc/pack/ +DISTNAME= lzo-1.06 +PKGNAME= liblzo-1.06 +CATEGORIES= archivers +MASTER_SITES= http://wildsau.idv.uni-linz.ac.at/mfx/lzo-download/ \ + ftp://wildsau.idv.uni-linz.ac.at/pub/mfx/lzo/ \ + ftp://metalab.unc.edu/pub/Linux/libs/compression/ \ + ftp://ftp.elf.stuba.sk/pub/pc/pack/ -MAINTAINER= rh@netbsd.org -HOMEPAGE= http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html +MAINTAINER= rh@netbsd.org +HOMEPAGE= http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html -GNU_CONFIGURE= YES -USE_PKGLIBTOOL= YES +GNU_CONFIGURE= # defined +USE_LIBTOOL= # defined +LTCONFIG_OVERRIDE= ${WRKSRC}/acconfig/ltconfig .include "../../mk/bsd.pkg.mk" diff --git a/archivers/liblzo/files/patch-sum b/archivers/liblzo/files/patch-sum index ce0bc660b18..a0ce8037cfb 100644 --- a/archivers/liblzo/files/patch-sum +++ b/archivers/liblzo/files/patch-sum @@ -1,3 +1,6 @@ -$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:35 danw Exp $ +$NetBSD: patch-sum,v 1.4 2000/06/09 06:54:53 jlam Exp $ -MD5 (patch-aa) = ac6ea2fdce6b48c7c3faf0a033ebc93a +This placeholder file is generated by the ``makepatchsum'' target +whenever the patches directory is empty or missing. Its purpose +is to ensure that the presence of any obsolete patches will cause +the proper error to be emitted at build time. diff --git a/archivers/liblzo/patches/patch-aa b/archivers/liblzo/patches/patch-aa deleted file mode 100644 index 021bb280b44..00000000000 --- a/archivers/liblzo/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2000/05/02 18:48:35 danw Exp $ - ---- configure.orig Mon Nov 29 18:37:24 1999 -+++ configure Wed Dec 22 20:33:48 1999 -@@ -2099,6 +2099,7 @@ - rm -f confcache - - -+if false; then - # Actually configure libtool. ac_aux_dir is where install-sh is found. - CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ - LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -@@ -2123,6 +2124,7 @@ - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+fi - - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. diff --git a/archivers/liblzo/pkg/PLIST b/archivers/liblzo/pkg/PLIST index a06c5f52a96..c6829f0d956 100644 --- a/archivers/liblzo/pkg/PLIST +++ b/archivers/liblzo/pkg/PLIST @@ -1,8 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/08/16 15:29:37 rh Exp $ -include/lzoconf.h -include/lzoutil.h -include/lzo16bit.h +@comment $NetBSD: PLIST,v 1.2 2000/06/09 06:54:57 jlam Exp $ include/lzo1.h +include/lzo16bit.h include/lzo1a.h include/lzo1b.h include/lzo1c.h @@ -11,5 +9,8 @@ include/lzo1x.h include/lzo1y.h include/lzo1z.h include/lzo2a.h -lib/liblzo.so.1.0 +include/lzoconf.h +include/lzoutil.h lib/liblzo.a +lib/liblzo.la +lib/liblzo.so.1.0 -- cgit v1.2.3