svn commit: r398711 - in head/mail/qmailadmin: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Oct  6 18:26:29 2015
New Revision: 398711
URL: https://svnweb.freebsd.org/changeset/ports/398711

Log:
  - Fix install from non-root
  - Strip binary
  - Drop @dirrm* from plist

Added:
  head/mail/qmailadmin/files/patch-Makefile.am   (contents, props changed)
Modified:
  head/mail/qmailadmin/Makefile
  head/mail/qmailadmin/pkg-plist

Modified: head/mail/qmailadmin/Makefile
==============================================================================
--- head/mail/qmailadmin/Makefile	Tue Oct  6 18:07:39 2015	(r398710)
+++ head/mail/qmailadmin/Makefile	Tue Oct  6 18:26:29 2015	(r398711)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmailadmin
 PORTVERSION=	1.2.15
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	2
 CATEGORIES=	mail www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \
@@ -104,7 +104,8 @@ LIBS+=		-L${LOCALBASE}/lib -lcrack
 
 VPOPMAIL_DIR?=	${LOCALBASE}/vpopmail
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 
 # Notes and comments:
 #

Added: head/mail/qmailadmin/files/patch-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/qmailadmin/files/patch-Makefile.am	Tue Oct  6 18:26:29 2015	(r398711)
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2010-03-26 06:08:58 UTC
++++ Makefile.am
+@@ -14,7 +14,7 @@ VERSION=@QA_VERSION@
+ #
+ # Install qmailadmin setuid to @vpopuser@
+ #
+-INSTALL_PROGRAM=${INSTALL} -o @vpopuser@ -m 6755 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_PROGRAM=${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_STRIP_PROGRAM=${INSTALL_PROGRAM} -s
+ 
+ bindir=@cgibindir@

Modified: head/mail/qmailadmin/pkg-plist
==============================================================================
--- head/mail/qmailadmin/pkg-plist	Tue Oct  6 18:07:39 2015	(r398710)
+++ head/mail/qmailadmin/pkg-plist	Tue Oct  6 18:26:29 2015	(r398711)
@@ -54,7 +54,7 @@
 %%DATADIR%%/lang/tr
 %%DATADIR%%/lang/zh-cn
 @cwd %%WEBPREFIX%%
-%%CGIBINDIR%%/%%CGIBINSUBDIR%%/qmailadmin
+@(vpopmail,vchkpw,6755) %%CGIBINDIR%%/%%CGIBINSUBDIR%%/qmailadmin
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/delete.png
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/disabled.png
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/lowerleft.png
@@ -76,12 +76,8 @@
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/uppermiddle1.png
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/uppermiddle2.png
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/upperright.png
- at dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images
 @unexec rmdir %%WEBPREFIX%%/%%WEBDATADIR%%/%%WEBDATASUBDIR%% 2> /dev/null || true
 @unexec rmdir %%WEBPREFIX%%/%%WEBDATADIR%% 2> /dev/null || true
 @unexec rmdir %%WEBPREFIX%%/%%CGIBINDIR%%/%%CGIBINSUBDIR%% 2> /dev/null || true
 @unexec rmdir %%WEBPREFIX%%/%%CGIBINDIR%% 2> /dev/null || true
 @cwd %%REAL_PREFIX%%
- at dirrm %%DATADIR%%/html
- at dirrm %%DATADIR%%/lang
- at dirrm %%DATADIR%%