Date: Sat, 21 Feb 2015 08:46:48 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379492 - head/archivers/unzip Message-ID: <201502210846.t1L8kmj9019502@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Sat Feb 21 08:46:47 2015 New Revision: 379492 URL: https://svnweb.freebsd.org/changeset/ports/379492 QAT: https://qat.redports.org/buildarchive/r379492/ Log: Remove the historic option INSTALL_AS_INFOUNZIP which would install the unzip binary as info-unzip instead of unzip. Setting this options breaks ports such as java/openjdk7. This could be fixed but the submitter an I don't see a good reason why to keep this option. PR: 197750 Submitted by: amdmi3 Modified: head/archivers/unzip/Makefile Modified: head/archivers/unzip/Makefile ============================================================================== --- head/archivers/unzip/Makefile Sat Feb 21 08:39:17 2015 (r379491) +++ head/archivers/unzip/Makefile Sat Feb 21 08:46:47 2015 (r379492) @@ -3,7 +3,7 @@ PORTNAME= unzip PORTVERSION= 6.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= archivers MASTER_SITES= SF/infozip/UnZip%206.x%20%28latest%29/UnZip%20${PORTVERSION}/:main \ SF/infozip/UnZip%205.x%20and%20earlier/5.51/:unreduce @@ -21,14 +21,9 @@ LICENSE_PERMS= dist-mirror dist-sell pkg ALL_TARGET= bsd MAKEFILE= unix/Makefile MAKE_ARGS= LF2="${STRIP}" -.if defined(INSTALL_AS_INFOUNZIP) -UNZIP_NAME= info-unzip -.else -UNZIP_NAME= unzip -.endif PORTDOCS= README WHERE -MANPAGES= ${UNZIP_NAME}.1 funzip.1 unzipsfx.1 zipgrep.1 zipinfo.1 -PLIST_FILES= bin/${UNZIP_NAME} bin/funzip bin/unzipsfx bin/zipgrep \ +MANPAGES= unzip.1 funzip.1 unzipsfx.1 zipgrep.1 zipinfo.1 +PLIST_FILES= bin/unzip bin/funzip bin/unzipsfx bin/zipgrep \ bin/zipinfo PLIST_FILES+= ${MANPAGES:C|^(.*)\.([1-9])$|man/man\2/\1.\2.gz|} @@ -88,22 +83,15 @@ CATEGORIES+= russian EXTRA_PATCHES+= ${FILESDIR}/extra-ru-patch-ebcdic.h .endif -.if !defined(INSTALL_AS_INFOUNZIP) -pre-fetch: - @${ECHO} "" - @${ECHO} "Use INSTALL_AS_INFOUNZIP=yes to install Info Unzip as ${PREFIX}/bin/info-unzip" - @${ECHO} "" -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unzip \ - ${STAGEDIR}${PREFIX}/bin/${UNZIP_NAME} + ${STAGEDIR}${PREFIX}/bin cd ${WRKSRC} && \ ${INSTALL_PROGRAM} funzip unzipsfx ${STAGEDIR}${PREFIX}/bin - ${LN} -sf ${UNZIP_NAME} ${STAGEDIR}${PREFIX}/bin/zipinfo + ${LN} -sf unzip ${STAGEDIR}${PREFIX}/bin/zipinfo ${INSTALL_SCRIPT} ${WRKSRC}/unix/zipgrep ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/unzip.1 \ - ${STAGEDIR}${MAN1PREFIX}/man/man1/${UNZIP_NAME}.1 + ${STAGEDIR}${MAN1PREFIX}/man/man1 cd ${WRKSRC}/man && ${INSTALL_MAN} ${MANPAGES:Nunzip.1:Ninfo-unzip.1} \ ${STAGEDIR}${MAN1PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502210846.t1L8kmj9019502>