- Move owner/group/perm handling into plist, fixing packaging from non-root

PR:		203566
Submitted by:	amdmi3
Approved by:	oliver (maintainer)

3 files changed, 47 insertions, 9 deletions

diff --git a/mail/vqadmin/Makefile b/mail/vqadmin/Makefile
index da1747cad966..090f02d933be 100644
--- a/mail/vqadmin/Makefile
+++ b/mail/vqadmin/Makefile
@@ -24,12 +24,10 @@ CONFIGURE_ARGS=	--enable-cgibindir=${STAGEDIR}${PREFIX}/${CGIBINDIR} \
 		--enable-htmldir=${STAGEDIR}${PREFIX}/${WEBDATADIR} \
 		--enable-qmaildir=${QMAIL_PREFIX}
 
-.include <bsd.port.pre.mk>
-
 PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} WEBDATADIR=${WEBDATADIR}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/vqadmin/files/patch-Makefile.in b/mail/vqadmin/files/patch-Makefile.in
index e529ca1ba6a7..583b448a85d0 100644
--- a/mail/vqadmin/files/patch-Makefile.in
+++ b/mail/vqadmin/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in.orig	Sat Jan 18 12:25:01 2003
-+++ Makefile.in	Sat Jan 18 12:26:45 2003
-@@ -120,7 +120,7 @@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I. 
+--- 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@
@@ -9,3 +9,36 @@
  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
diff --git a/mail/vqadmin/pkg-plist b/mail/vqadmin/pkg-plist
index 3395435dd497..d65a1a78980f 100644
--- a/mail/vqadmin/pkg-plist
+++ b/mail/vqadmin/pkg-plist
@@ -1,5 +1,7 @@
 bin/vqadmin
-%%CGIBINDIR%%/vqadmin/.htaccess
+@owner vpopmail
+@group vchkpw
+@(nobody,,644) %%CGIBINDIR%%/vqadmin/.htaccess
 %%CGIBINDIR%%/vqadmin/html/add_alias_domain.html
 %%CGIBINDIR%%/vqadmin/html/add_domain.html
 %%CGIBINDIR%%/vqadmin/html/add_domain_body.html
@@ -37,5 +39,10 @@ bin/vqadmin
 %%CGIBINDIR%%/vqadmin/html/view_domain.html
 %%CGIBINDIR%%/vqadmin/html/view_user.html
 %%CGIBINDIR%%/vqadmin/vqadmin.acl
-%%CGIBINDIR%%/vqadmin/vqadmin.cgi
+@(root,wheel,6755) %%CGIBINDIR%%/vqadmin/vqadmin.cgi
 %%WEBDATADIR%%/images/vqadmin/vqadmin.css
+@dir(,,755) %%WEBDATADIR%%/images/vqadmin
+@dir(,,755) %%CGIBINDIR%%/vqadmin/html
+@dir(,,755) %%CGIBINDIR%%/vqadmin
+@owner
+@group