Date: Thu, 30 Jul 2015 10:30:00 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393229 - in head/mail/vqregister: . files Message-ID: <201507301030.t6UAU0eI067882@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Jul 30 10:30:00 2015 New Revision: 393229 URL: https://svnweb.freebsd.org/changeset/ports/393229 Log: - Fix installed files owner/permissions: properly set these in plist according to what upstream makefile intends to do - Strip binary Modified: head/mail/vqregister/Makefile head/mail/vqregister/files/patch-Makefile head/mail/vqregister/pkg-plist Modified: head/mail/vqregister/Makefile ============================================================================== --- head/mail/vqregister/Makefile Thu Jul 30 10:28:02 2015 (r393228) +++ head/mail/vqregister/Makefile Thu Jul 30 10:30:00 2015 (r393229) @@ -3,7 +3,7 @@ PORTNAME= vqregister PORTVERSION= 2.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail www MASTER_SITES= http://www.inter7.com/vqregister/ @@ -13,18 +13,21 @@ COMMENT= Admin-configurable email user s BUILD_DEPENDS= vpopmail>0:${PORTSDIR}/mail/vpopmail RUN_DEPENDS= vpopmail>0:${PORTSDIR}/mail/vpopmail -USES= fakeroot USE_APACHE_RUN= 22+ VPOPMAIL_DIR?= ${LOCALBASE}/vpopmail USE_MYSQL= yes MAKE_ENV= VDIR=${VPOPMAIL_DIR} WWWDIR=${STAGEDIR}${WWWDIR} +USERS= vpopmail +GROUPS= vchkpw + DOCS= CONFIG CONTRIBUTORS FORM HISTORY TEMPLATE OPTIONS_DEFINE= DOCS post-install: + ${STRIP_CMD} ${STAGEDIR}${WWWDIR}/${PORTNAME}.cgi @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) Modified: head/mail/vqregister/files/patch-Makefile ============================================================================== --- head/mail/vqregister/files/patch-Makefile Thu Jul 30 10:28:02 2015 (r393228) +++ head/mail/vqregister/files/patch-Makefile Thu Jul 30 10:30:00 2015 (r393229) @@ -22,12 +22,13 @@ INSTALL_BIN = vqregister.cgi INSTALL_UID = vpopmail INSTALL_GID = vchkpw -@@ -54,8 +54,6 @@ install: $(BIN) +@@ -54,9 +54,6 @@ install: $(BIN) cp html/* $(INSTALL_DIR)/html cp vqregister.email $(INSTALL_DIR) cp vqregister.conf $(INSTALL_DIR) - chown -R $(INSTALL_UID) $(INSTALL_DIR) - chgrp -R $(INSTALL_GID) $(INSTALL_DIR) - chmod u+s $(INSTALL_DIR)/$(INSTALL_BIN) +- chmod u+s $(INSTALL_DIR)/$(INSTALL_BIN) clean: + @echo -n "Cleaning up..." Modified: head/mail/vqregister/pkg-plist ============================================================================== --- head/mail/vqregister/pkg-plist Thu Jul 30 10:28:02 2015 (r393228) +++ head/mail/vqregister/pkg-plist Thu Jul 30 10:30:00 2015 (r393229) @@ -3,6 +3,8 @@ %%PORTDOCS%%%%DOCSDIR%%/FORM %%PORTDOCS%%%%DOCSDIR%%/HISTORY %%PORTDOCS%%%%DOCSDIR%%/TEMPLATE +@owner vpopmail +@group vchkpw %%WWWDIR%%/html/error.html %%WWWDIR%%/html/failure.html %%WWWDIR%%/html/init_error.html @@ -10,6 +12,10 @@ %%WWWDIR%%/html/register.with.password.html %%WWWDIR%%/html/success.html %%WWWDIR%%/html/success.with.password.html -%%WWWDIR%%/vqregister.cgi +@(vpopmail,vchkpw,4755) %%WWWDIR%%/vqregister.cgi %%WWWDIR%%/vqregister.conf %%WWWDIR%%/vqregister.email +@dir %%WWWDIR%%/html +@dir %%WWWDIR%% +@owner +@group
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507301030.t6UAU0eI067882>