From owner-svn-ports-head@freebsd.org  Mon Oct 17 06:16:59 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C5345C151E6;
 Mon, 17 Oct 2016 06:16:59 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 92BE01C0B;
 Mon, 17 Oct 2016 06:16:59 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9H6Gwpr082934;
 Mon, 17 Oct 2016 06:16:58 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9H6GwYh082933;
 Mon, 17 Oct 2016 06:16:58 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201610170616.u9H6GwYh082933@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Mon, 17 Oct 2016 06:16:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r424098 - head/www/subsonic
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Oct 2016 06:16:59 -0000

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}