aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorohauer <ohauer@FreeBSD.org>2011-07-03 03:04:26 +0800
committerohauer <ohauer@FreeBSD.org>2011-07-03 03:04:26 +0800
commitab9c2db7708ad229972c0b0c2fad577f55810244 (patch)
tree88b3fb6b98b96d8b7a2d868b57aa3f09ef81a722
parent0f3564546bb548c61ee38a3fa5f1096b62b3044a (diff)
downloadfreebsd-ports-gnome-ab9c2db7708ad229972c0b0c2fad577f55810244.tar.gz
freebsd-ports-gnome-ab9c2db7708ad229972c0b0c2fad577f55810244.tar.zst
freebsd-ports-gnome-ab9c2db7708ad229972c0b0c2fad577f55810244.zip
- use own WWWDIR and USE_APACHE_RUN macro
instead hardcoded WWW_DIR and RUN_DEPEND on ${WWW_DIR}:${PORTSDIR}/www/apache13 - bump PORTVERSION
-rw-r--r--mail/vqregister/Makefile10
-rw-r--r--mail/vqregister/distinfo1
-rw-r--r--mail/vqregister/files/patch-Makefile2
-rw-r--r--mail/vqregister/pkg-plist26
4 files changed, 17 insertions, 22 deletions
diff --git a/mail/vqregister/Makefile b/mail/vqregister/Makefile
index 508c2f0c67a6..c8b9af4e2bc0 100644
--- a/mail/vqregister/Makefile
+++ b/mail/vqregister/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vqregister
PORTVERSION= 2.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail www
MASTER_SITES= http://www.inter7.com/vqregister/
@@ -15,15 +15,13 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An extremely admin-configurable email user signup CGI
BUILD_DEPENDS= ${VPOPMAIL_DIR}:${PORTSDIR}/mail/vpopmail
-RUN_DEPENDS= ${VPOPMAIL_DIR}:${PORTSDIR}/mail/vpopmail \
- ${WWW_DIR}:${PORTSDIR}/www/apache13
+RUN_DEPENDS:= ${BUILD_DEPENDS}
+USE_APACHE_RUN= 13+
VPOPMAIL_DIR?= ${LOCALBASE}/vpopmail
-WWW_DIR?= ${LOCALBASE}/www
USE_MYSQL= yes
-MAKE_ENV= VDIR=${VPOPMAIL_DIR} WWW_DIR=${WWW_DIR}
-PLIST_SUB= WWW_DIR=${WWW_DIR}
+MAKE_ENV= VDIR=${VPOPMAIL_DIR} WWWDIR=${WWWDIR}
DOCS= CONFIG CONTRIBUTORS FORM HISTORY TEMPLATE
diff --git a/mail/vqregister/distinfo b/mail/vqregister/distinfo
index 437d34b7fe2d..1d94031d1ee4 100644
--- a/mail/vqregister/distinfo
+++ b/mail/vqregister/distinfo
@@ -1,3 +1,2 @@
-MD5 (vqregister-2.6.tar.gz) = 7f0f0808f03096ef5c7203693842f9c4
SHA256 (vqregister-2.6.tar.gz) = c6ae891759f071f90a91071d96b842678c14c31c1bc86ce166fc135059b304fe
SIZE (vqregister-2.6.tar.gz) = 16821
diff --git a/mail/vqregister/files/patch-Makefile b/mail/vqregister/files/patch-Makefile
index 7a7e5853ac23..5c0e82cdc6a1 100644
--- a/mail/vqregister/files/patch-Makefile
+++ b/mail/vqregister/files/patch-Makefile
@@ -17,7 +17,7 @@
vpopmail.o db.o field.o badhosts.o
-INSTALL_DIR = /usr/local/apache/cgi-bin/vqregister
-+INSTALL_DIR = ${WWW_DIR}/cgi-bin/vqregister
++INSTALL_DIR = ${WWWDIR}
INSTALL_BIN = vqregister.cgi
INSTALL_UID = vpopmail
INSTALL_GID = vchkpw
diff --git a/mail/vqregister/pkg-plist b/mail/vqregister/pkg-plist
index ac191c566535..c9d39e7ff087 100644
--- a/mail/vqregister/pkg-plist
+++ b/mail/vqregister/pkg-plist
@@ -1,20 +1,18 @@
-@comment $FreeBSD$
%%PORTDOCS%%%%DOCSDIR%%/CONFIG
%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
%%PORTDOCS%%%%DOCSDIR%%/FORM
%%PORTDOCS%%%%DOCSDIR%%/HISTORY
%%PORTDOCS%%%%DOCSDIR%%/TEMPLATE
+%%WWWDIR%%/html/error.html
+%%WWWDIR%%/html/failure.html
+%%WWWDIR%%/html/init_error.html
+%%WWWDIR%%/html/register.html
+%%WWWDIR%%/html/register.with.password.html
+%%WWWDIR%%/html/success.html
+%%WWWDIR%%/html/success.with.password.html
+%%WWWDIR%%/vqregister.cgi
+%%WWWDIR%%/vqregister.conf
+%%WWWDIR%%/vqregister.email
+@dirrm %%WWWDIR%%/html
+@dirrm %%WWWDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@cwd %%WWW_DIR%%
-cgi-bin/vqregister/vqregister.cgi
-cgi-bin/vqregister/vqregister.email
-cgi-bin/vqregister/vqregister.conf
-cgi-bin/vqregister/html/error.html
-cgi-bin/vqregister/html/failure.html
-cgi-bin/vqregister/html/init_error.html
-cgi-bin/vqregister/html/register.html
-cgi-bin/vqregister/html/register.with.password.html
-cgi-bin/vqregister/html/success.html
-cgi-bin/vqregister/html/success.with.password.html
-@dirrm cgi-bin/vqregister/html
-@dirrm cgi-bin/vqregister