Attachment #28980 for bug #48534

View | Details | Raw Unified | Return to bug 48534
Collapse All | Expand All




#

PORTNAME=	vqadmin
PORTVERSION=	2.3.5
CATEGORIES=	mail
MASTER_SITES= 	http://www.inter7.com/devel/ \
		http://www.inter7.com/vqadmin/

MAINTAINER=	nbm@FreeBSD.org

LIB_DEPENDS=	getline:${PORTSDIR}/devel/libgetline
BUILD_DEPENDS= \
	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
RUN_DEPENDS= \
	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail

GNU_CONFIGURE=	YES
USE_REINPLACE=	YES

CGI_ROOT?=${PREFIX}/www/cgi-bin.default
DOC_ROOT?=${PREFIX}/www/htdocs

CONFIGURE_ARGS=	--enable-cgibindir=${CGI_ROOT} \
		--enable-htmldir=${DOC_ROOT}

.include <bsd.port.pre.mk>

PLIST_SUB+=	CGI_ROOT=${CGI_ROOT} DOC_ROOT=${DOC_ROOT}

post-patch:
	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
		${WRKSRC}/Makefile.in

.include <bsd.port.post.mk>

Line 1 Link Here

(-)/usr/ports/mail/vqadmin/distinfo (-1 / +1 lines)
1	MD5 (vqadmin-2.2.tar.gz) = 1584061e56a6bc7b5d4c5175c6b0cba6	1	MD5 (vqadmin-2.3.5.tar.gz) = 38636d74f6d919e97bbe55c3a096444b

Line 0 Link Here

(-)/usr/ports/mail/vqadmin/files/patch-Makefile.in (+11 lines)
	1	--- Makefile.in.orig Sat Jan 18 12:25:01 2003
	2	+++ Makefile.in Sat Jan 18 12:26:45 2003
	3	@@ -96,7 +96,7 @@
	4
	5	CPPFLAGS = @CPPFLAGS@
	6	LDFLAGS = @LDFLAGS@
	7	-LIBS = @LIBS@
	8	+LIBS = -L%%LOCALBASE%%/lib -lgetline @LIBS@
	9	vqadmin_OBJECTS = vqadmin.o cgi.o template.o global.o acl.o misc.o \
	10	domain.o lang.o user.o cedit.o
	11	vqadmin_DEPENDENCIES =




--- configure.orig	Fri Feb 21 18:40:17 2003
+++ configure	Fri Feb 21 18:43:08 2003
@@ -1389,19 +1389,17 @@
 cgibindir=""
 wwwroot=""
 
-for f in /home/httpd /usr/local/apache /usr/local/www /var/lib/httpd /var/www /usr/local/www /var/www
-do
-    if test -d $f/html
-    then 
-        wwwroot=$f/html
-    fi
+if test "${enable_htmldir+set}" = set; then
+  enableval="$enable_htmldir"
+  wwwroot="$enableval"
+else
 
-    if test -d $f/cgi-bin
-    then
-        cgibindir=$f/cgi-bin
-    fi
-done
+        if test "$wwwroot" = ""
+        then
+            { echo "configure: error: Unable to find your html directory, specify --enable-htmldir." 1>&2; exit 1; }
+        fi
 
+fi
 
 
 # Check whether --enable-cgibindir or --disable-cgibindir was given.




@cwd %%CGI_ROOT%%
vqadmin/.htaccess
vqadmin/html/add_alias_domain.html
vqadmin/html/add_domain.html
vqadmin/html/add_user.html
vqadmin/html/auth_failed.html
vqadmin/html/br
vqadmin/html/control.html
vqadmin/html/ctrl_file.html
vqadmin/html/de
vqadmin/html/del_domain.html
vqadmin/html/del_user.html
vqadmin/html/en
vqadmin/html/en-us
vqadmin/html/error.html
vqadmin/html/fi
vqadmin/html/fr
vqadmin/html/info_user.html
vqadmin/html/init_error.html
vqadmin/html/it
vqadmin/html/ja
vqadmin/html/main.html
vqadmin/html/mod_domain.html
vqadmin/html/mod_user.html
vqadmin/html/nl
vqadmin/html/pl
vqadmin/html/qmail_controls_bottom.html
vqadmin/html/qmail_controls_middle.html
vqadmin/html/qmail_controls_top.html
vqadmin/html/show_domains.html
vqadmin/html/show_users.html
vqadmin/html/view_domain.html
vqadmin/html/view_user.html
vqadmin/vqadmin.acl
vqadmin/vqadmin.cgi
@dirrm vqadmin/html
@dirrm vqadmin
@cwd %%DOC_ROOT%%
images/vqadmin/vqadmin.css
@dirrm images/vqadmin
@dirrm images

Return to bug 48534

Lines 6-23 Link Here

(-)/usr/ports/mail/vqadmin/Makefile (-6 / +22 lines)
6	#	6	#
7		7
8	PORTNAME= vqadmin	8	PORTNAME= vqadmin
9	PORTVERSION= 2.2	9	PORTVERSION= 2.3.5
10	CATEGORIES= mail	10	CATEGORIES= mail
11	MASTER_SITES= http://www.inter7.com/vqadmin/	11	MASTER_SITES= http://www.inter7.com/devel/ \
		12	http://www.inter7.com/vqadmin/
12		13
13	MAINTAINER= nbm@FreeBSD.org	14	MAINTAINER= nbm@FreeBSD.org
14		15
		16	LIB_DEPENDS= getline:${PORTSDIR}/devel/libgetline
15	BUILD_DEPENDS= \	17	BUILD_DEPENDS= \
16	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail	18	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
17	RUN_DEPENDS= \	19	RUN_DEPENDS= \
18	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail	20	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
19		21
20	GNU_CONFIGURE= YES	22	GNU_CONFIGURE= YES
21	CONFIGURE_ARGS= --enable-cgibindir=${PREFIX}/www/cgi-bin.default/	23	USE_REINPLACE= YES
22		24
23	.include <bsd.port.mk>	25	CGI_ROOT?=${PREFIX}/www/cgi-bin.default
		26	DOC_ROOT?=${PREFIX}/www/htdocs
		27
		28	CONFIGURE_ARGS= --enable-cgibindir=${CGI_ROOT} \
		29	--enable-htmldir=${DOC_ROOT}
		30
		31	.include <bsd.port.pre.mk>
		32
		33	PLIST_SUB+= CGI_ROOT=${CGI_ROOT} DOC_ROOT=${DOC_ROOT}
		34
		35	post-patch:
		36	@${REINPLACE_CMD} -e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g" \
		37	${WRKSRC}/Makefile.in
		38
		39	.include <bsd.port.post.mk>

Line 0 Link Here

(-)/usr/ports/mail/vqadmin/files/patch-configure (+31 lines)
	1	--- configure.orig Fri Feb 21 18:40:17 2003
	2	+++ configure Fri Feb 21 18:43:08 2003
	3	@@ -1389,19 +1389,17 @@
	4	cgibindir=""
	5	wwwroot=""
	6
	7	-for f in /home/httpd /usr/local/apache /usr/local/www /var/lib/httpd /var/www /usr/local/www /var/www
	8	-do
	9	- if test -d $f/html
	10	- then
	11	- wwwroot=$f/html
	12	- fi
	13	+if test "${enable_htmldir+set}" = set; then
	14	+ enableval="$enable_htmldir"
	15	+ wwwroot="$enableval"
	16	+else
	17
	18	- if test -d $f/cgi-bin
	19	- then
	20	- cgibindir=$f/cgi-bin
	21	- fi
	22	-done
	23	+ if test "$wwwroot" = ""
	24	+ then
	25	+ { echo "configure: error: Unable to find your html directory, specify --enable-htmldir." 1>&2; exit 1; }
	26	+ fi
	27
	28	+fi
	29
	30
	31	# Check whether --enable-cgibindir or --disable-cgibindir was given.

Lines 1-27 Link Here

(-)/usr/ports/mail/vqadmin/pkg-plist (-27 / +41 lines)
1	bin/vqadmin	1	@cwd %%CGI_ROOT%%
2	www/cgi-bin.default/vqadmin/.htaccess	2	vqadmin/.htaccess
3	www/cgi-bin.default/vqadmin/html/add_domain.html	3	vqadmin/html/add_alias_domain.html
4	www/cgi-bin.default/vqadmin/html/add_user.html	4	vqadmin/html/add_domain.html
5	www/cgi-bin.default/vqadmin/html/auth_failed.html	5	vqadmin/html/add_user.html
6	www/cgi-bin.default/vqadmin/html/br	6	vqadmin/html/auth_failed.html
7	www/cgi-bin.default/vqadmin/html/del_domain.html	7	vqadmin/html/br
8	www/cgi-bin.default/vqadmin/html/del_user.html	8	vqadmin/html/control.html
9	www/cgi-bin.default/vqadmin/html/en	9	vqadmin/html/ctrl_file.html
10	www/cgi-bin.default/vqadmin/html/en-us	10	vqadmin/html/de
11	www/cgi-bin.default/vqadmin/html/error.html	11	vqadmin/html/del_domain.html
12	www/cgi-bin.default/vqadmin/html/info_user.html	12	vqadmin/html/del_user.html
13	www/cgi-bin.default/vqadmin/html/init_error.html	13	vqadmin/html/en
14	www/cgi-bin.default/vqadmin/html/it	14	vqadmin/html/en-us
15	www/cgi-bin.default/vqadmin/html/main.html	15	vqadmin/html/error.html
16	www/cgi-bin.default/vqadmin/html/mod_domain.html	16	vqadmin/html/fi
17	www/cgi-bin.default/vqadmin/html/mod_user.html	17	vqadmin/html/fr
18	www/cgi-bin.default/vqadmin/html/show_domains.html	18	vqadmin/html/info_user.html
19	www/cgi-bin.default/vqadmin/html/show_users.html	19	vqadmin/html/init_error.html
20	www/cgi-bin.default/vqadmin/html/view_domain.html	20	vqadmin/html/it
21	www/cgi-bin.default/vqadmin/html/view_user.html	21	vqadmin/html/ja
22	www/cgi-bin.default/vqadmin/vqadmin.acl	22	vqadmin/html/main.html
23	www/cgi-bin.default/vqadmin/vqadmin.cgi	23	vqadmin/html/mod_domain.html
24	@dirrm www/cgi-bin.default/vqadmin/html	24	vqadmin/html/mod_user.html
25	@dirrm www/cgi-bin.default/vqadmin	25	vqadmin/html/nl
26	@dirrm www/cgi-bin.default	26	vqadmin/html/pl
27	@dirrm www	27	vqadmin/html/qmail_controls_bottom.html
		28	vqadmin/html/qmail_controls_middle.html
		29	vqadmin/html/qmail_controls_top.html
		30	vqadmin/html/show_domains.html
		31	vqadmin/html/show_users.html
		32	vqadmin/html/view_domain.html
		33	vqadmin/html/view_user.html
		34	vqadmin/vqadmin.acl
		35	vqadmin/vqadmin.cgi
		36	@dirrm vqadmin/html
		37	@dirrm vqadmin
		38	@cwd %%DOC_ROOT%%
		39	images/vqadmin/vqadmin.css
		40	@dirrm images/vqadmin
		41	@dirrm images