aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/sipxcommserverlib/Makefile2
-rw-r--r--net/sipxcommserverlib/files/pkg-install.in14
-rw-r--r--net/sipxcommserverlib/pkg-plist14
-rw-r--r--net/sipxconfig/Makefile2
-rw-r--r--net/sipxconfig/pkg-plist22
-rw-r--r--net/sipxpbx/Makefile4
-rw-r--r--net/sipxpbx/files/pkg-install.in11
-rw-r--r--net/sipxpbx/pkg-plist15
-rw-r--r--net/sipxproxy/Makefile2
-rw-r--r--net/sipxproxy/pkg-plist4
-rw-r--r--net/sipxpublisher/Makefile2
-rw-r--r--net/sipxpublisher/pkg-plist4
-rw-r--r--net/sipxregistry/Makefile2
-rw-r--r--net/sipxregistry/pkg-plist8
-rw-r--r--net/sipxtacklib/Makefile2
-rw-r--r--net/sipxtacklib/pkg-plist4
-rw-r--r--net/sipxvxml/Makefile2
-rw-r--r--net/sipxvxml/files/pkg-install.in14
-rw-r--r--net/sipxvxml/pkg-plist7
19 files changed, 84 insertions, 51 deletions
diff --git a/net/sipxcommserverlib/Makefile b/net/sipxcommserverlib/Makefile
index e09a00cfeb5a..7e8f2fd48f7b 100644
--- a/net/sipxcommserverlib/Makefile
+++ b/net/sipxcommserverlib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sipxcommserverlib
PORTVERSION= 3.6.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://www.sipfoundry.org/pub/sipX/3.6/SRC/
diff --git a/net/sipxcommserverlib/files/pkg-install.in b/net/sipxcommserverlib/files/pkg-install.in
index 8ac6d67cf34b..6d7d918435bc 100644
--- a/net/sipxcommserverlib/files/pkg-install.in
+++ b/net/sipxcommserverlib/files/pkg-install.in
@@ -31,6 +31,20 @@ PRE-INSTALL)
fi
;;
POST-INSTALL)
+ # Create a dummy file in /usr/local/share/sipxpbx to act
+ # as a poorman's reference count. Both sipxcommserverlib
+ # and sipxconfig create this directory. Though sipxcommserverlib
+ # does not put any files in it. When sipxconfig deinstalls
+ # there is nothing to prevent it from completely removing
+ # the directory. Then when sipxcommservlib deinstalls, it
+ # finds the directory it created is now gone.
+ #
+ # By creating a dummy file here, we'll prevent sipxconfig
+ # from completely removing the directory and this will make
+ # tinderbox happy when it deinstalls sipxcommserverlib.
+ mkdir -p %%PREFIX%%/share/sipxpbx
+ /usr/bin/touch %%PREFIX%%/share/sipxpbx/.sipxcommserverlib_dummy
+
chown ${USER}:${GROUP} %%PREFIX%%/etc/sipxpbx
;;
esac
diff --git a/net/sipxcommserverlib/pkg-plist b/net/sipxcommserverlib/pkg-plist
index de4e50f0204e..2cb969b61b1a 100644
--- a/net/sipxcommserverlib/pkg-plist
+++ b/net/sipxcommserverlib/pkg-plist
@@ -90,9 +90,10 @@ libexec/sipx-utils.sh
%%PORTDOCS%%@dirrm %%DOCSDIR%%
share/sipx/schema/authrules.xsd
share/sipx/schema/urlmap.xsd
-@dirrm share/sipxpbx
-@dirrm share/sipx/schema
-@dirrm share/sipx
+share/sipxpbx/.sipxcommserverlib_dummy
+@dirrmtry share/sipxpbx
+@dirrmtry share/sipx/schema
+@dirrmtry share/sipx
@dirrm include/testlib
@dirrm include/sipdb
@dirrm include/odbc
@@ -100,8 +101,9 @@ share/sipx/schema/urlmap.xsd
@dirrm include/fastdb
@dirrm include/digitmaps
@dirrm include/configrpc
+@exec mkdir -p %D/etc/sipxpbx/ssl/authorities
@dirrm etc/sipxpbx/ssl/authorities
@dirrm etc/sipxpbx/ssl
-@dirrm etc/sipxpbx/process.d
-@dirrm etc/sipxpbx
-@dirrm bin/ssl-cert
+@dirrmtry etc/sipxpbx/process.d
+@dirrmtry etc/sipxpbx
+@dirrmtry bin/ssl-cert
diff --git a/net/sipxconfig/Makefile b/net/sipxconfig/Makefile
index f637d63b54ad..f53565444744 100644
--- a/net/sipxconfig/Makefile
+++ b/net/sipxconfig/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sipxconfig
PORTVERSION= 3.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.sipfoundry.org/pub/sipX/3.6/SRC/
diff --git a/net/sipxconfig/pkg-plist b/net/sipxconfig/pkg-plist
index 6c70ec433af0..7cbae79abf54 100644
--- a/net/sipxconfig/pkg-plist
+++ b/net/sipxconfig/pkg-plist
@@ -152,7 +152,7 @@ share/sipxpbx/lib/wsdl4j-1.5.1.jar
share/sipxpbx/lib/xercesImpl-2.7.0.jar
share/sipxpbx/lib/xml-apis-1.3.1.jar
share/sipxpbx/lib/xmlrpc-2.0.jar
-@dirrm bin/ssl-cert
+@dirrmtry bin/ssl-cert
@dirrm etc/sipxpbx/acme
@dirrm etc/sipxpbx/audiocodes
@dirrm etc/sipxpbx/ciscoAta
@@ -165,23 +165,25 @@ share/sipxpbx/lib/xmlrpc-2.0.jar
@dirrm etc/sipxpbx/kphone
@dirrm etc/sipxpbx/polycom/mac-address.d
@dirrm etc/sipxpbx/polycom
-@dirrm etc/sipxpbx/process.d
+@dirrmtry etc/sipxpbx/process.d
@dirrm etc/sipxpbx/sipxconference
@dirrm etc/sipxpbx/sipxpark
@dirrm etc/sipxpbx/sipxvxml
@dirrm etc/sipxpbx/snom
@dirrm etc/sipxpbx/unmanagedPhone
-@dirrm etc/sipxpbx
-@dirrm lib/ruby/gems/1.8/cache
+@dirrmtry etc/sipxpbx
+@dirrmtry lib/ruby/gems/1.8/cache
+@exec mkdir -p %D/lib/ruby/gems/1.8/doc/sipXconfig-agent-1.0.0
@dirrm lib/ruby/gems/1.8/doc/sipXconfig-agent-1.0.0
+@dirrmtry lib/ruby/gems/1.8/doc
@dirrm lib/ruby/gems/1.8/gems/sipXconfig-agent-1.0.0/bin
@dirrm lib/ruby/gems/1.8/gems/sipXconfig-agent-1.0.0/lib
@dirrm lib/ruby/gems/1.8/gems/sipXconfig-agent-1.0.0/tests
@dirrm lib/ruby/gems/1.8/gems/sipXconfig-agent-1.0.0
-@dirrm lib/ruby/gems/1.8/gems
-@dirrm lib/ruby/gems/1.8/specifications
-@dirrm lib/ruby/gems/1.8
-@dirrm lib/ruby/gems
-@dirrm lib/ruby
+@dirrmtry lib/ruby/gems/1.8/gems
+@dirrmtry lib/ruby/gems/1.8/specifications
+@dirrmtry lib/ruby/gems/1.8
+@dirrmtry lib/ruby/gems
+@dirrmtry lib/ruby
@dirrm share/sipxpbx/lib
-@dirrm share/sipxpbx
+@dirrmtry share/sipxpbx
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
diff --git a/net/sipxproxy/Makefile b/net/sipxproxy/Makefile
index 50bc5514089e..31d8ad751394 100644
--- a/net/sipxproxy/Makefile
+++ b/net/sipxproxy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sipxproxy
PORTVERSION= 3.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.sipfoundry.org/pub/sipX/3.6/SRC/
diff --git a/net/sipxproxy/pkg-plist b/net/sipxproxy/pkg-plist
index 2e47ba2d2552..52d2bcb2f63a 100644
--- a/net/sipxproxy/pkg-plist
+++ b/net/sipxproxy/pkg-plist
@@ -15,6 +15,6 @@ etc/sipxpbx/forwardingrules.xml.in
etc/sipxpbx/process.d/sipauthproxy.process.xml
etc/sipxpbx/process.d/sipproxy.process.xml
etc/sipxpbx/proxy-config.in
-@dirrm etc/sipxpbx/process.d
+@dirrmtry etc/sipxpbx/process.d
@dirrm etc/sipxpbx/cdr
-@dirrm etc/sipxpbx
+@dirrmtry etc/sipxpbx
diff --git a/net/sipxpublisher/Makefile b/net/sipxpublisher/Makefile
index 4a1af133c582..ac44b31d39e5 100644
--- a/net/sipxpublisher/Makefile
+++ b/net/sipxpublisher/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sipxpublisher
PORTVERSION= 3.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.sipfoundry.org/pub/sipX/3.6/SRC/
diff --git a/net/sipxpublisher/pkg-plist b/net/sipxpublisher/pkg-plist
index f899d4287f2c..69f2b20bc89b 100644
--- a/net/sipxpublisher/pkg-plist
+++ b/net/sipxpublisher/pkg-plist
@@ -15,5 +15,5 @@ include/statusserver/SubscribeServerPluginBase.h
include/statusserver/SubscribeServerThread.h
include/statusserver/WebServer.h
@dirrm include/statusserver
-@dirrm etc/sipxpbx/process.d
-@dirrm etc/sipxpbx
+@dirrmtry etc/sipxpbx/process.d
+@dirrmtry etc/sipxpbx
diff --git a/net/sipxregistry/Makefile b/net/sipxregistry/Makefile
index cbedd008e65d..ae736e79109c 100644
--- a/net/sipxregistry/Makefile
+++ b/net/sipxregistry/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sipxregistry
PORTVERSION= 3.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.sipfoundry.org/pub/sipX/3.6/SRC/
diff --git a/net/sipxregistry/pkg-plist b/net/sipxregistry/pkg-plist
index cf27da08d786..42da0bc12529 100644
--- a/net/sipxregistry/pkg-plist
+++ b/net/sipxregistry/pkg-plist
@@ -13,8 +13,8 @@ lib/libRegistrarImpliedMWI.so.1
share/sipx/schema/alias.xsd
share/sipx/schema/caller-alias.xsd
share/sipx/schema/huntgroup.xsd
-@dirrm share/sipx/schema
-@dirrm share/sipx
+@dirrmtry share/sipx/schema
+@dirrmtry share/sipx
@dirrm include/registry
-@dirrm etc/sipxpbx/process.d
-@dirrm etc/sipxpbx
+@dirrmtry etc/sipxpbx/process.d
+@dirrmtry etc/sipxpbx
diff --git a/net/sipxtacklib/Makefile b/net/sipxtacklib/Makefile
index 20eff5699552..36fa9b495e2a 100644
--- a/net/sipxtacklib/Makefile
+++ b/net/sipxtacklib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sipxtacklib
PORTVERSION= 3.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net java
MASTER_SITES= http://www.sipfoundry.org/pub/sipX/3.6/SRC/
diff --git a/net/sipxtacklib/pkg-plist b/net/sipxtacklib/pkg-plist
index 59b6d82bd3bb..03b94852cff9 100644
--- a/net/sipxtacklib/pkg-plist
+++ b/net/sipxtacklib/pkg-plist
@@ -120,8 +120,8 @@ lib/libsipXtack.so.2
lib/sipviewer/jdom.jar
lib/sipviewer/sipviewer.jar
share/sipx/schema/sip_types.xsd
-@dirrm share/sipx/schema
-@dirrm share/sipx
+@dirrmtry share/sipx/schema
+@dirrmtry share/sipx
@dirrm lib/sipviewer
@dirrm include/tapi
@dirrm include/siptest
diff --git a/net/sipxvxml/Makefile b/net/sipxvxml/Makefile
index 9bb31b0818aa..703d57ccb56f 100644
--- a/net/sipxvxml/Makefile
+++ b/net/sipxvxml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sipxvxml
PORTVERSION= 3.6.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://www.sipfoundry.org/pub/sipX/3.6/SRC/
diff --git a/net/sipxvxml/files/pkg-install.in b/net/sipxvxml/files/pkg-install.in
index be5585a14288..74edafa8666d 100644
--- a/net/sipxvxml/files/pkg-install.in
+++ b/net/sipxvxml/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,8 +31,18 @@ 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.
+ mkdir -p %%PREFIX%%/www/sipX/conf
+ touch %%PREFIX%%/www/sipX/conf/.sipxvxml_dummy
+
chown ${USER}:${GROUP} %%PREFIX%%/etc/sipxpbx
- chown ${USER}:${GROUP} %%PREFIX%%/www/sipX/conf
+ chown -R ${USER}:${GROUP} %%PREFIX%%/www/sipX/conf
chown ${USER}:${GROUP} %%PREFIX%%/www/sipX
;;
esac
diff --git a/net/sipxvxml/pkg-plist b/net/sipxvxml/pkg-plist
index 3feb2d6a2850..ab97c278dad9 100644
--- a/net/sipxvxml/pkg-plist
+++ b/net/sipxvxml/pkg-plist
@@ -50,11 +50,10 @@ include/src/jsutil.h
include/src/jsxdrapi.h
include/src/prmjtime.h
include/src/resource.h
-@exec mkdir -p %D/www/sipX/conf
+www/sipX/conf/.sipxvxml_dummy
@dirrm www/sipX/conf
-@exec mkdir -p %D/www/sipX
@dirrm www/sipX
@dirrm include/src/fdlibm
@dirrm include/src
-@dirrm etc/sipxpbx/process.d
-@dirrm etc/sipxpbx
+@dirrmtry etc/sipxpbx/process.d
+@dirrmtry etc/sipxpbx
generated by cgit (git 2.34.1) at 2025-01-21 22:58:07 +0800