Simplify this package, and build and install shared libs, by using a

version of the libz Makefile from basesrc to build this package.
Mark this package as only for Solaris platforms.

3 files changed, 44 insertions, 28 deletions

diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile
index 0fc9b82284d..d0e60437c66 100644
--- a/devel/zlib/Makefile
+++ b/devel/zlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/09/20 23:23:57 kim Exp $
+# $NetBSD: Makefile,v 1.3 1999/09/24 14:37:40 agc Exp $
 #
 
 DISTNAME=	zlib-1.1.3
@@ -8,32 +8,10 @@ MASTER_SITES=   ftp://ftp.cdrom.com/pub/infozip/zlib/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.cdrom.com/pub/infozip/zlib/
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --shared
+ONLY_FOR_PLATFORM=	SunOS-*-* # in base NetBSD system
 
-.include "../../mk/bsd.prefs.mk"
+MAKEFILE=	bsd.mk
 
-.if exists(/usr/lib/libz.a)
-IGNORE=		"is part of your NetBSD distribution"
-.endif
-
-CFLAGS=		-fPIC -O3
-
-post-extract:
-	@cd ${WRKDIR} && ${MKDIR} static && ${PAX} -rw ${DISTNAME} static
-
-post-patch:
-	@${MAKE} do-patch WRKSRC=${WRKDIR}/static/${DISTNAME}
-
-post-configure:
-	@${MAKE} do-configure WRKSRC=${WRKDIR}/static/${DISTNAME} CFLAGS=-O3 \
-	CONFIGURE_ARGS="`${ECHO} ${CONFIGURE_ARGS} | ${SED} -e 's/--shared//'`"
-
-post-build:
-	@${MAKE} do-build WRKSRC=${WRKDIR}/static/${DISTNAME} CFLAGS=-O3
-
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/static/${DISTNAME}/libz.a ${PREFIX}/lib
-	cd ${PREFIX}/lib && ranlib libz.a
+INSTALL_TARGET=	install includes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/zlib/patches/patch-ab b/devel/zlib/patches/patch-ab
new file mode 100644
index 00000000000..5a8e990ce77
--- /dev/null
+++ b/devel/zlib/patches/patch-ab
@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.1 1999/09/24 14:37:40 agc Exp $
+
+Use a version of the basesrc Makefile
+
+--- /dev/null	Fri Sep 24 15:02:44 1999
++++ bsd.mk	Fri Sep 24 15:19:26 1999
+@@ -0,0 +1,29 @@
++#	Original NetBSD: Makefile,v 1.13 1999/07/09 07:07:13 garbled Exp
++
++LIB=	z
++MKMAN=	no
++
++SRCS=	adler32.c compress.c crc32.c deflate.c gzio.c infblock.c \
++	infcodes.c inffast.c inflate.c inftrees.c infutil.c trees.c uncompr.c \
++	zutil.c
++
++CPPFLAGS+= -I${.CURDIR}
++
++CLEANFILES+= minigzip
++
++INCS=	zconf.h zlib.h
++INCSDIR=${PREFIX}/include
++LIBDIR=${PREFIX}/lib
++
++SHLIB_MAJOR= 0
++SHLIB_MINOR= 1
++
++.include <bsd.lib.mk>
++
++test: minigzip
++	echo hello world | ./minigzip | ./minigzip -d
++
++# Note: CFLAGS ommitted by intention!
++# This is to verify that zlib.h works standalone.
++minigzip : minigzip.c libz.a
++	$(CC) -o minigzip ${.CURDIR}/minigzip.c libz.a
diff --git a/devel/zlib/pkg/PLIST b/devel/zlib/pkg/PLIST
index 1f5599f8be5..ee6c3832e2f 100644
--- a/devel/zlib/pkg/PLIST
+++ b/devel/zlib/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/09/19 21:53:29 kim Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/09/24 14:37:41 agc Exp $
 include/zconf.h
 include/zlib.h
 lib/libz.a
-lib/libz.so.1.1.3
+lib/libz_p.a
+lib/libz_pic.a
+lib/libz.so.0.1