From owner-svn-ports-head@freebsd.org Tue Oct 6 18:26:31 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1E16B9D0F13; Tue, 6 Oct 2015 18:26:31 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CC334E63; Tue, 6 Oct 2015 18:26:30 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t96IQTxh082852; Tue, 6 Oct 2015 18:26:29 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t96IQTrW082848; Tue, 6 Oct 2015 18:26:29 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510061826.t96IQTrW082848@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 6 Oct 2015 18:26:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398711 - in head/mail/qmailadmin: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Oct 2015 18:26:31 -0000 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 -@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%%