From owner-svn-ports-all@FreeBSD.ORG  Fri May  2 16:21:43 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 A52A04C0;
 Fri,  2 May 2014 16:21:43 +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 792201D78;
 Fri,  2 May 2014 16:21:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s42GLh3M034424;
 Fri, 2 May 2014 16:21:43 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s42GLhHr034270;
 Fri, 2 May 2014 16:21:43 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201405021621.s42GLhHr034270@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Fri, 2 May 2014 16:21:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r352823 - head/irc/hybserv
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 May 2014 16:21:43 -0000

Author: pawel
Date: Fri May  2 16:21:42 2014
New Revision: 352823
URL: http://svnweb.freebsd.org/changeset/ports/352823
QAT: https://qat.redports.org/buildarchive/r352823/

Log:
  Add staging support

Modified:
  head/irc/hybserv/Makefile
  head/irc/hybserv/pkg-plist

Modified: head/irc/hybserv/Makefile
==============================================================================
--- head/irc/hybserv/Makefile	Fri May  2 16:11:56 2014	(r352822)
+++ head/irc/hybserv/Makefile	Fri May  2 16:21:42 2014	(r352823)
@@ -11,9 +11,6 @@ COMMENT=	Hybrid2 IRC Services
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=		DAEMONTOOLS
-DAEMONTOOLS_DESC=	Daemontools support
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	dkorunic
 GH_PROJECT=	hybserv2
@@ -26,17 +23,23 @@ GNU_CONFIGURE=	yes
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
+OPTIONS_DEFINE=		DAEMONTOOLS
+
+DAEMONTOOLS_DESC=		Daemontools support
 DAEMONTOOLS_RUN_DEPENDS=	supervise:${PORTSDIR}/sysutils/daemontools
 DAEMONTOOLS_CONFIGURE_ENABLE=	daemontools
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+post-patch:
+	@${REINPLACE_CMD} -E -e '/(LN)/ s,BINDIR),DESTDIR)$$(&,2' \
+		-e '/(LN)/! s,(BIN|CONF|DOC|HELP|LOG)DIR),DESTDIR)$$(&,' \
+		${WRKSRC}/Makefile.in
 
 post-install:
 	@${SED} -e "s#%PREFIX%#${PREFIX}#" ${FILESDIR}/hybserv.sh \
 		> ${WRKDIR}/hybserv.sh
-	@${INSTALL_SCRIPT} ${WRKDIR}/hybserv.sh ${PREFIX}/etc/rc.d
-	${CHOWN} -R hybserv:hybserv ${PREFIX}/hybserv
-	${CHMOD} 700 ${PREFIX}/hybserv
+	${INSTALL_SCRIPT} ${WRKDIR}/hybserv.sh ${STAGEDIR}${PREFIX}/etc/rc.d
+	${CHMOD} 700 ${STAGEDIR}${PREFIX}/hybserv
+	(cd ${STAGEDIR}${PREFIX}/hybserv && ${STRIP_CMD} hybserv mkpasswd \
+		encryptconf encryptdb)
 
 .include <bsd.port.mk>

Modified: head/irc/hybserv/pkg-plist
==============================================================================
--- head/irc/hybserv/pkg-plist	Fri May  2 16:11:56 2014	(r352822)
+++ head/irc/hybserv/pkg-plist	Fri May  2 16:21:42 2014	(r352823)
@@ -1,4 +1,6 @@
 etc/rc.d/hybserv.sh
+@owner hybserv
+@group hybserv
 hybserv/cleandb
 hybserv/doc/COPYING
 hybserv/doc/INSTALL