From 4bb8eb15eb90266fbda844e96752560e10f91f4f Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Thu, 3 Jun 2010 15:54:29 +0000 Subject: [PATCH] - Convert unzip -a to USE_DOS2UNIX PR: ports/146533 Submitted by: Alex Kozlov --- games/darkplaces/Makefile | 7 ++++--- games/quake2-ctf/Makefile | 3 ++- games/quake2-data/Makefile | 1 + games/xevil/Makefile | 3 ++- graphics/fli2gif/Makefile | 7 ++++--- .../files/{patch-ab => patch-fli2gif.c} | 21 +++++++++++++++++-- misc/astrolog/Makefile | 3 ++- misc/projectionlib/Makefile | 3 +-- print/acrobatviewer/Makefile | 1 + sysutils/megarc/Makefile | 3 ++- textproc/docbook-420/Makefile | 2 +- textproc/iso8879/Makefile | 1 + 12 files changed, 40 insertions(+), 15 deletions(-) rename graphics/fli2gif/files/{patch-ab => patch-fli2gif.c} (63%) diff --git a/games/darkplaces/Makefile b/games/darkplaces/Makefile index 57a591e0727c..6d7929a6d82a 100644 --- a/games/darkplaces/Makefile +++ b/games/darkplaces/Makefile @@ -18,6 +18,7 @@ COMMENT= Quake engine modification USE_ZIP= yes USE_GMAKE= yes USE_XORG= xxf86dga xpm +USE_DOS2UNIX= darkplaces.txt MAKE_ENV= DP_FS_BASEDIR="${Q1DIR}" WRKSRC= ${WRKDIR}/${PORTNAME} @@ -68,8 +69,8 @@ PLIST_FILES+= bin/${PORTNAME}-sdl .endif post-extract: - @${UNZIP_CMD} -aq \ - -o ${WRKDIR}/${PORTNAME}enginesource${PORTVERSION}.zip \ + @${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} \ + ${WRKDIR}/${PORTNAME}enginesource${PORTVERSION}.zip \ -d ${WRKDIR} do-install: @@ -80,7 +81,7 @@ do-install: @${TOUCH} ${DATADIR}/dummy .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/darkplaces.txt ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/darkplaces.txt ${DOCSDIR} .endif .include diff --git a/games/quake2-ctf/Makefile b/games/quake2-ctf/Makefile index 590346bb51fb..0737eb73d8e6 100644 --- a/games/quake2-ctf/Makefile +++ b/games/quake2-ctf/Makefile @@ -20,6 +20,7 @@ MAINTAINER= alepulver@FreeBSD.org COMMENT= Quake II CTF (Capture The Flag) modification USE_ZIP= yes +USE_DOS2UNIX= ../../../ctf/readme.txt ../../../ctf/server.cfg WRKSRC= ${WRKDIR}/${CTF_SRC:S/.tar.gz//}/src/ctf LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} @@ -36,7 +37,7 @@ do-extract: @${MKDIR} ${WRKDIR} @${TAR} zxf ${DISTDIR}/${DIST_SUBDIR}/${CTF_SRC} -C ${WRKDIR} \ --include "${CTF_SRC:S/.tar.gz//}/src/ctf/*" - @${UNZIP_CMD} -aq -d ${WRKDIR}/ctf \ + @${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} -d ${WRKDIR}/ctf \ ${DISTDIR}/${DIST_SUBDIR}/${CTF_DATA} -x *.dll *.ico post-extract: diff --git a/games/quake2-data/Makefile b/games/quake2-data/Makefile index f6962e077c6e..762fc920e9db 100644 --- a/games/quake2-data/Makefile +++ b/games/quake2-data/Makefile @@ -19,6 +19,7 @@ DISTFILES= ${Q2_UPDATE}:data \ MAINTAINER= alepulver@FreeBSD.org COMMENT= Quake II data files +#XXX need info-unzip for q2-314-demo-x86.exe USE_ZIP= yes NO_WRKSUBDIR= yes diff --git a/games/xevil/Makefile b/games/xevil/Makefile index 4b1bf70401db..8aa459f18e9a 100644 --- a/games/xevil/Makefile +++ b/games/xevil/Makefile @@ -17,6 +17,7 @@ COMMENT= A fast-action, networked, anti-social, kill-everything game USE_ZIP= yes USE_XORG= xpm +USE_DOS2UNIX= makefile config.mk cmn/makefile cmn/*.cpp cmn/*.h x11/makefile x11/*.cpp MAKEFILE= makefile ALL_TARGET= freebsd MAKE_JOBS_UNSAFE= yes @@ -32,7 +33,7 @@ pre-extract: @${MKDIR} ${WRKDIR}/${DISTNAME} do-extract: - @unzip -aqo ${DISTDIR}/${DISTFILES} -d ${WRKSRC} + @${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} -d ${WRKSRC} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/x11/FREEBSD/xevil ${PREFIX}/bin/xevil diff --git a/graphics/fli2gif/Makefile b/graphics/fli2gif/Makefile index 0668816c9d5d..53be87f5cd1a 100644 --- a/graphics/fli2gif/Makefile +++ b/graphics/fli2gif/Makefile @@ -12,15 +12,16 @@ CATEGORIES= graphics MASTER_SITES= http://jeff.bovine.net/download/fli2gif/ DISTNAME= ${PORTNAME}b -MAINTAINER= ports@FreeBSD.org +MAINTAINER= spam@rm-rf.kiev.ua COMMENT= Automatic Flic to animated GIF convertor NO_WRKSUBDIR= yes USE_ZIP= yes +USE_DOS2UNIX= fli2gif.cpp FLI2GIF.TXT post-extract: - @cd ${WRKSRC} && unzip -q -aa source.zip \ + @cd ${WRKSRC} && ${UNZIP_CMD} -q source.zip \ && ${LN} -sf GIF.CPP gif.cpp \ && ${LN} -sf FLIPLAY.CPP fliplay.cpp @@ -31,7 +32,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fli2gif ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/*.TXT ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/FLI2GIF.TXT ${DOCSDIR} .endif .include diff --git a/graphics/fli2gif/files/patch-ab b/graphics/fli2gif/files/patch-fli2gif.c similarity index 63% rename from graphics/fli2gif/files/patch-ab rename to graphics/fli2gif/files/patch-fli2gif.c index 4f1830c38489..4133156dd394 100644 --- a/graphics/fli2gif/files/patch-ab +++ b/graphics/fli2gif/files/patch-fli2gif.c @@ -1,5 +1,4 @@ ---- fli2gif.cpp.orig Fri Sep 6 00:10:14 1996 -+++ fli2gif.cpp Fri Nov 1 06:18:18 2002 +Index: fli2gif.cpp @@ -43,7 +43,9 @@ // ****************** #include @@ -11,6 +10,15 @@ #include #if defined(__TURBOC__) || defined(_MSC_VER) #include +@@ -81,7 +83,7 @@ + // *** Function prototypes *** + // ***************************** + void handle_error(int errorcode); +-char *add_extension(char *filename, char *extension, BOOL enforce); ++char *add_extension(char *filename, const char *extension, BOOL enforce); + + + // ************************** @@ -95,7 +97,7 @@ //############################################################################ //############################################################################ @@ -38,3 +46,12 @@ #endif ")\n\n"); { +@@ -389,7 +393,7 @@ + // Takes a user-entered filename and adds the specified extension if an + // entension is not explicitly stated in the passed filename. A pointer + // to a static buffer is returned. +-char *add_extension(char *filename, char *extension, BOOL enforce) ++char *add_extension(char *filename, const char *extension, BOOL enforce) + { + static char Path[_MAX_PATH]; + diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile index 5abf781349b0..a2936771ea1a 100644 --- a/misc/astrolog/Makefile +++ b/misc/astrolog/Makefile @@ -22,6 +22,7 @@ MAINTAINER= ache@FreeBSD.org COMMENT= An astrology program for X11 and alpha-numeric terminals USE_ZIP= yes +USE_DOS2UNIX= ephem/EPHINDEX.TXT .if !defined(WITHOUT_X11) USE_XORG= x11 MAKE_ARGS= -DX11 @@ -35,7 +36,7 @@ NO_WRKSUBDIR= yes post-extract: -@${MKDIR} ${WRKDIR}/ephem - ${UNZIP_CMD} -qao ${_DISTDIR}/${EPHEM} -d ${WRKDIR}/ephem + ${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EPHEM} -d ${WRKDIR}/ephem post-patch: @${REINPLACE_CMD} -e "s@malloc.h@stdlib.h@g" \ diff --git a/misc/projectionlib/Makefile b/misc/projectionlib/Makefile index da34f307400b..2919d976e0ad 100644 --- a/misc/projectionlib/Makefile +++ b/misc/projectionlib/Makefile @@ -16,11 +16,10 @@ COMMENT= A C++ wrapper for the USGS GCTP projection library LIB_DEPENDS= gctpc.1:${PORTSDIR}/misc/gctpc -EXTRACT_CMD= unzip -a - WRKSRC= ${WRKDIR}/dlgv32/ProjectionLib USE_ZIP= yes +USE_DOS2UNIX= *.cpp *.h USE_LDCONFIG= yes MAKEFILE= ${FILESDIR}/Makefile diff --git a/print/acrobatviewer/Makefile b/print/acrobatviewer/Makefile index daed98ab6a03..7e6e95677d0a 100644 --- a/print/acrobatviewer/Makefile +++ b/print/acrobatviewer/Makefile @@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.adobe.com/pub/adobe/magic/acrobatviewer/unix/1.x/:1 \ MAINTAINER= ports@FreeBSD.org COMMENT= Viewer for the PDF files written in Java(TM) +#XXX need info-unzip for archive.zip USE_ZIP= yes USE_JAVA= yes JAVA_VERSION= 1.3+ diff --git a/sysutils/megarc/Makefile b/sysutils/megarc/Makefile index 10736d3b4cf5..7b7544d27f9c 100644 --- a/sysutils/megarc/Makefile +++ b/sysutils/megarc/Makefile @@ -15,6 +15,7 @@ MAINTAINER= gerrit.beine@gmx.de COMMENT= LSI Logic's MegaRAID controlling software USE_ZIP= yes +USE_DOS2UNIX= Release\ History.txt NO_BUILD= yes NO_WRKSUBDIR= yes @@ -25,7 +26,7 @@ PLIST_FILES= sbin/megarc PORTDOCS= * post-extract: - @cd ${WRKSRC} && ${UNZIP_CMD} -aqo 'MegaRC 1.04.zip' + @cd ${WRKSRC} && ${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} 'MegaRC 1.04.zip' do-install: ${INSTALL_PROGRAM} ${WRKSRC}/megarc ${PREFIX}/sbin diff --git a/textproc/docbook-420/Makefile b/textproc/docbook-420/Makefile index 249ca4c3ca98..3ec9ce88f82f 100644 --- a/textproc/docbook-420/Makefile +++ b/textproc/docbook-420/Makefile @@ -41,7 +41,7 @@ pre-su-install: @[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION} do-install: - @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/${PORTVERSION} + @${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/${PORTVERSION} @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${PORTVERSION}/catalog @${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${PORTVERSION}/catalog @${CHMOD} ${SHAREMODE} ${INSTDIR}/${PORTVERSION}/* diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile index a923a9c7c549..fa920c45e89d 100644 --- a/textproc/iso8879/Makefile +++ b/textproc/iso8879/Makefile @@ -34,6 +34,7 @@ pre-su-install: @[ -d ${INSTDIR} ] || ${MKDIR} ${INSTDIR} do-install: + @${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} -d ${INSTDIR} @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR} @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/catalog @${CHMOD} ${SHAREMODE} ${INSTDIR}/*