From owner-svn-ports-all@FreeBSD.ORG  Thu Jul 26 22:20:35 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3117C1065674;
	Thu, 26 Jul 2012 22:20:35 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1C7538FC1B;
	Thu, 26 Jul 2012 22:20:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6QMKYDG034676;
	Thu, 26 Jul 2012 22:20:34 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6QMKYpQ034674;
	Thu, 26 Jul 2012 22:20:34 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201207262220.q6QMKYpQ034674@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Thu, 26 Jul 2012 22:20:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301585 - head/www/mod_musicindex
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jul 2012 22:20:35 -0000

Author: ohauer
Date: Thu Jul 26 22:20:34 2012
New Revision: 301585
URL: http://svn.freebsd.org/changeset/ports/301585

Log:
  - fix support for non default options
  
  with options NG and usage of APACHE_PKGNAMEPREFIX
  bsd.port.pre.mk has to be included before OPTIONS
  else OPTIONFILE points a non existing location and
  additional options are ignored
  
  no version bump, it affects only non default options

Modified:
  head/www/mod_musicindex/Makefile

Modified: head/www/mod_musicindex/Makefile
==============================================================================
--- head/www/mod_musicindex/Makefile	Thu Jul 26 22:10:13 2012	(r301584)
+++ head/www/mod_musicindex/Makefile	Thu Jul 26 22:20:34 2012	(r301585)
@@ -16,6 +16,10 @@ COMMENT=	Apache module that allows downl
 
 LICENSE=	LGPL21
 
+USE_APACHE=	20+
+
+.include <bsd.port.pre.mk>
+
 OPTIONS_DEFINE=	NLS FLAC MP3 MP4 VORBIS LIBARCHIVE FILECACHE MYSQLCACHE
 OPTIONS_DEFAULT=NLS MP3 LIBARCHIVE FILECACHE
 
@@ -27,8 +31,6 @@ MYSQLCACHE_DESC=	MySQL caching support
 
 MAKE_JOBS_SAFE=	yes
 
-USE_APACHE=	20+
-
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -119,4 +121,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG} ""
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>