From cherry@spica.trombik.org  Thu Sep  4 01:30:08 2008
Return-Path: <cherry@spica.trombik.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B002106A98E
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Sep 2008 01:30:08 +0000 (UTC)
	(envelope-from cherry@spica.trombik.org)
Received: from spica.trombik.org (spica.trombik.org [211.19.48.12])
	by mx1.freebsd.org (Postfix) with ESMTP id D06728FC1D
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Sep 2008 01:30:07 +0000 (UTC)
	(envelope-from cherry@spica.trombik.org)
Received: by spica.trombik.org (Postfix, from userid 999)
	id 01D711CD54; Thu,  4 Sep 2008 10:30:01 +0900 (JST)
Message-Id: <20080904013001.01D711CD54@spica.trombik.org>
Date: Thu,  4 Sep 2008 10:30:01 +0900 (JST)
From: Tomoyuki Sakurai <cherry@trombik.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Dulmandakh Sukhbaatar <dulmandakh@gmail.com>
Subject: [MAINTAINER] sysutils/puppet-devel: create and delete work directories
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         127078
>Category:       ports
>Synopsis:       [MAINTAINER] sysutils/puppet-devel: create and delete work directories
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 04 01:40:00 UTC 2008
>Closed-Date:    Thu Sep 04 19:09:32 UTC 2008
>Last-Modified:  Thu Sep  4 19:10:00 UTC 2008
>Originator:     Tomoyuki Sakurai
>Release:        FreeBSD 7.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD spica.trombik.org 7.0-STABLE FreeBSD 7.0-STABLE #5: Thu Jul 10 22:29:26 JST 2008
>Description:

- after install: and deinstall:, create and delete work directories for puppet. this fixes ports/126968
- fix typos in pkg-message

Added file(s):
- files/pkg-deinstall.in

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- puppet-devel-0.24.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet-devel/Makefile /usr/home/cherry/svk/ports/sysutils/puppet-devel/Makefile
--- /usr/ports/sysutils/puppet-devel/Makefile	2008-08-01 20:54:10.000000000 +0900
+++ /usr/home/cherry/svk/ports/sysutils/puppet-devel/Makefile	2008-09-04 10:26:33.000000000 +0900
@@ -28,10 +28,12 @@
 PUPPET_USER:=	puppet
 PUPPET_GROUP:=	${PUPPET_USER}
 PUPPET_RUNDIR:=	/var/run/${PORTNAME}
-SUB_FILES+=	pkg-install pkg-message
+PUPPET_WORKDIR:=	/var/${PORTNAME}
+SUB_FILES+=	pkg-install pkg-message pkg-deinstall
 SUB_LIST+=	PUPPET_RUNDIR="${PUPPET_RUNDIR}" \
 			PUPPET_USER="${PUPPET_USER}" \
-			PUPPET_GROUP="${PUPPET_GROUP}"
+			PUPPET_GROUP="${PUPPET_GROUP}" \
+			PUPPET_WORKDIR="${PUPPET_WORKDIR}"
 
 .include <bsd.port.pre.mk>
 
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet-devel/files/pkg-deinstall.in /usr/home/cherry/svk/ports/sysutils/puppet-devel/files/pkg-deinstall.in
--- /usr/ports/sysutils/puppet-devel/files/pkg-deinstall.in	1970-01-01 09:00:00.000000000 +0900
+++ /usr/home/cherry/svk/ports/sysutils/puppet-devel/files/pkg-deinstall.in	2008-09-04 10:10:41.000000000 +0900
@@ -0,0 +1,13 @@
+#!/bin/sh
+# $FreeBSD:$
+PATH="/bin:/sbin:/usr/bin:/usr/sbin"
+
+RUNDIR=%%PUPPET_RUNDIR%%
+WORKDIR=%%PUPPET_WORKDIR%%
+
+if [ "$2" = "POST-DEINSTALL" ]; then
+    echo "=> Deleting ${RUNDIR} if empty..."
+    rm -d ${RUNDIR}  2>/dev/null || true
+    echo "=> Deleting ${WORKDIR} if empty..."
+    rm -d ${WORKDIR} 2>/dev/null || true
+fi
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet-devel/files/pkg-install.in /usr/home/cherry/svk/ports/sysutils/puppet-devel/files/pkg-install.in
--- /usr/ports/sysutils/puppet-devel/files/pkg-install.in	2008-04-11 23:09:59.000000000 +0900
+++ /usr/home/cherry/svk/ports/sysutils/puppet-devel/files/pkg-install.in	2008-09-04 09:30:28.000000000 +0900
@@ -8,6 +8,7 @@
 GID=$UID
 
 RUNDIR=%%PUPPET_RUNDIR%%
+WORKDIR=%%PUPPET_WORKDIR%%
 
 PW="pw"
 CHOWN="chown"
@@ -36,7 +37,18 @@
 	fi
 
 elif [ "$2" = "POST-INSTALL" ]; then
-	${INSTALL_DIR} ${RUNDIR}
+    if [ -d ${RUNDIR} ]; then
+        echo "=> ${RUNDIR} already exists."
+    else
+        echo -n "=> Creating RUNDIR ${RUNDIR}... "
+        ${INSTALL_DIR} ${RUNDIR} || echo "failed"
+    fi
+    if [ -d ${WORKDIR} ]; then
+        echo "=> ${WORKDIR} already exists."
+    else
+        echo -n "=> Creating WORKDIR ${WORKDIR}... "
+        ${INSTALL_DIR} ${WORKDIR} || echo "failed"
+    fi
 fi
 
 exit 0
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet-devel/files/pkg-message.in /usr/home/cherry/svk/ports/sysutils/puppet-devel/files/pkg-message.in
--- /usr/ports/sysutils/puppet-devel/files/pkg-message.in	2008-04-11 23:09:59.000000000 +0900
+++ /usr/home/cherry/svk/ports/sysutils/puppet-devel/files/pkg-message.in	2008-09-04 09:09:05.000000000 +0900
@@ -5,7 +5,7 @@
 
 to /etc/rc.conf
 
-Indivisual config files such as %%PREFIX%%/etc/puppetmasterd.conf are
-deprecated. Use a single file, %%PREFIX%%/puppet/puppet.conf.
+Indivisual config files such as %%PREFIX%%/etc/puppet/puppetmasterd.conf are
+deprecated. Use a single file, %%PREFIX%%/etc/puppet/puppet.conf.
 
 Now the default PID directory is %%PUPPET_RUNDIR%%.
diff -ruN --exclude=CVS /usr/ports/sysutils/puppet-devel/pkg-plist /usr/home/cherry/svk/ports/sysutils/puppet-devel/pkg-plist
--- /usr/ports/sysutils/puppet-devel/pkg-plist	2008-04-11 23:09:59.000000000 +0900
+++ /usr/home/cherry/svk/ports/sysutils/puppet-devel/pkg-plist	2008-09-04 09:54:55.000000000 +0900
@@ -11,4 +11,3 @@
 @dirrmtry etc/puppet/ssl
 @dirrmtry etc/puppet/manifests
 @dirrmtry etc/puppet
-@dirrmtry /var/run/puppet
--- puppet-devel-0.24.5.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: beech 
Responsible-Changed-When: Thu Sep 4 05:36:11 UTC 2008 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127078 
State-Changed-From-To: open->closed 
State-Changed-By: beech 
State-Changed-When: Thu Sep 4 19:09:18 UTC 2008 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127078 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/127078: commit references a PR
Date: Thu,  4 Sep 2008 19:09:07 +0000 (UTC)

 beech       2008-09-04 19:08:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/puppet-devel Makefile pkg-plist 
     sysutils/puppet-devel/files pkg-install.in pkg-message.in 
   Added files:
     sysutils/puppet-devel/files pkg-deinstall.in 
   Log:
   - Create and delete work directories for puppet. this fixes ports/126968
   - Fix typos in pkg-message
   
   PR:             ports/127078
   Submitted by:   Tomoyuki Sakurai <cherry@trombik.org> (maintainer)
   
   Revision  Changes    Path
   1.8       +4 -2      ports/sysutils/puppet-devel/Makefile
   1.1       +13 -0     ports/sysutils/puppet-devel/files/pkg-deinstall.in (new)
   1.2       +14 -2     ports/sysutils/puppet-devel/files/pkg-install.in
   1.2       +3 -2      ports/sysutils/puppet-devel/files/pkg-message.in
   1.7       +1 -2      ports/sysutils/puppet-devel/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
