From dd5426312fd3be8c539ed9a88aed4a985f0ba3eb Mon Sep 17 00:00:00 2001 From: espie Date: Fri, 23 Dec 2005 13:57:21 +0000 Subject: [PATCH] use SHARED_LIBS USE_LIBTOOL where appropriate (and bump PKGNAME) tweak a few FAKE_FLAGS to be more uniform. --- archivers/bzip2/Makefile | 7 ++++--- archivers/bzip2/patches/patch-Makefile | 8 ++++---- archivers/bzip2/pkg/PFRAG.shared | 4 ++-- archivers/lzo/Makefile | 7 +++++-- archivers/lzo/pkg/PFRAG.shared | 4 ++-- archivers/ucl/Makefile | 6 +++++- archivers/ucl/pkg/PFRAG.shared | 4 ++-- archivers/unshield/Makefile | 6 +++++- archivers/unshield/pkg/PFRAG.shared | 4 ++-- archivers/zipios/Makefile | 6 ++++-- archivers/zipios/pkg/PFRAG.shared | 4 ++-- 11 files changed, 37 insertions(+), 23 deletions(-) diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile index a7c123f401a..a4ea397b810 100644 --- a/archivers/bzip2/Makefile +++ b/archivers/bzip2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.51 2005/10/30 00:10:39 fgsch Exp $ +# $OpenBSD: Makefile,v 1.52 2005/12/23 13:57:21 espie Exp $ COMMENT= "block-sorting file compressor, unencumbered" @@ -6,6 +6,7 @@ VERSION= 1.0.3 DISTNAME= bzip2-${VERSION} CATEGORIES= archivers MASTER_SITES= ${HOMEPAGE}${VERSION}/ +SHARED_LIBS= bz2 10.3 HOMEPAGE= http://www.bzip.org/ @@ -21,8 +22,8 @@ BZ2_CFLAGS= -Wall -Winline BZ2_CFLAGS+= -fomit-frame-pointer -fno-strength-reduce .endif -MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${BZ2_CFLAGS}" -FAKE_FLAGS= ${MAKE_FLAGS} PREFIX="${PREFIX}" DESTDIR="${WRKINST}" +MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${BZ2_CFLAGS}" LIBbz2_VERSION=${LIBbz2_VERSION} PREFIX=${TRUEPREFIX} +FAKE_FLAGS=${MAKE_FLAGS} DESTDIR=${WRKINST} REGRESS_FLAGS= LD_LIBRARY_PATH="${WRKBUILD}" REGRESS_TARGET= test diff --git a/archivers/bzip2/patches/patch-Makefile b/archivers/bzip2/patches/patch-Makefile index 224b263fc1f..879ec29fec5 100644 --- a/archivers/bzip2/patches/patch-Makefile +++ b/archivers/bzip2/patches/patch-Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.9 2005/05/16 23:00:59 naddy Exp $ ---- Makefile.orig Mon May 16 23:27:51 2005 -+++ Makefile Mon May 16 23:49:38 2005 +$OpenBSD: patch-Makefile,v 1.10 2005/12/23 13:57:21 espie Exp $ +--- Makefile.orig Thu Feb 17 12:28:24 2005 ++++ Makefile Thu Dec 22 09:39:51 2005 @@ -10,10 +10,9 @@ LDFLAGS= BIGFILES=-D_FILE_OFFSET_BITS=64 CFLAGS=-Wall -Winline -O -g $(BIGFILES) @@ -8,7 +8,7 @@ $OpenBSD: patch-Makefile,v 1.9 2005/05/16 23:00:59 naddy Exp $ -# Where you want it installed when you do 'make install' -PREFIX=/usr +PICFLAG= -fpic -+SHLIB= libbz2.so.10.3 ++SHLIB= libbz2.so.${LIBbz2_VERSION} - OBJS= blocksort.o \ diff --git a/archivers/bzip2/pkg/PFRAG.shared b/archivers/bzip2/pkg/PFRAG.shared index 30a8f55bf5f..5654cfc59e3 100644 --- a/archivers/bzip2/pkg/PFRAG.shared +++ b/archivers/bzip2/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.7 2005/05/16 23:00:59 naddy Exp $ -@lib lib/libbz2.so.10.3 +@comment $OpenBSD: PFRAG.shared,v 1.8 2005/12/23 13:57:21 espie Exp $ +@lib lib/libbz2.so.${LIBbz2_VERSION} diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile index 18e1b6cb4d2..62c66d1ffea 100644 --- a/archivers/lzo/Makefile +++ b/archivers/lzo/Makefile @@ -1,11 +1,13 @@ -# $OpenBSD: Makefile,v 1.34 2005/10/30 00:10:39 fgsch Exp $ +# $OpenBSD: Makefile,v 1.35 2005/12/23 13:57:21 espie Exp $ COMMENT= "portable speedy lossless data compression library" DISTNAME= lzo-1.08 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= archivers devel MASTER_SITES= ${HOMEPAGE}download/ +SHARED_LIBS= lzo 1.0 +MODGNU_SHARED_LIBS=lzo '' HOMEPAGE= http://www.oberhumer.com/opensource/lzo/ @@ -23,6 +25,7 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/acconfig REGRESS_TARGET= test +USE_LIBTOOL= Yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lzo ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/lzo diff --git a/archivers/lzo/pkg/PFRAG.shared b/archivers/lzo/pkg/PFRAG.shared index 60d95662eda..25b7e677819 100644 --- a/archivers/lzo/pkg/PFRAG.shared +++ b/archivers/lzo/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/06 14:37:27 espie Exp $ -@lib lib/liblzo.so.1.0 +@comment $OpenBSD: PFRAG.shared,v 1.5 2005/12/23 13:57:21 espie Exp $ +@lib lib/liblzo.so.${LIBlzo_VERSION} diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile index f6af5cc5548..f2059ddb3e7 100644 --- a/archivers/ucl/Makefile +++ b/archivers/ucl/Makefile @@ -1,9 +1,12 @@ -# $OpenBSD: Makefile,v 1.6 2005/05/22 10:54:35 alek Exp $ +# $OpenBSD: Makefile,v 1.7 2005/12/23 13:57:22 espie Exp $ COMMENT= "portable lossless data compression library" DISTNAME= ucl-1.03 +PKGNAME= ${DISTNAME}p0 CATEGORIES= archivers devel +SHARED_LIBS= ucl 1.0 +MODGNU_SHARED_LIBS= ucl '' HOMEPAGE= http://www.oberhumer.com/opensource/ucl @@ -26,6 +29,7 @@ SEPARATE_BUILD= concurrent CONFIGURE_ARGS+= ${CONFIGURE_SHARED} --enable-static MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/acconfig MAKE_FLAGS= CFLAGS_O="" +USE_LIBTOOL= Yes do-regress: ${WRKBUILD}/examples/simple diff --git a/archivers/ucl/pkg/PFRAG.shared b/archivers/ucl/pkg/PFRAG.shared index 583529f6e68..2845628b06a 100644 --- a/archivers/ucl/pkg/PFRAG.shared +++ b/archivers/ucl/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2005/05/22 10:54:35 alek Exp $ -@lib lib/libucl.so.1.0 +@comment $OpenBSD: PFRAG.shared,v 1.5 2005/12/23 13:57:22 espie Exp $ +@lib lib/libucl.so.${LIBucl_VERSION} diff --git a/archivers/unshield/Makefile b/archivers/unshield/Makefile index bf32b51f44d..8f44b8c1011 100644 --- a/archivers/unshield/Makefile +++ b/archivers/unshield/Makefile @@ -1,10 +1,13 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $ +# $OpenBSD: Makefile,v 1.2 2005/12/23 13:57:22 espie Exp $ COMMENT= "extract files from InstallShield CAB archives" DISTNAME= unshield-0.5 +PKGNAME= ${DISTNAME}p0 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=synce/} +SHARED_LIBS= unshield 0.0 +MODGNU_SHARED_LIBS= unshield '-no-undefined' HOMEPAGE= http://synce.sourceforge.net/synce/unshield.php @@ -19,5 +22,6 @@ WANTLIB= c z CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} +USE_LIBTOOL= Yes .include diff --git a/archivers/unshield/pkg/PFRAG.shared b/archivers/unshield/pkg/PFRAG.shared index a97beff3101..4183871ef07 100644 --- a/archivers/unshield/pkg/PFRAG.shared +++ b/archivers/unshield/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/07/25 09:58:16 jsg Exp $ -@lib lib/libunshield.so.0.0 +@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/23 13:57:22 espie Exp $ +@lib lib/libunshield.so.${LIBunshield_VERSION} diff --git a/archivers/zipios/Makefile b/archivers/zipios/Makefile index 7e1d8fc0ded..9a7f49d3a9b 100644 --- a/archivers/zipios/Makefile +++ b/archivers/zipios/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2005/02/19 22:18:31 alek Exp $ +# $OpenBSD: Makefile,v 1.3 2005/12/23 13:57:22 espie Exp $ COMMENT= "java-like zip interface" DISTNAME= zipios++-0.1.5.9+cvs.2004.02.07 @@ -6,6 +6,8 @@ PKGNAME= zipios++-0.1.5.9 CATEGORIES= devel archivers MASTER_SITES= http://http.us.debian.org/debian/pool/main/z/zipios++/ MASTER_SITES0= ${MASTER_SITE_GNU:=automake/} +SHARED_LIBS= zipios 0.0 +MODGNU_SHARED_LIBS= zipios '' DISTFILES= zipios++_0.1.5.9+cvs.2004.02.07.orig.tar.gz \ automake-1.7.tar.gz:0 @@ -25,7 +27,7 @@ post-extract: done MAKE_FLAGS=SUBDIRS='zipios++ src' -FAKE_FLAGS=SUBDIRS='zipios++ src' DESTDIR=${WRKINST} +FAKE_FLAGS=${MAKE_FLAGS} DESTDIR=${WRKINST} post-install: ${INSTALL_DATA} ${WRKBUILD}/zipios++/zipios-config.h ${PREFIX}/include/zipios++/ diff --git a/archivers/zipios/pkg/PFRAG.shared b/archivers/zipios/pkg/PFRAG.shared index b73adbe41bb..ff9934de4c4 100644 --- a/archivers/zipios/pkg/PFRAG.shared +++ b/archivers/zipios/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/02/19 12:31:30 espie Exp $ -@lib lib/libzipios.so.0.0 +@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/23 13:57:22 espie Exp $ +@lib lib/libzipios.so.${LIBzipios_VERSION}