Attachment #161740 for bug #203566

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

Lines 24-31 Link Here

(-)Makefile (-3 / +1 lines)
24	--enable-htmldir=${STAGEDIR}${PREFIX}/${WEBDATADIR} \	24	--enable-htmldir=${STAGEDIR}${PREFIX}/${WEBDATADIR} \
25	--enable-qmaildir=${QMAIL_PREFIX}	25	--enable-qmaildir=${QMAIL_PREFIX}
26		26
27	.include <bsd.port.pre.mk>
28
29	PLIST_SUB+= CGIBINDIR=${CGIBINDIR} WEBDATADIR=${WEBDATADIR}	27	PLIST_SUB+= CGIBINDIR=${CGIBINDIR} WEBDATADIR=${WEBDATADIR}
30		28
31	post-patch:	29	post-patch:
Lines 32-35 Link Here
32	@${REINPLACE_CMD} -e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g" \	30	@${REINPLACE_CMD} -e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g" \
33	${WRKSRC}/Makefile.in	31	${WRKSRC}/Makefile.in
34		32
35	.include <bsd.port.post.mk>	33	.include <bsd.port.mk>




--- Makefile.in.orig	2003-09-17 21:21:38 UTC
+++ Makefile.in
@@ -120,7 +120,7 @@ vqadmin_LDFLAGS =
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@

 depcomp =
 am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -527,32 +527,12 @@ install-data-local:
 		cp vqadmin.acl     @cgibindir@/vqadmin ; \
 	fi
 
-	chown              @vpopuser@ @cgibindir@/vqadmin
-	chgrp              @vpopgroup@ @cgibindir@/vqadmin
-	chown -R           @vpopuser@ @cgibindir@/vqadmin/*
-	chgrp -R           @vpopgroup@ @cgibindir@/vqadmin/*
-	chown root         @cgibindir@/vqadmin/vqadmin.cgi
-	chgrp `id -g root` @cgibindir@/vqadmin/vqadmin.cgi
-	chmod u+s,g+s      @cgibindir@/vqadmin/vqadmin.cgi 
-	chmod 755          @cgibindir@/vqadmin
-	chmod 755          @cgibindir@/vqadmin/html
-
-	chown              @vpopuser@ @wwwroot@/images/vqadmin
-	chgrp              @vpopgroup@ @wwwroot@/images/vqadmin
-	chown -R           @vpopuser@ @wwwroot@/images/vqadmin/*
-	chgrp -R           @vpopgroup@ @wwwroot@/images/vqadmin/*
-	chmod 755          @wwwroot@/images/vqadmin
-
 	if test -f @cgibindir@/vqadmin/.htaccess ; then \
 		echo ".htaccess file already in place" ; \
 	else \
 		cp htaccess        @cgibindir@/vqadmin/.htaccess ; \
 	fi
 
-	chown nobody       @cgibindir@/vqadmin/.htaccess
-	chmod u+rw         @cgibindir@/vqadmin/.htaccess
-	chmod go+r         @cgibindir@/vqadmin/.htaccess
-
 acl.o: config.h
 cedit.o: config.h
 cgi.o: config.h

Lines 1-5 Link Here

(-)pkg-plist (-2 / +9 lines)
1	bin/vqadmin	1	bin/vqadmin
2	%%CGIBINDIR%%/vqadmin/.htaccess	2	@owner vpopmail
		3	@group vchkpw
		4	@(nobody,,644) %%CGIBINDIR%%/vqadmin/.htaccess
3	%%CGIBINDIR%%/vqadmin/html/add_alias_domain.html	5	%%CGIBINDIR%%/vqadmin/html/add_alias_domain.html
4	%%CGIBINDIR%%/vqadmin/html/add_domain.html	6	%%CGIBINDIR%%/vqadmin/html/add_domain.html
5	%%CGIBINDIR%%/vqadmin/html/add_domain_body.html	7	%%CGIBINDIR%%/vqadmin/html/add_domain_body.html
Lines 37-41 Link Here
37	%%CGIBINDIR%%/vqadmin/html/view_domain.html	39	%%CGIBINDIR%%/vqadmin/html/view_domain.html
38	%%CGIBINDIR%%/vqadmin/html/view_user.html	40	%%CGIBINDIR%%/vqadmin/html/view_user.html
39	%%CGIBINDIR%%/vqadmin/vqadmin.acl	41	%%CGIBINDIR%%/vqadmin/vqadmin.acl
40	%%CGIBINDIR%%/vqadmin/vqadmin.cgi	42	@(root,wheel,6755) %%CGIBINDIR%%/vqadmin/vqadmin.cgi
41	%%WEBDATADIR%%/images/vqadmin/vqadmin.css	43	%%WEBDATADIR%%/images/vqadmin/vqadmin.css
		44	@dir(,,755) %%WEBDATADIR%%/images/vqadmin
		45	@dir(,,755) %%CGIBINDIR%%/vqadmin/html
		46	@dir(,,755) %%CGIBINDIR%%/vqadmin
		47	@owner
		48	@group

Return to bug 203566

Lines 1-7 Link Here

(-)files/patch-Makefile.in (-4 / +37 lines)
1	--- Makefile.in.orig Sat Jan 18 12:25:01 2003	1	--- Makefile.in.orig 2003-09-17 21:21:38 UTC
2	+++ Makefile.in Sat Jan 18 12:26:45 2003	2	+++ Makefile.in
3	@@ -120,7 +120,7 @@	3	@@ -120,7 +120,7 @@ vqadmin_LDFLAGS =
4	DEFAULT_INCLUDES = -I. -I$(srcdir) -I.	4	DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
5	CPPFLAGS = @CPPFLAGS@	5	CPPFLAGS = @CPPFLAGS@
6	LDFLAGS = @LDFLAGS@	6	LDFLAGS = @LDFLAGS@
7	-LIBS = @LIBS@	7	-LIBS = @LIBS@
Lines 9-11 Link Here
9	depcomp =	9	depcomp =
10	am__depfiles_maybe =	10	am__depfiles_maybe =
11	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \	11	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
		12	@@ -527,32 +527,12 @@ install-data-local:
		13	cp vqadmin.acl @cgibindir@/vqadmin ; \
		14	fi
		15
		16	- chown @vpopuser@ @cgibindir@/vqadmin
		17	- chgrp @vpopgroup@ @cgibindir@/vqadmin
		18	- chown -R @vpopuser@ @cgibindir@/vqadmin/*
		19	- chgrp -R @vpopgroup@ @cgibindir@/vqadmin/*
		20	- chown root @cgibindir@/vqadmin/vqadmin.cgi
		21	- chgrp `id -g root` @cgibindir@/vqadmin/vqadmin.cgi
		22	- chmod u+s,g+s @cgibindir@/vqadmin/vqadmin.cgi
		23	- chmod 755 @cgibindir@/vqadmin
		24	- chmod 755 @cgibindir@/vqadmin/html
		25	-
		26	- chown @vpopuser@ @wwwroot@/images/vqadmin
		27	- chgrp @vpopgroup@ @wwwroot@/images/vqadmin
		28	- chown -R @vpopuser@ @wwwroot@/images/vqadmin/*
		29	- chgrp -R @vpopgroup@ @wwwroot@/images/vqadmin/*
		30	- chmod 755 @wwwroot@/images/vqadmin
		31	-
		32	if test -f @cgibindir@/vqadmin/.htaccess ; then \
		33	echo ".htaccess file already in place" ; \
		34	else \
		35	cp htaccess @cgibindir@/vqadmin/.htaccess ; \
		36	fi
		37
		38	- chown nobody @cgibindir@/vqadmin/.htaccess
		39	- chmod u+rw @cgibindir@/vqadmin/.htaccess
		40	- chmod go+r @cgibindir@/vqadmin/.htaccess
		41	-
		42	acl.o: config.h
		43	cedit.o: config.h
		44	cgi.o: config.h