- Convert to staging

- Convert to USES
- Use shebangfix where necessary
- Move most @exec/@unexec commands from plist to pkg-install/pkg-deinstall
  scripts
- Make rclint somewhat happier
- Convert to new LIB_DEPENDS format
- Strip binaries
- Take maintainership

5 files changed, 52 insertions, 24 deletions

diff --git a/comms/smstools3/files/patch-Makefile b/comms/smstools3/files/patch-Makefile
index 88fa1883bfae..2218e6384696 100644
--- a/comms/smstools3/files/patch-Makefile
+++ b/comms/smstools3/files/patch-Makefile
@@ -5,14 +5,14 @@
  # If you change destination of executables, remember to change
  # startup script (init.d/sms3) too.
 -BINDIR=/usr/local/bin
-+BINDIR=%%PREFIX%%/bin
++BINDIR=%%STAGEDIR%%%%PREFIX%%/bin
  
  VERSION=$(shell grep package_version src/version.h | cut -f2)
  
 -compile: 
 -	cd src && $(MAKE) -$(MAKEFLAGS) 
 +all: 
-+	cd src && $(MAKE) $(MAKEFLAGS)
++	cd src && $(MAKE)
  
 -install: compile
 -	./install.sh $(BINDIR)
@@ -25,7 +25,7 @@
  
  clean:
 -	cd src && $(MAKE) -$(MAKEFLAGS) clean
-+	cd src && $(MAKE) $(MAKEFLAGS) clean
++	cd src && $(MAKE) clean
  
 -package: compile clean
 -	./package.sh
diff --git a/comms/smstools3/files/patch-install.sh b/comms/smstools3/files/patch-install.sh
index 18a117ccbb3c..280b64b7ae3a 100644
--- a/comms/smstools3/files/patch-install.sh
+++ b/comms/smstools3/files/patch-install.sh
@@ -1,15 +1,15 @@
 --- install.sh.orig	2007-04-22 13:43:17.000000000 +0200
-+++ install.sh	2008-05-18 00:16:05.000000000 +0200
++++ install.sh	2013-10-16 12:22:40.725619989 +0200
 @@ -3,7 +3,7 @@
  
  BINDIR=$1
  if [ -z "$BINDIR" ]; then
 -  BINDIR=/usr/local/bin
-+  BINDIR=%%PREFIX%%/bin
++  BINDIR=%%STAGEDIR%%%%PREFIX%%/bin
  fi
  
  makepath()
-@@ -84,14 +84,8 @@
+@@ -84,38 +84,6 @@
  delete $BINDIR/getsms
  delete $BINDIR/putsms
  
@@ -19,16 +19,16 @@
 -copy scripts/sms2unicode $BINDIR/sms2unicode
 -copy scripts/unicode2sms $BINDIR/unicode2sms
 -
- echo "Installing config file"
+-echo "Installing config file"
 -copy examples/smsd.conf.easy /etc/smsd.conf
-+copy examples/smsd.conf.easy %%PREFIX%%/etc/smsd.conf
- 
- echo "Creating minimum spool directories"
- makedir /var/spool
-@@ -100,22 +94,6 @@
- makedir /var/spool/sms/outgoing
- makedir /var/spool/sms/checked
- 
+-
+-echo "Creating minimum spool directories"
+-makedir /var/spool
+-makedir /var/spool/sms
+-makedir /var/spool/sms/incoming
+-makedir /var/spool/sms/outgoing
+-makedir /var/spool/sms/checked
+-
 -echo "Installing start-script"
 -SMS3SCRIPT=scripts/sms3
 -if [ -d /etc/init.d ]; then
@@ -48,4 +48,4 @@
 -  echo "You have installed executables to $BINDIR,"
 -  echo "you should manually edit $SMS3SCRIPT script."
 -fi
-+echo 'Please dont forget to edit %%PREFIX%%/etc/smsd.conf.'
++echo 'Please dont forget to edit %%STAGEDIR%%%%PREFIX%%/etc/smsd.conf.'
diff --git a/comms/smstools3/files/pkg-deinstall.in b/comms/smstools3/files/pkg-deinstall.in
new file mode 100644
index 000000000000..bd78c6b46ce2
--- /dev/null
+++ b/comms/smstools3/files/pkg-deinstall.in
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+if [ "x$2" = "xPOST-DEINSTALL" ]; then
+	rmdir %%SPOOLDIR%%/incoming %%SPOOLDIR%%/outgoing \
+	%%SPOOLDIR%%/checked %%SPOOLDIR%% %%LOGDIR%% %%PIDDIR%% \
+	2>/dev/null || true
+	echo
+	echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
+	echo "If you are permanently removing smstools, you should also:" | /usr/bin/fmt
+	echo "'rm -rf %%SPOOLDIR%%'"
+	echo "'rm -rf %%LOGDIR%%'"
+	echo "'rm -rf %%PIDDIR%%'"
+	echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
+fi
diff --git a/comms/smstools3/files/pkg-install.in b/comms/smstools3/files/pkg-install.in
new file mode 100644
index 000000000000..9f9262263885
--- /dev/null
+++ b/comms/smstools3/files/pkg-install.in
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+if [ "x$2" = "xPOST-INSTALL" ]; then
+	mkdir -p %%SPOOLDIR%%/incoming %%SPOOLDIR%%/outgoing \
+		%%SPOOLDIR%%/checked %%LOGDIR%% %%PIDDIR%%
+	chown -R %%SMSD_USER%%:%%SMSD_GROUP%% %%SPOOLDIR%% \
+		%%LOGDIR%% %%PIDDIR%%
+fi
diff --git a/comms/smstools3/files/smsd.in b/comms/smstools3/files/smsd.in
index df8062f81e45..c808d37a5b52 100644
--- a/comms/smstools3/files/smsd.in
+++ b/comms/smstools3/files/smsd.in
@@ -12,17 +12,17 @@
 #
 . /etc/rc.subr
 
-name="smsd"
+name=smsd
 rcvar=smsd_enable
 
 load_rc_config ${name}
-: ${smsd_enable="NO"}
-: ${smsd_pidfile="%%PIDDIR%%/smsd.pid"}
-: ${smsd_infofile="%%PIDDIR%%/smsd.working"}
-: ${smsd_logfile="%%LOGDIR%%/smsd.log"}
-: ${smsd_config="%%PREFIX%%/etc/smsd.conf"}
-: ${smsd_user="uucp"}
-: ${smsd_group="dialer"}
+: ${smsd_enable:=NO}
+: ${smsd_pidfile:="%%PIDDIR%%/smsd.pid"}
+: ${smsd_infofile:="%%PIDDIR%%/smsd.working"}
+: ${smsd_logfile:="%%LOGDIR%%/smsd.log"}
+: ${smsd_config:="%%PREFIX%%/etc/smsd.conf"}
+: ${smsd_user:=uucp}
+: ${smsd_group:=dialer}
 
 pidfile=${smsd_pidfile}
 command="%%PREFIX%%/bin/smsd"