From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 7 04:40:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 ESMTP id D00B779B for ; Thu, 7 Nov 2013 04:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AF1C0292E for ; Thu, 7 Nov 2013 04:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rA74e1OM086347 for ; Thu, 7 Nov 2013 04:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rA74e1IV086346; Thu, 7 Nov 2013 04:40:01 GMT (envelope-from gnats) Resent-Date: Thu, 7 Nov 2013 04:40:01 GMT Resent-Message-Id: <201311070440.rA74e1IV086346@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Takefu Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A0B1A790 for ; Thu, 7 Nov 2013 04:39:39 +0000 (UTC) (envelope-from takefu@airport.fm) Received: from ae-osaka.co.jp (mx.ae-osaka.co.jp [210.196.184.82]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5FDFC2925 for ; Thu, 7 Nov 2013 04:39:38 +0000 (UTC) Received: from ae-osaka.co.jp (localhost.ae-osaka.co.jp [127.0.0.1]) by ae-osaka.co.jp (Postfix) with ESMTP id 1DEAE12600E; Thu, 7 Nov 2013 13:39:31 +0900 (JST) Received: from [IPv6:2001:470:824b:a011:810c:6173:dce8:4329] (unknown [IPv6:2001:470:824b:a011:810c:6173:dce8:4329]) by ae-osaka.co.jp (Postfix) with ESMTPSA id 8E410125FD2; Thu, 7 Nov 2013 13:39:30 +0900 (JST) Message-Id: <527B1983.7030708@airport.fm> Date: Thu, 07 Nov 2013 13:39:31 +0900 From: Takefu To: freebsd-gnats-submit@freebsd.org Subject: ports/183738: [PATCH] sysutils/3dm: Convert to staging Cc: Darren Pilgrim X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Nov 2013 04:40:01 -0000 >Number: 183738 >Category: ports >Synopsis: [PATCH] sysutils/3dm: Convert to staging >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Nov 07 04:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Takefu >Release: FreeBSD 8.4-RELEASE-p4 i386 >Organization: FOX Amature Radio Club >Environment: System: FreeBSD RELENG84-ix86.localIPv4.airport.fm 8.4-RELEASE-p4 FreeBSD 8.4-RELEASE-p4 #0: Wed Sep 25 14:55:36 JST 2013 >Description: fix Convert to staging Port maintainer (ports.maintainer@evilphi.com) is cc'd. >How-To-Repeat: >Fix: --- 3dm-2.11.00.019,1.patch begins here --- diff -ruN /usr/ports/sysutils/3dm/Makefile ./Makefile --- /usr/ports/sysutils/3dm/Makefile 2013-09-21 08:05:58.000000000 +0900 +++ ./Makefile 2013-11-07 13:05:25.000000000 +0900 @@ -17,11 +17,9 @@ OPTIONS_DEFINE= SSLFIX SSLFIX_DESC= Install KB16625-patched binaries - OPTIONS_DEFAULT= SSLFIX -NO_STAGE= yes -.include +.include .if !empty(PORT_OPTIONS:MSSLFIX) DISTFILES+= kb16625_${PORTVERSION}.tar.gz @@ -30,11 +28,8 @@ BINPREFIX= ${WRKSRC} .endif -.include - ONLY_FOR_ARCHS= i386 amd64 NO_BUILD= yes - NO_WRKSUBDIR= yes .if ${OSVERSION} > 700000 @@ -43,56 +38,50 @@ BINSRC= ${BINPREFIX}/6x .endif -.if ${ARCH} == "i386" -BINSUFFIX= x86 -.elif ${ARCH} == "amd64" -BINSUFFIX= x86_64 -.endif - HELPSRC= ${WRKSRC}/en - HELPDIR= ${PREFIX}/share/3dm2/help/en ETCDIR= ${PREFIX}/etc/3dm2 MSGDIR= ${ETCDIR}/msg post-extract: - ${TAR} zxf ${WRKSRC}/tdm2Help.tgz -C ${WRKSRC} - ${TAR} zxf ${WRKSRC}/tdm2Msg.tgz -C ${WRKSRC} + @${TAR} zxf ${WRKSRC}/tdm2Help.tgz -C ${WRKSRC} + @${TAR} zxf ${WRKSRC}/tdm2Msg.tgz -C ${WRKSRC} post-configure: @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ < ${FILESDIR}/3dm2.conf.sample > ${WRKSRC}/3dm2.conf.sample do-install: -.for i in ${ETCDIR} ${MSGDIR} ${HELPDIR}/css ${HELPDIR}/images ${HELPDIR}/scripts -.if !exists(${i}) - ${MKDIR} ${i} -.endif +.for i in ${ETCDIR} ${MSGDIR} ${HELPDIR}\ + ${HELPDIR}/css ${HELPDIR}/images ${HELPDIR}/scripts + @${MKDIR} ${STAGEDIR}${i} .endfor - ${INSTALL_DATA} ${HELPSRC}/*.html ${HELPDIR} - ${INSTALL_DATA} ${HELPSRC}/*.gif ${HELPDIR} - ${INSTALL_DATA} ${HELPSRC}/*.jpg ${HELPDIR} - ${INSTALL_DATA} ${HELPSRC}/css/* ${HELPDIR}/css - ${INSTALL_DATA} ${HELPSRC}/images/* ${HELPDIR}/images - ${INSTALL_DATA} ${HELPSRC}/scripts/* ${HELPDIR}/scripts + ${INSTALL_DATA} ${HELPSRC}/*.html ${STAGEDIR}${HELPDIR} + ${INSTALL_DATA} ${HELPSRC}/*.gif ${STAGEDIR}${HELPDIR} + ${INSTALL_DATA} ${HELPSRC}/*.jpg ${STAGEDIR}${HELPDIR} + ${INSTALL_DATA} ${HELPSRC}/css/* ${STAGEDIR}${HELPDIR}/css + ${INSTALL_DATA} ${HELPSRC}/images/* ${STAGEDIR}${HELPDIR}/images + ${INSTALL_DATA} ${HELPSRC}/scripts/* ${STAGEDIR}${HELPDIR}/scripts - ${INSTALL_PROGRAM} ${BINSRC}/3dm2.${BINSUFFIX} ${PREFIX}/sbin/3dm2 + ${INSTALL_PROGRAM} ${BINSRC}/3dm2.${ARCH:S,i386,x86,:S,amd64,x86_64,}\ + ${STAGEDIR}${PREFIX}/sbin/3dm2 - ${INSTALL_DATA} ${WRKSRC}/tdm_msg_en ${MSGDIR} - ${INSTALL_DATA} ${WRKSRC}/tw_msg_en ${MSGDIR} + ${INSTALL_DATA} ${WRKSRC}/tdm_msg_en ${STAGEDIR}${MSGDIR} + ${INSTALL_DATA} ${WRKSRC}/tw_msg_en ${STAGEDIR}${MSGDIR} - ${INSTALL_DATA} ${WRKSRC}/3dm2.conf.sample ${ETCDIR} - ${CHMOD} 400 ${ETCDIR}/3dm2.conf.sample + ${INSTALL_DATA} ${WRKSRC}/3dm2.conf.sample ${STAGEDIR}${ETCDIR} + ${CHMOD} 400 ${STAGEDIR}${ETCDIR}/3dm2.conf.sample post-install: -.if !exists(${PREFIX}/etc/3dm2/3dm2.conf) - ${INSTALL_DATA} ${WRKSRC}/3dm2.conf.sample ${PREFIX}/etc/3dm2/3dm2.conf - ${CHMOD} 600 ${PREFIX}/etc/3dm2/3dm2.conf +.if !exists(${LOCALBASE}/etc/3dm2/3dm2.conf) + ${INSTALL_DATA} ${WRKSRC}/3dm2.conf.sample\ + ${STAGEDIR}${PREFIX}/etc/3dm2/3dm2.conf + ${CHMOD} 600 ${STAGEDIR}${PREFIX}/etc/3dm2/3dm2.conf @${ECHO} "" @${ECHO} "" @${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${ECHO} " Don't forget to edit '${PREFIX}/etc/3dm2/3dm2.conf'" + @${ECHO} " Don't forget to edit '${LOCALBASE}/etc/3dm2/3dm2.conf'" @${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO} " Visit https://`hostname`:888/" @${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @@ -105,8 +94,8 @@ .if !exists(/etc/3dm2) @${MKDIR} /etc/3dm2 .endif - @${LN} -s ${PREFIX}/etc/3dm2/3dm2.conf /etc/3dm2/3dm2.conf - @${LN} -s ${PREFIX}/etc/3dm2/3dm2.pem /etc/3dm2/3dm2.pem + @${LN} -s ${STAGEDIR}${PREFIX}/etc/3dm2/3dm2.conf /etc/3dm2/3dm2.conf + @${LN} -s ${STAGEDIR}${PREFIX}/etc/3dm2/3dm2.pem /etc/3dm2/3dm2.pem @${CAT} ${PKGMESSAGE} diff -ruN /usr/ports/sysutils/3dm/pkg-install ./pkg-install --- /usr/ports/sysutils/3dm/pkg-install 2012-07-14 23:29:18.000000000 +0900 +++ ./pkg-install 2013-11-07 09:37:18.000000000 +0900 @@ -5,9 +5,11 @@ case $2 in POST-INSTALL) - mkdir /etc/3dm2 - ln -s ${PKG_PREFIX}/etc/3dm2/3dm2.conf /etc/3dm2/3dm2.conf - ln -s ${PKG_PREFIX}/etc/3dm2/3dm2.pem /etc/3dm2/3dm2.pem + if [ ! -d /etc/3dm2 ] ; then + mkdir /etc/3dm2 + ln -s ${PKG_PREFIX}/etc/3dm2/3dm2.conf /etc/3dm2/3dm2.conf + ln -s ${PKG_PREFIX}/etc/3dm2/3dm2.pem /etc/3dm2/3dm2.pem + fi ;; *) ;; --- 3dm-2.11.00.019,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: