Date: Mon, 17 Oct 2016 06:16:58 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424098 - head/www/subsonic Message-ID: <201610170616.u9H6GwYh082933@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Oct 17 06:16:58 2016 New Revision: 424098 URL: https://svnweb.freebsd.org/changeset/ports/424098 Log: www/subsonic: Fix extract better There was two issues: 1) Things like USES have to be defined prior to including bsd.options.mk and the like. 2) the UNZIP_CMD is points to the ports unzip which isn't loaded unless USES=zip:infozip (it would have been UNZIP_NATIVE_CMD). After fixing USES, change UNZIP_CMD to EXTRACT_CMD to fix everywhere. Modified: head/www/subsonic/Makefile Modified: head/www/subsonic/Makefile ============================================================================== --- head/www/subsonic/Makefile Mon Oct 17 06:04:34 2016 (r424097) +++ head/www/subsonic/Makefile Mon Oct 17 06:16:58 2016 (r424098) @@ -59,8 +59,6 @@ XMP_RUN_DEPENDS= xmp:audio/xmp MPC_RUN_DEPENDS= mpcdec:audio/musepack APE_RUN_DEPENDS= mac:audio/mac -.include <bsd.port.options.mk> - NO_BUILD= yes USE_JAVA= yes JAVA_VERSION= 1.6+ @@ -78,6 +76,8 @@ SUB_FILES= message-common\ message-transcoding SUB_LIST= SUBSONIC_HOME="${SUBSONIC_HOME}" +.include <bsd.port.options.mk> + .if ${PORT_OPTIONS:MTOMCAT8} APPPKGMESSAGE= pkg-message-tomcat DISTVER= tomcat @@ -120,7 +120,7 @@ SUB_LIST+= CONTAINERFLAGS="resin3_flags" post-extract: @${MKDIR} ${WRKSRC} - @${UNZIP_CMD} -d ${WRKSRC} ${WRKDIR}/${PORTNAME}.war + @${EXTRACT_CMD} -d ${WRKSRC} ${WRKDIR}/${PORTNAME}.war pre-install: @${RM} ${PLIST}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610170616.u9H6GwYh082933>