[Midnightbsd-cvs] mports [16721] trunk/archivers/zip: switch to tar version..
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 30 11:27:55 EDT 2014
Revision: 16721
http://svnweb.midnightbsd.org/mports/?rev=16721
Author: laffer1
Date: 2014-08-30 11:27:54 -0400 (Sat, 30 Aug 2014)
Log Message:
-----------
switch to tar version..
Modified Paths:
--------------
trunk/archivers/zip/Makefile
trunk/archivers/zip/distinfo
Added Paths:
-----------
trunk/archivers/zip/files/patch-unix_Makefile
trunk/archivers/zip/files/patch-unix_configure
Removed Paths:
-------------
trunk/archivers/zip/files/patch-aa
trunk/archivers/zip/files/patch-ab
trunk/archivers/zip/pkg-plist
Modified: trunk/archivers/zip/Makefile
===================================================================
--- trunk/archivers/zip/Makefile 2014-08-30 14:54:02 UTC (rev 16720)
+++ trunk/archivers/zip/Makefile 2014-08-30 15:27:54 UTC (rev 16721)
@@ -2,26 +2,34 @@
PORTNAME= zip
PORTVERSION= 3.0
+PORTREVISION= 1
CATEGORIES= archivers
-MASTER_SITES= SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION}
-DISTFILES= ${PORTNAME}30${EXTRACT_SUFX}
-USE_ZIP= yes
+MASTER_SITES= SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION} \
+ http://www.skysmurf.nl/comp/FreeBSD/distfiles/
+DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
MAINTAINER= ports at MidnightBSD.org
-COMMENT= Create/update ZIP files compatible with pkzip
+COMMENT= Create/update ZIP files compatible with PKZIP
+
LICENSE= infozip
+LICENSE_FILE= ${WRKSRC}/LICENSE
-WRKSRC= ${WRKDIR}/${PORTNAME}30
+OPTIONS_DEFINE= DOCS
+
MAKEFILE= unix/Makefile
ALL_TARGET= generic
-MAN1= zip.1 zipcloak.1 zipnote.1 zipsplit.1
-MAKE_JOBS_SAFE= yes
+PLIST_FILES= bin/zip bin/zipcloak bin/zipnote bin/zipsplit \
+ man/man1/zip.1.gz man/man1/zipcloak.1.gz \
+ man/man1/zipnote.1.gz man/man1/zipsplit.1.gz
+PORTDOCS= *
do-install:
-.for file in zip zipcloak zipnote zipsplit
- ${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/man/${file}.1 ${PREFIX}/man/man1
+.for p in ${PLIST_FILES:Mbin*:T}
+ ${INSTALL_PROGRAM} ${WRKSRC}/${p} ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/man/${p}.1 ${MANPREFIX}/man/man1
.endfor
+ @${MKDIR} ${DOCSDIR}
+ cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README* TODO WHATSNEW WHERE ${DOCSDIR}
.include <bsd.port.mk>
Modified: trunk/archivers/zip/distinfo
===================================================================
--- trunk/archivers/zip/distinfo 2014-08-30 14:54:02 UTC (rev 16720)
+++ trunk/archivers/zip/distinfo 2014-08-30 15:27:54 UTC (rev 16721)
@@ -1,3 +1,2 @@
-SHA256 (zip30.zip) = 7061ceac0407682b6dc54bb480347205f680f4e56cf34fe1423df2309f18968a
-RMD160 (zip30.zip) = 88f34a3cc15ea153952289289f3d70f9a8a41f47
-SIZE (zip30.zip) = 1287223
+SHA256 (zip30.tar.gz) = f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
+SIZE (zip30.tar.gz) = 1118845
Deleted: trunk/archivers/zip/files/patch-aa
===================================================================
--- trunk/archivers/zip/files/patch-aa 2014-08-30 14:54:02 UTC (rev 16720)
+++ trunk/archivers/zip/files/patch-aa 2014-08-30 15:27:54 UTC (rev 16721)
@@ -1,35 +0,0 @@
---- unix/configure.orig 2008-06-19 23:32:20.000000000 +0400
-+++ unix/configure 2008-08-03 06:35:03.000000000 +0400
-@@ -98,7 +98,6 @@
- _EOF_
- $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
- if test $? -eq 0; then
-- CFLAGS_OPT='-O3'
- echo " GNU C ($CFLAGS_OPT)"
- # Special Mac OS X shared library "ld" option?
- if test ` uname -s 2> /dev/null ` = 'Darwin'; then
-@@ -110,7 +109,6 @@
- rm -f conftest
- fi
- else
-- CFLAGS_OPT='-O'
- echo " Other-unknown C ($CFLAGS_OPT)"
- fi
- fi
-@@ -224,7 +222,6 @@
- [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
- [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
- [ -f /lib/cpp ] && CPP=/lib/cpp
--[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
- [ -f /xenix ] && CPP="${CC} -E"
- [ -f /lynx.os ] && CPP="${CC} -E"
-
-@@ -244,7 +241,7 @@
- echo "int foo() { return 0;}" > conftest.c
- $CC -c conftest.c >/dev/null 2>/dev/null
- echo Check if compiler generates underlines
-- nm conftest.o | grep "(^|[^_])foo" >/dev/null 2>/dev/null
-+ nm conftest.o | egrep "(^|[^_])foo" >/dev/null 2>/dev/null
- [ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE"
- if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then
- if eval "$CC -c _crc_i386.s >/dev/null 2>/dev/null" && [ -f _crc_i386.o ]
Deleted: trunk/archivers/zip/files/patch-ab
===================================================================
--- trunk/archivers/zip/files/patch-ab 2014-08-30 14:54:02 UTC (rev 16720)
+++ trunk/archivers/zip/files/patch-ab 2014-08-30 15:27:54 UTC (rev 16721)
@@ -1,20 +0,0 @@
---- unix/Makefile.orig 2008-05-07 02:33:56.000000000 +0400
-+++ unix/Makefile 2008-08-03 06:36:20.000000000 +0400
-@@ -22,7 +22,6 @@
- LN = ln -s
-
- # (to use the GNU compiler, change cc to gcc in CC)
--CC = cc
- BIND = $(CC)
- AS = $(CC) -c
- CPP = /lib/cpp
-@@ -57,8 +56,7 @@
- # CFLAGS flags for C compile
- # LFLAGS1 flags after output file spec, before obj file list
- # LFLAGS2 flags after obj file list (libraries, etc)
--CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
--CFLAGS = -O2 $(CFLAGS_NOOPT)
-+CFLAGS_NOOPT = $(CFLAGS) -I. -DUNIX $(LOCAL_ZIP)
- LFLAGS1 =
- LFLAGS2 = -s
-
Copied: trunk/archivers/zip/files/patch-unix_Makefile (from rev 16689, trunk/archivers/zip/files/patch-ab)
===================================================================
--- trunk/archivers/zip/files/patch-unix_Makefile (rev 0)
+++ trunk/archivers/zip/files/patch-unix_Makefile 2014-08-30 15:27:54 UTC (rev 16721)
@@ -0,0 +1,20 @@
+--- unix/Makefile.orig 2008-05-07 02:33:56.000000000 +0400
++++ unix/Makefile 2008-08-03 06:36:20.000000000 +0400
+@@ -22,7 +22,6 @@
+ LN = ln -s
+
+ # (to use the GNU compiler, change cc to gcc in CC)
+-CC = cc
+ BIND = $(CC)
+ AS = $(CC) -c
+ CPP = /lib/cpp
+@@ -57,8 +56,7 @@
+ # CFLAGS flags for C compile
+ # LFLAGS1 flags after output file spec, before obj file list
+ # LFLAGS2 flags after obj file list (libraries, etc)
+-CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
+-CFLAGS = -O2 $(CFLAGS_NOOPT)
++CFLAGS_NOOPT = $(CFLAGS) -I. -DUNIX $(LOCAL_ZIP)
+ LFLAGS1 =
+ LFLAGS2 = -s
+
Copied: trunk/archivers/zip/files/patch-unix_configure (from rev 16689, trunk/archivers/zip/files/patch-aa)
===================================================================
--- trunk/archivers/zip/files/patch-unix_configure (rev 0)
+++ trunk/archivers/zip/files/patch-unix_configure 2014-08-30 15:27:54 UTC (rev 16721)
@@ -0,0 +1,35 @@
+--- unix/configure.orig 2008-06-19 23:32:20.000000000 +0400
++++ unix/configure 2008-08-03 06:35:03.000000000 +0400
+@@ -98,7 +98,6 @@
+ _EOF_
+ $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
+ if test $? -eq 0; then
+- CFLAGS_OPT='-O3'
+ echo " GNU C ($CFLAGS_OPT)"
+ # Special Mac OS X shared library "ld" option?
+ if test ` uname -s 2> /dev/null ` = 'Darwin'; then
+@@ -110,7 +109,6 @@
+ rm -f conftest
+ fi
+ else
+- CFLAGS_OPT='-O'
+ echo " Other-unknown C ($CFLAGS_OPT)"
+ fi
+ fi
+@@ -224,7 +222,6 @@
+ [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
+ [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
+ [ -f /lib/cpp ] && CPP=/lib/cpp
+-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
+ [ -f /xenix ] && CPP="${CC} -E"
+ [ -f /lynx.os ] && CPP="${CC} -E"
+
+@@ -244,7 +241,7 @@
+ echo "int foo() { return 0;}" > conftest.c
+ $CC -c conftest.c >/dev/null 2>/dev/null
+ echo Check if compiler generates underlines
+- nm conftest.o | grep "(^|[^_])foo" >/dev/null 2>/dev/null
++ nm conftest.o | egrep "(^|[^_])foo" >/dev/null 2>/dev/null
+ [ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE"
+ if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then
+ if eval "$CC -c _crc_i386.s >/dev/null 2>/dev/null" && [ -f _crc_i386.o ]
Deleted: trunk/archivers/zip/pkg-plist
===================================================================
--- trunk/archivers/zip/pkg-plist 2014-08-30 14:54:02 UTC (rev 16720)
+++ trunk/archivers/zip/pkg-plist 2014-08-30 15:27:54 UTC (rev 16721)
@@ -1,5 +0,0 @@
- at comment $MidnightBSD: mports/Mk/bsd.mport.mk,v 1.118 2008/09/30 23:33:50 laffer1 Exp $
-bin/zip
-bin/zipcloak
-bin/zipnote
-bin/zipsplit
More information about the Midnightbsd-cvs
mailing list