Attachment #143050 for bug #190179

View | Details | Raw Unified | Return to bug 190179
Collapse All | Expand All





PORTNAME=	minizip
PORTVERSION=	1.2.8
PORTREVISION=	1
CATEGORIES=	archivers
MASTER_SITES=	SF/libpng/zlib/${PORTVERSION}
DISTNAME=	zlib-${PORTVERSION}
DISTNAME=	v${PORTVERSION}
DIST_SUBDIR=	${PORTNAME}

MAINTAINER=	coder@tuxfamily.org
COMMENT=	Zip library and programs from Zlib distribution

LICENSE=	ZLIB

USES=		libtool pathfix tar:xz
PATHFIX_MAKEFILEIN=	Makefile.am
USE_AUTOTOOLS=	libtoolize aclocal autoconf automake
AUTOMAKE_ARGS=	-a -c -f
CONFIGURE_ARGS=	--enable-demos
INSTALL_TARGET=	install-strip
WRKSRC=		${WRKDIR}/zlib-${PORTVERSION}/contrib/minizip

.include <bsd.port.options.mk>

# work around missing typedef in 8.X's libz configuration
.if ${OSVERSION} < 900000

.endif

post-patch:
	@${REINPLACE_CMD} 's/#ifdef unix || __APPLE__/#ifdef unix/' ${WRKSRC}/mini???.c

post-install:
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${WRKSRC}/miniunz ${STAGEDIR}${PREFIX}/bin/
	${INSTALL_MAN} ${WRKSRC}/*.1 ${STAGEDIR}${PREFIX}/man/man1

regression-test:
	${RM} -rf ${WRKDIR}/regression-test1
	${MKDIR} ${WRKDIR}/regression-test1
	${MV} ${WRKSRC}/*.[cho] ${WRKDIR}/regression-test1
	${RM} -f ${WRKDIR}/test.zip
	(cd ${WRKDIR}/regression-test1 && ${WRKSRC}/minizip ${WRKDIR}/test.zip *)
	${RM} -rf ${WRKDIR}/regression-test2
	${MKDIR} ${WRKDIR}/regression-test2
	${WRKSRC}/miniunzip ${WRKDIR}/test.zip -d ${WRKDIR}/regression-test2
	${DIFF} -ur ${WRKDIR}/regression-test1 ${WRKDIR}/regression-test2 > /dev/null

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)archivers/minizip/distinfo (-2 / +2 lines)
1	SHA256 (minizip/v1.2.8.zip) = da78eabfef55cbab21776d4cca207cf7e0dde483b4dd3590e525421667bfb6a7	1	SHA256 (zlib-1.2.8.tar.xz) = 831df043236df8e9a7667b9e3bb37e1fcb1220a0f163b6de2626774b9590d057
2	SIZE (minizip/v1.2.8.zip) = 724598	2	SIZE (zlib-1.2.8.tar.xz) = 450776




--- Makefile.orig	2013-04-29 02:23:49.000000000 +0200
+++ Makefile	2013-12-10 10:06:34.000000000 +0100
@@ -1,8 +1,9 @@
 CC=cc
-CFLAGS=-O -I../..
+CFLAGS=-O -I/usr/local
+LDFLAGS=-L/usr/lib -lz
 
-UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
-ZIP_OBJS = minizip.o zip.o   ioapi.o ../../libz.a
+UNZ_OBJS = miniunz.o unzip.o ioapi.o
+ZIP_OBJS = minizip.o zip.o   ioapi.o
 
 .c.o:
 	$(CC) -c $(CFLAGS) $*.c
@@ -10,10 +11,10 @@
 all: miniunz minizip
 
 miniunz:  $(UNZ_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(UNZ_OBJS)
 
 minizip:  $(ZIP_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ZIP_OBJS)
 
 test:	miniunz minizip
 	./minizip test readme.txt




bin/miniunzip
bin/minizip
include/minizip/crypt.h
include/minizip/ioapi.h
include/minizip/mztools.h
include/minizip/unzip.h
include/minizip/zip.h
lib/libminizip.a
lib/libminizip.so
lib/libminizip.so.1
lib/libminizip.so.1.0.0
libdata/pkgconfig/minizip.pc
man/man1/miniunzip.1.gz
man/man1/minizip.1.gz
@dirrm include/minizip

Return to bug 190179

Lines 3-26 Link Here

(-)archivers/minizip/Makefile (-18 / +23 lines)
3		3
4	PORTNAME= minizip	4	PORTNAME= minizip
5	PORTVERSION= 1.2.8	5	PORTVERSION= 1.2.8
		6	PORTREVISION= 1
6	CATEGORIES= archivers	7	CATEGORIES= archivers
7	MASTER_SITES= https://github.com/madler/zlib/archive/ \	8	MASTER_SITES= SF/libpng/zlib/${PORTVERSION}
8	LOCAL/mandree/${PORTNAME}	9	DISTNAME= zlib-${PORTVERSION}
9	DISTNAME= v${PORTVERSION}
10	DIST_SUBDIR= ${PORTNAME}
11		10
12	MAINTAINER= coder@tuxfamily.org	11	MAINTAINER= coder@tuxfamily.org
13	COMMENT= Minizip and miniunz programs from Zlib contributions	12	COMMENT= Zip library and programs from Zlib distribution
14		13
15	LICENSE= ZLIB	14	LICENSE= ZLIB
16		15
17	USES= zip	16	USES= libtool pathfix tar:xz
18	PLIST_FILES= bin/minizip bin/miniunz \	17	PATHFIX_MAKEFILEIN= Makefile.am
19	man/man1/miniunzip.1.gz man/man1/minizip.1.gz	18	USE_AUTOTOOLS= libtoolize aclocal autoconf automake
20	MAKE_ARGS= CFLAGS="${CPPFLAGS} ${CFLAGS} -include sys/stat.h -include stdint.h"	19	AUTOMAKE_ARGS= -a -c -f
		20	CONFIGURE_ARGS= --enable-demos
		21	INSTALL_TARGET= install-strip
21	WRKSRC= ${WRKDIR}/zlib-${PORTVERSION}/contrib/minizip	22	WRKSRC= ${WRKDIR}/zlib-${PORTVERSION}/contrib/minizip
22		23
23	.include <bsd.port.pre.mk>	24	.include <bsd.port.options.mk>
24		25
25	# work around missing typedef in 8.X's libz configuration	26	# work around missing typedef in 8.X's libz configuration
26	.if ${OSVERSION} < 900000	27	.if ${OSVERSION} < 900000
Lines 28-43 CPPFLAGS+= -Dz_crc_t=uint32_t Link Here
28	.endif	29	.endif
29		30
30	post-patch:	31	post-patch:
31	${REINPLACE_CMD} -e 's/#ifdef unix \\|\\| __APPLE__/#ifdef unix/' ${WRKSRC}/mini???.c	32	@${REINPLACE_CMD} 's/#ifdef unix \|\| __APPLE__/#ifdef unix/' ${WRKSRC}/mini???.c
32		33
33	do-install:	34	post-install:
34	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${WRKSRC}/miniunz ${STAGEDIR}${PREFIX}/bin/
35	${INSTALL_MAN} ${WRKSRC}/*.1 ${STAGEDIR}${PREFIX}/man/man1	35	${INSTALL_MAN} ${WRKSRC}/*.1 ${STAGEDIR}${PREFIX}/man/man1
36		36
37	regression-test:	37	regression-test:
38	${RM} -f ${WRKDIR}/test.zip && (cd ${WRKSRC} && ./${PORTNAME} ${WRKDIR}/test.zip *)	38	${RM} -rf ${WRKDIR}/regression-test1
39	${RM} -rf ${WRKDIR}/regression-test && ${MKDIR} ${WRKDIR}/regression-test	39	${MKDIR} ${WRKDIR}/regression-test1
40	${WRKSRC}/miniunz ${WRKDIR}/test.zip -d ${WRKDIR}/regression-test	40	${MV} ${WRKSRC}/*.[cho] ${WRKDIR}/regression-test1
41	diff -ur >/dev/null ${WRKSRC} ${WRKDIR}/regression-test	41	${RM} -f ${WRKDIR}/test.zip
		42	(cd ${WRKDIR}/regression-test1 && ${WRKSRC}/minizip ${WRKDIR}/test.zip *)
		43	${RM} -rf ${WRKDIR}/regression-test2
		44	${MKDIR} ${WRKDIR}/regression-test2
		45	${WRKSRC}/miniunzip ${WRKDIR}/test.zip -d ${WRKDIR}/regression-test2
		46	${DIFF} -ur ${WRKDIR}/regression-test1 ${WRKDIR}/regression-test2 > /dev/null
42		47
43	.include <bsd.port.post.mk>	48	.include <bsd.port.mk>

Lines 1-28 Link Here

(-)archivers/minizip/files/patch-contrib-minizip-Makefile (-28 lines)
1	--- Makefile.orig 2013-04-29 02:23:49.000000000 +0200
2	+++ Makefile 2013-12-10 10:06:34.000000000 +0100
3	@@ -1,8 +1,9 @@
4	CC=cc
5	-CFLAGS=-O -I../..
6	+CFLAGS=-O -I/usr/local
7	+LDFLAGS=-L/usr/lib -lz
8
9	-UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
10	-ZIP_OBJS = minizip.o zip.o ioapi.o ../../libz.a
11	+UNZ_OBJS = miniunz.o unzip.o ioapi.o
12	+ZIP_OBJS = minizip.o zip.o ioapi.o
13
14	.c.o:
15	$(CC) -c $(CFLAGS) $*.c
16	@@ -10,10 +11,10 @@
17	all: miniunz minizip
18
19	miniunz: $(UNZ_OBJS)
20	- $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)
21	+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(UNZ_OBJS)
22
23	minizip: $(ZIP_OBJS)
24	- $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)
25	+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ZIP_OBJS)
26
27	test: miniunz minizip
28	./minizip test readme.txt

Line 0 Link Here

(-)archivers/minizip/pkg-plist (+15 lines)
	1	bin/miniunzip
	2	bin/minizip
	3	include/minizip/crypt.h
	4	include/minizip/ioapi.h
	5	include/minizip/mztools.h
	6	include/minizip/unzip.h
	7	include/minizip/zip.h
	8	lib/libminizip.a
	9	lib/libminizip.so
	10	lib/libminizip.so.1
	11	lib/libminizip.so.1.0.0
	12	libdata/pkgconfig/minizip.pc
	13	man/man1/miniunzip.1.gz
	14	man/man1/minizip.1.gz
	15	@dirrm include/minizip