From owner-svn-ports-all@FreeBSD.ORG  Tue Mar 11 17:04:08 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3FFE6E3F;
 Tue, 11 Mar 2014 17:04:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 20EA6EA8;
 Tue, 11 Mar 2014 17:04:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BH48P4087029;
 Tue, 11 Mar 2014 17:04:08 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BH470l087027;
 Tue, 11 Mar 2014 17:04:07 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201403111704.s2BH470l087027@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 11 Mar 2014 17:04:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347891 - head/mail/qmailadmin
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Tue, 11 Mar 2014 17:04:08 -0000

Author: bdrewery
Date: Tue Mar 11 17:04:07 2014
New Revision: 347891
URL: http://svnweb.freebsd.org/changeset/ports/347891
QAT: https://qat.redports.org/buildarchive/r347891/

Log:
  Allow overriding webdir prefix via WEBPREFIX

Modified:
  head/mail/qmailadmin/Makefile
  head/mail/qmailadmin/pkg-plist

Modified: head/mail/qmailadmin/Makefile
==============================================================================
--- head/mail/qmailadmin/Makefile	Tue Mar 11 16:36:27 2014	(r347890)
+++ head/mail/qmailadmin/Makefile	Tue Mar 11 17:04:07 2014	(r347891)
@@ -53,11 +53,11 @@ NOCACHE_DESC=		Prohibit caching via http
 
 CONFIGURE_ARGS+=	\
 	--enable-qmaildir=${QMAIL_PREFIX} \
-	--enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
-	--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \
+	--enable-htmldir=${WEBPREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
+	--enable-imagedir=${WEBPREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \
 	--enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \
 	--enable-htmllibdir=${DATADIR} \
-	--enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
+	--enable-cgibindir=${WEBPREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
 	--enable-cgipath=${CGIBINURL}/${CGIBINSUBDIR}/qmailadmin \
 	--enable-vpopmaildir=${VPOPMAIL_DIR} \
 	--enable-autoresponder-path=${LOCALBASE}/bin \
@@ -117,9 +117,11 @@ WEBDATASUBDIR?=	qmailadmin
 WEBDATAURL?=
 MAXUSERSPERPAGE?=	15
 MAXALIASESPERPAGE?=	25
+WEBPREFIX?=	${PREFIX}
 
 PLIST_SUB+=	CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
-		WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}"
+		WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}" \
+		REAL_PREFIX="${PREFIX}" WEBPREFIX="${WEBPREFIX}"
 
 # End of user-configurable variables
 

Modified: head/mail/qmailadmin/pkg-plist
==============================================================================
--- head/mail/qmailadmin/pkg-plist	Tue Mar 11 16:36:27 2014	(r347890)
+++ head/mail/qmailadmin/pkg-plist	Tue Mar 11 17:04:07 2014	(r347891)
@@ -53,6 +53,7 @@
 %%DATADIR%%/lang/sv
 %%DATADIR%%/lang/tr
 %%DATADIR%%/lang/zh-cn
+@cwd %%WEBPREFIX%%
 %%CGIBINDIR%%/%%CGIBINSUBDIR%%/qmailadmin
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/delete.png
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/disabled.png
@@ -76,10 +77,11 @@
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/uppermiddle2.png
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/upperright.png
 @dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images
-@unexec /bin/rmdir %D/%%WEBDATADIR%%/%%WEBDATASUBDIR%% 2> /dev/null || true
-@unexec /bin/rmdir %D/%%WEBDATADIR%% 2> /dev/null || true
-@unexec /bin/rmdir %D/%%CGIBINDIR%%/%%CGIBINSUBDIR%% 2> /dev/null || true
-@unexec /bin/rmdir %D/%%CGIBINDIR%% 2> /dev/null || true
+@unexec /bin/rmdir %%WEBPREFIX%%/%%WEBDATADIR%%/%%WEBDATASUBDIR%% 2> /dev/null || true
+@unexec /bin/rmdir %%WEBPREFIX%%/%%WEBDATADIR%% 2> /dev/null || true
+@unexec /bin/rmdir %%WEBPREFIX%%/%%CGIBINDIR%%/%%CGIBINSUBDIR%% 2> /dev/null || true
+@unexec /bin/rmdir %%WEBPREFIX%%/%%CGIBINDIR%% 2> /dev/null || true
+@cwd %%REAL_PREFIX%%
 @dirrm %%DATADIR%%/html
 @dirrm %%DATADIR%%/lang
 @dirrm %%DATADIR%%