From b5db9fde5d37be17e1ffaa94a16ab1240089b6cc Mon Sep 17 00:00:00 2001 From: brad Date: Sat, 10 Jun 2000 18:51:44 +0000 Subject: [PATCH] - remove FAKE=Yes - use new framework for PLISTs - add @comment with RCS id --- archivers/bzip2/Makefile | 8 +++----- archivers/bzip2/pkg/PFRAG.shared | 3 +++ archivers/bzip2/pkg/PLIST | 4 ++-- archivers/bzip2/pkg/PLIST.noshared | 10 ---------- 4 files changed, 8 insertions(+), 17 deletions(-) create mode 100644 archivers/bzip2/pkg/PFRAG.shared delete mode 100644 archivers/bzip2/pkg/PLIST.noshared diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile index 5009755eeac..96b54d60311 100644 --- a/archivers/bzip2/Makefile +++ b/archivers/bzip2/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.24 2000/06/02 13:44:53 brad Exp $ +# $OpenBSD: Makefile,v 1.25 2000/06/10 18:51:44 brad Exp $ DISTNAME= bzip2-1.0.0 CATEGORIES= archivers -NEED_VERSION= 1.234 +NEED_VERSION= 1.301 MASTER_SITES= ftp://sourceware.cygnus.com/pub/bzip2/v100/ \ - ftp://ftp.yggdrasil.com/mirrors/site/sourceware.cygnus.com/pub/bzip2/v100/ + ftp://ftp.yggdrasil.com/mirrors/site/sourceware.cygnus.com/pub/bzip2/v100/ MAINTAINER= angelos@openbsd.org @@ -13,8 +13,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -FAKE= Yes - MAKE_FLAGS= CC="${CC}" \ CFLAGS="${CFLAGS} -Wall -Winline -fomit-frame-pointer \ -fno-strength-reduce" diff --git a/archivers/bzip2/pkg/PFRAG.shared b/archivers/bzip2/pkg/PFRAG.shared new file mode 100644 index 00000000000..1e2fe7646ed --- /dev/null +++ b/archivers/bzip2/pkg/PFRAG.shared @@ -0,0 +1,3 @@ +@comment $OpenBSD: PFRAG.shared,v 1.1 2000/06/10 18:51:44 brad Exp $ +lib/libbz2.so.10.0 +@exec /sbin/ldconfig -m %B diff --git a/archivers/bzip2/pkg/PLIST b/archivers/bzip2/pkg/PLIST index 99d3c3f1d7f..61469128883 100644 --- a/archivers/bzip2/pkg/PLIST +++ b/archivers/bzip2/pkg/PLIST @@ -1,11 +1,11 @@ +@comment $OpenBSD: PLIST,v 1.9 2000/06/10 18:51:44 brad Exp $ bin/bunzip2 bin/bzcat bin/bzip2 bin/bzip2recover include/bzlib.h lib/libbz2.a -lib/libbz2.so.10.0 -@exec /sbin/ldconfig -m %B +%%SHARED%% man/man1/bunzip2.1 man/man1/bzcat.1 man/man1/bzip2.1 diff --git a/archivers/bzip2/pkg/PLIST.noshared b/archivers/bzip2/pkg/PLIST.noshared deleted file mode 100644 index c80faa59d1a..00000000000 --- a/archivers/bzip2/pkg/PLIST.noshared +++ /dev/null @@ -1,10 +0,0 @@ -bin/bzip2 -bin/bunzip2 -bin/bzip2recover -bin/bzcat -include/bzlib.h -lib/libbz2.a -man/man1/bzip2.1 -man/man1/bunzip2.1 -man/man1/bzip2recover.1 -man/man1/bzcat.1