From owner-svn-ports-all@FreeBSD.ORG Tue Apr 1 14:30:05 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 757E92BD; Tue, 1 Apr 2014 14:30:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 48EA0ABC; Tue, 1 Apr 2014 14:30:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s31EU5vc015983; Tue, 1 Apr 2014 14:30:05 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s31EU4JS015980; Tue, 1 Apr 2014 14:30:04 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404011430.s31EU4JS015980@svn.freebsd.org> From: Bryan Drewery Date: Tue, 1 Apr 2014 14:30:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349858 - in head/mail/simscan: . 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Apr 2014 14:30:05 -0000 Author: bdrewery Date: Tue Apr 1 14:30:04 2014 New Revision: 349858 URL: http://svnweb.freebsd.org/changeset/ports/349858 QAT: https://qat.redports.org/buildarchive/r349858/ Log: - Convert to staging Approved by: portmgr (blanket) Deleted: head/mail/simscan/files/pkg-install.in Modified: head/mail/simscan/Makefile head/mail/simscan/pkg-plist Modified: head/mail/simscan/Makefile ============================================================================== --- head/mail/simscan/Makefile Tue Apr 1 14:17:08 2014 (r349857) +++ head/mail/simscan/Makefile Tue Apr 1 14:30:04 2014 (r349858) @@ -21,8 +21,8 @@ GROUPS= ${USERS} WORKDIR?= ${QMAIL_PREFIX}/${PORTNAME} QMAIL_QUEUE= ${QMAIL_PREFIX}/bin/qmail-queue -SUB_FILES= pkg-message \ - pkg-install +SUB_FILES= pkg-message + SUB_LIST= QMAIL_PREFIX=${QMAIL_PREFIX} \ SIMSCAN_DIR=${PORTNAME} PLIST_SUB= QMAIL_PREFIX=${QMAIL_PREFIX} \ @@ -41,7 +41,6 @@ PASSTHRU_DESC= Pass Spam Thru, Do Not Re HEADERS_DESC= Add a Received Line With Versions of Scanners DSPAM_DESC= Turn on DSPAM scanning -NO_STAGE= yes .include CONFIGURE_ARGS=--enable-clamavdb-path=/var/db/clamav \ @@ -127,6 +126,10 @@ post-patch: ${WRKSRC}/configure @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/cdb/conf-cc @${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/cdb/conf-ld + @${ECHO_CMD} ${STAGEDIR}${PREFIX} > ${WRKSRC}/cdb/conf-home + @${REINPLACE_CMD} -e 's|@qmaildir@|$$(DESTDIR)@qmaildir@|' \ + -e 's|@workdir@|$$(DESTDIR)@workdir@|' \ + ${WRKSRC}/Makefile.in pre-configure: @${ECHO_MSG} "" @@ -148,17 +151,14 @@ pre-configure: @${ECHO_MSG} "" pre-install: - @${REINPLACE_CMD} -e 's|nobody|simscan|g' ${WRKSRC}/Makefile - @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + ${MKDIR} ${STAGEDIR}${QMAIL_PREFIX}/bin post-install: - @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif - @${CAT} ${PKGMESSAGE} .include Modified: head/mail/simscan/pkg-plist ============================================================================== --- head/mail/simscan/pkg-plist Tue Apr 1 14:17:08 2014 (r349857) +++ head/mail/simscan/pkg-plist Tue Apr 1 14:30:04 2014 (r349858) @@ -1,4 +1,11 @@ @cwd %%QMAIL_PREFIX%% +@owner simscan +@group simscan bin/simscanmk +@mode 04711 bin/simscan +@mode +@owner root +@group wheel +@exec install -d -o simscan -g simscan -m 0750 %D/%%SIMSCAN_DIR%% @dirrmtry %%SIMSCAN_DIR%%