diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-03-11 17:04:07 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-03-11 17:04:07 +0000 |
| commit | 486766cb49d59aae2ec104579f782f8208516e66 (patch) | |
| tree | ce9dc75076c821868ce4d26b0fecb291e9d09b2a /mail | |
| parent | 33b885f53456740dfb3443667deefc9fc437f95a (diff) | |
| download | ports-486766cb49d59aae2ec104579f782f8208516e66.tar.gz ports-486766cb49d59aae2ec104579f782f8208516e66.zip | |
Notes
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/qmailadmin/Makefile | 10 | ||||
| -rw-r--r-- | mail/qmailadmin/pkg-plist | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile index 0434fc44a9c3..ccab5693fce2 100644 --- a/mail/qmailadmin/Makefile +++ b/mail/qmailadmin/Makefile @@ -53,11 +53,11 @@ NOCACHE_DESC= Prohibit caching via http headers 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 diff --git a/mail/qmailadmin/pkg-plist b/mail/qmailadmin/pkg-plist index 5b5808995d7e..1b369ebb98bb 100644 --- a/mail/qmailadmin/pkg-plist +++ b/mail/qmailadmin/pkg-plist @@ -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%% |