From e569f7626e9c518ae8edb710d4a0f02215b838cd Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 6 Oct 2015 18:26:29 +0000
Subject: - Fix install from non-root - Strip binary - Drop @dirrm* from plist

---
 mail/qmailadmin/Makefile                |  5 +++--
 mail/qmailadmin/files/patch-Makefile.am | 11 +++++++++++
 mail/qmailadmin/pkg-plist               |  6 +-----
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 mail/qmailadmin/files/patch-Makefile.am

diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile
index c8e9e490685b..36815d9e3249 100644
--- a/mail/qmailadmin/Makefile
+++ b/mail/qmailadmin/Makefile
@@ -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:
 #
diff --git a/mail/qmailadmin/files/patch-Makefile.am b/mail/qmailadmin/files/patch-Makefile.am
new file mode 100644
index 000000000000..e6a69186451d
--- /dev/null
+++ b/mail/qmailadmin/files/patch-Makefile.am
@@ -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@
diff --git a/mail/qmailadmin/pkg-plist b/mail/qmailadmin/pkg-plist
index d143383cb94f..828e75359114 100644
--- a/mail/qmailadmin/pkg-plist
+++ b/mail/qmailadmin/pkg-plist
@@ -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
-@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%%
-@dirrm %%DATADIR%%/html
-@dirrm %%DATADIR%%/lang
-@dirrm %%DATADIR%%
-- 
cgit v1.2.3