Date: Tue, 11 Mar 2014 17:04:07 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347891 - head/mail/qmailadmin Message-ID: <201403111704.s2BH470l087027@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403111704.s2BH470l087027>