From owner-svn-ports-all@FreeBSD.ORG Fri May 9 22:05:49 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 16DCB542; Fri, 9 May 2014 22:05:49 +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 03631B4C; Fri, 9 May 2014 22:05:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s49M5mwk003127; Fri, 9 May 2014 22:05:48 GMT (envelope-from tdb@svn.freebsd.org) Received: (from tdb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s49M5lxJ003117; Fri, 9 May 2014 22:05:47 GMT (envelope-from tdb@svn.freebsd.org) Message-Id: <201405092205.s49M5lxJ003117@svn.freebsd.org> From: Tim Bishop Date: Fri, 9 May 2014 22:05:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353528 - in head/misc/dnetc: . 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.18 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: Fri, 09 May 2014 22:05:49 -0000 Author: tdb Date: Fri May 9 22:05:47 2014 New Revision: 353528 URL: http://svnweb.freebsd.org/changeset/ports/353528 QAT: https://qat.redports.org/buildarchive/r353528/ Log: - Stage support - Remove support for FreeBSD < 8 - Use @sample plist keyword - Use USERS and GROUPS to create login Deleted: head/misc/dnetc/files/pkg-deinstall.in head/misc/dnetc/files/pkg-install.in Modified: head/misc/dnetc/Makefile head/misc/dnetc/distinfo.amd64 head/misc/dnetc/distinfo.i386 head/misc/dnetc/distinfo.sparc64 head/misc/dnetc/files/pkg-message.in head/misc/dnetc/pkg-plist Modified: head/misc/dnetc/Makefile ============================================================================== --- head/misc/dnetc/Makefile Fri May 9 22:01:34 2014 (r353527) +++ head/misc/dnetc/Makefile Fri May 9 22:05:47 2014 (r353528) @@ -3,7 +3,7 @@ PORTNAME= dnetc PORTVERSION= ${VERSION} -PORTREVISION= $(REVISION} +PORTREVISION= ${REVISION} PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= http://http.distributed.net/pub/dcti/%SUBDIR%/ \ @@ -26,97 +26,45 @@ NO_BUILD= yes BINDIR= ${PREFIX}/distributed.net -CLIENTUSER= dnetc -CLIENTGROUP= ${CLIENTUSER} -CLIENTUID= 105 +USERS= dnetc +GROUPS= dnetc -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGMESSAGE= ${WRKDIR}/pkg-message -MAN1= dnetc.1 +SUB_FILES= pkg-message +SUB_LIST= BINDIR="${BINDIR}" -SUB_FILES= pkg-install pkg-deinstall pkg-message -SUB_LIST= BINDIR="${BINDIR}" \ - CLIENTUSER="${CLIENTUSER}" \ - CLIENTGROUP="${CLIENTGROUP}" \ - CLIENTUID="${CLIENTUID}" - -NO_STAGE= yes .include .if ${ARCH} == i386 VERSION= 2.9110.519 REVISION= 0 -.if ${OSVERSION} >= 800107 DISTNAME= dnetc${PORTVERSION:E}-freebsd8-${ARCH:S/i386/x86/} WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E}-freebsd8-${ARCH:S/i386/x86/} -.else -DISTNAME= dnetc${PORTVERSION:E}-freebsd7-${ARCH:S/i386/x86/} -WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E}-freebsd7-${ARCH:S/i386/x86/} -.endif .elif ${ARCH} == amd64 VERSION= 2.9110.519 REVISION= 0 -.if ${OSVERSION} >= 800107 DISTNAME= dnetc${PORTVERSION:E}-freebsd8-${ARCH} WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E}-freebsd8-${ARCH} -.else -DISTNAME= dnetc${PORTVERSION:E}-freebsd7-${ARCH} -WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E:S/b$//}-freebsd7-${ARCH} -.endif .elif ${ARCH} == sparc64 -.if ${OSVERSION} >= 800107 VERSION= 2.9109.518 REVISION= 0 DISTNAME= dnetc${PORTVERSION:E}-freebsd8-${ARCH} WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E}-freebsd8-${ARCH} -.else -VERSION= 2.9103.509 -REVISION= 1 -DISTNAME= dnetc${PORTVERSION:E}-freebsd7-${ARCH}-elf -WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E}-freebsd7-${ARCH}-elf -.endif .elif ${ARCH} == powerpc -.if ${OSVERSION} >= 800107 VERSION= 2.9109.518 REVISION= 0 DISTNAME= dnetc${PORTVERSION:E}-freebsd8-${ARCH} WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E}-freebsd8-${ARCH} -.else -BROKEN= works on FreeBSD 8+ only in powerpc -VERSION= 0 -REVISION= 0 -.endif .endif -do-configure: - @if [ ! -f ${PREFIX}/dnetc.ini ]; then \ - ${INSTALL} -c -m 644 ${FILESDIR}/dnetc.ini ${WRKSRC}; \ - fi - -pre-install: - @${ECHO} "==> Creating custom user to run dnetc..." - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - do-install: - if [ ! -d ${BINDIR} ]; then \ - ${MKDIR} ${BINDIR}; \ - fi - ${CHOWN} ${CLIENTUSER}:${CLIENTGROUP} ${BINDIR} - ${CHMOD} 775 ${BINDIR} - - ${INSTALL} -c -m 755 -o ${CLIENTUSER} -g ${CLIENTGROUP} ${WRKSRC}/dnetc ${BINDIR} - - ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1 - - ${INSTALL} -c -m 644 -o ${CLIENTUSER} -g ${CLIENTGROUP} ${WRKSRC}/dnetc.ini ${BINDIR}/dnetc.ini.sample -.if !exists(${BINDIR}/dnetc.ini) - ${INSTALL} -c -m 644 -o ${CLIENTUSER} -g ${CLIENTGROUP} ${WRKSRC}/dnetc.ini ${BINDIR}/dnetc.ini - @${CAT} ${PKGMESSAGE} -.endif + ${MKDIR} ${STAGEDIR}${BINDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/dnetc ${STAGEDIR}${BINDIR} + ${INSTALL_MAN} ${WRKSRC}/dnetc.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL} -c -m 644 ${FILESDIR}/dnetc.ini ${STAGEDIR}${BINDIR}/dnetc.ini.sample .include Modified: head/misc/dnetc/distinfo.amd64 ============================================================================== --- head/misc/dnetc/distinfo.amd64 Fri May 9 22:01:34 2014 (r353527) +++ head/misc/dnetc/distinfo.amd64 Fri May 9 22:05:47 2014 (r353528) @@ -1,4 +1,2 @@ -SHA256 (dnetc519-freebsd7-amd64.tar.gz) = 1eea3b562f768cac6073b94472b8a5438414bc8f95cee5520adb1cc1d7159265 -SIZE (dnetc519-freebsd7-amd64.tar.gz) = 947717 SHA256 (dnetc519-freebsd8-amd64.tar.gz) = bb30f76586be582637554467bc62c9f7f8cfe0fe781ab5ddcccbafc5b0998ca3 SIZE (dnetc519-freebsd8-amd64.tar.gz) = 902150 Modified: head/misc/dnetc/distinfo.i386 ============================================================================== --- head/misc/dnetc/distinfo.i386 Fri May 9 22:01:34 2014 (r353527) +++ head/misc/dnetc/distinfo.i386 Fri May 9 22:05:47 2014 (r353528) @@ -1,4 +1,2 @@ -SHA256 (dnetc519-freebsd7-x86.tar.gz) = 9c9a0bb7be82ed18ddf83ae38e1010a7f9766e10e9deee54336d29f8768d43ea -SIZE (dnetc519-freebsd7-x86.tar.gz) = 887747 SHA256 (dnetc519-freebsd8-x86.tar.gz) = 7f79fa206e43fbf17637124802993909d198c1150c9bfaf3f4c82eefd408fffb SIZE (dnetc519-freebsd8-x86.tar.gz) = 897231 Modified: head/misc/dnetc/distinfo.sparc64 ============================================================================== --- head/misc/dnetc/distinfo.sparc64 Fri May 9 22:01:34 2014 (r353527) +++ head/misc/dnetc/distinfo.sparc64 Fri May 9 22:05:47 2014 (r353528) @@ -1,4 +1,2 @@ -SHA256 (dnetc509-freebsd7-sparc64-elf.tar.gz) = 6b1d000943cdc2d63f5f1e78e3014b6218317d574850ad6d4b2fff11d67066c8 -SIZE (dnetc509-freebsd7-sparc64-elf.tar.gz) = 928361 SHA256 (dnetc518-freebsd8-sparc64.tar.gz) = c048f0599590aee57e4b1a19b7d759625aa18f51dc4d86bae1072d412678ab58 SIZE (dnetc518-freebsd8-sparc64.tar.gz) = 948215 Modified: head/misc/dnetc/files/pkg-message.in ============================================================================== --- head/misc/dnetc/files/pkg-message.in Fri May 9 22:01:34 2014 (r353527) +++ head/misc/dnetc/files/pkg-message.in Fri May 9 22:05:47 2014 (r353528) @@ -1,8 +1,6 @@ *************************************************************************** -Note: dnetc has been installed with a sample configuration. - -To change this run: +To change the dnetc configuration run: %%BINDIR%%/dnetc -config Modified: head/misc/dnetc/pkg-plist ============================================================================== --- head/misc/dnetc/pkg-plist Fri May 9 22:01:34 2014 (r353527) +++ head/misc/dnetc/pkg-plist Fri May 9 22:05:47 2014 (r353528) @@ -1,5 +1,14 @@ +@owner dnetc +@group dnetc distributed.net/dnetc -@unexec if cmp -s %D/distributed.net/dnetc.ini %D/distributed.net/dnetc.ini.sample; then rm -f %D/distributed.net/dnetc.ini; fi -distributed.net/dnetc.ini.sample -@exec [ -f %B/dnetc.ini ] || cp %B/%f %B/dnetc.ini +@sample distributed.net/dnetc.ini.sample +@group +@owner +man/man1/dnetc.1.gz +@owner dnetc +@group dnetc +@mode 0775 @dirrm distributed.net +@mode +@group +@owner