- Unbreak

- plist cleanup

Submitted by:	Mike Durian <durian@shadetreesoftware.com>

3 files changed, 18 insertions, 12 deletions

diff --git a/net/sipxpbx/Makefile b/net/sipxpbx/Makefile
index a8f4551a13db..61d127f836e8 100644
--- a/net/sipxpbx/Makefile
+++ b/net/sipxpbx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sipxpbx
 PORTVERSION=	3.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
 
@@ -33,8 +33,6 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		sipXvxml.sh:${PORTSDIR}/net/sipxvxml \
 		psql:${PORTSDIR}/databases/postgresql81-client
 
-BROKEN=		Incorrect pkg-plist
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:259:env automake:19:env
diff --git a/net/sipxpbx/files/pkg-install.in b/net/sipxpbx/files/pkg-install.in
index 4984634af93a..c431abbae362 100644
--- a/net/sipxpbx/files/pkg-install.in
+++ b/net/sipxpbx/files/pkg-install.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PATH=/bin:/usr/sbin
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
 USER=sipx
 GROUP=sipx
@@ -31,6 +31,15 @@ PRE-INSTALL)
 	fi
 	;;
 POST-INSTALL)
+	# Create a dummy file in /usr/local/www/sipX/conf to act
+	# as a poorman's reference count.  Both sipxpbx and sipxvxml
+	# create this empty directory.  If we leave it empty,
+	# when we remove either package, the directory will be removed
+	# (assuming it is still empty).  However, the other package
+	# still thinks the empty directory still exists.  Tinderbox
+	# doesn't like this.
+	touch %%PREFIX%%/www/sipX/conf/.sipxpbx_dummy
+
 	# fix up permission on sipX directories under /var
 	mkdir -p %%LOCALSTATEDIR%%/log/sipxpbx
 	mkdir -p %%LOCALSTATEDIR%%/run/sipxpbx
diff --git a/net/sipxpbx/pkg-plist b/net/sipxpbx/pkg-plist
index 7f1a976b9ff5..e31522c625ba 100644
--- a/net/sipxpbx/pkg-plist
+++ b/net/sipxpbx/pkg-plist
@@ -22,7 +22,6 @@ bin/sipxpresence.sh
 bin/voicemail_clean
 bin/watchdog
 bin/watchdog.sh
-etc/rc.d/sipxpbx
 etc/sipxpbx/ProcessDefinitions.xml
 etc/sipxpbx/WatchDog.xml
 etc/sipxpbx/cbadmission.xml.in
@@ -47,6 +46,7 @@ www/sipX/cgi-bin/cbadmission/cbadmission.cgi
 www/sipX/cgi-bin/processmonitor/process.cgi
 www/sipX/cgi-bin/replication/replication.cgi
 www/sipX/cgi-bin/voicemail/mediaserver.cgi
+www/sipX/conf/.sipxpbx_dummy
 www/sipX/doc/aa_vxml/autoattendant-afterhour.vxml
 www/sipX/doc/aa_vxml/autoattendant-operator.vxml
 www/sipX/doc/aa_vxml/dialbyname.vxml
@@ -1168,17 +1168,16 @@ www/sipX/doc/vm_vxml/savemessage_no_operator.vxml.in
 @dirrm www/sipX/doc/adminui
 @dirrm www/sipX/doc/aa_vxml
 @dirrm www/sipX/doc
-@exec mkdir -p %D/www/sipX/conf
-@dirrm www/sipX/conf
+@dirrmtry www/sipX/conf
 @dirrm www/sipX/cgi-bin/voicemail
 @dirrm www/sipX/cgi-bin/replication
 @dirrm www/sipX/cgi-bin/processmonitor
 @dirrm www/sipX/cgi-bin/cbadmission
 @dirrm www/sipX/cgi-bin
-@dirrm www/sipX
-@dirrm share/sipx/schema
-@dirrm share/sipx
+@dirrmtry www/sipX
+@dirrmtry share/sipx/schema
+@dirrmtry share/sipx
 @dirrm share/doc/sipx/sipxpbx
 @dirrm share/doc/sipx
-@dirrm etc/sipxpbx/process.d
-@dirrm etc/sipxpbx
+@dirrmtry etc/sipxpbx/process.d
+@dirrmtry etc/sipxpbx