ports/123787: [PATCH] fixes for comms/smstools

[Andrej Zverev]

>Number:         123787
>Category:       ports
>Synopsis:       [PATCH] fixes for comms/smstools
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 18 11:00:06 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Andrej Zverev
>Release:        
>Organization:
>Environment:
System: FreeBSD mail.electro-com.ru 5.4-STABLE FreeBSD 5.4-STABLE #0: Tue Oct 11 20:28:18 MSD 2005 root at mxcorp.electro-com.ru:/usr/obj/usr/src/sys/mxcorp i386


	
>Description:
- Fix mastersite[1]
- Fix everytime clearing of config file[2]
- Fix expand of files/patch-src_smsd_cfg.c macros[3]
- BUMP portrevision

[1] - Mastersite has changed.
[2] - Every reinstall of software cause to overide smsd.conf file.
Better install smsd.conf.sample as std and add notice about it.
[3] - files/patch-src_smsd_cfg.c has intoduce of %%PREFIX%% macro, but
it's never expanded and binary file have %%PREFIX%%/etc/smsd.conf inside

	
>How-To-Repeat:
	
>Fix:

	

--- patch-smstools.diff begins here ---
Index: smstools/Makefile
===================================================================
RCS file: /home/pcvs/ports/comms/smstools/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- smstools/Makefile	18 May 2008 09:27:59 -0000	1.9
+++ smstools/Makefile	18 May 2008 10:39:37 -0000
@@ -7,8 +7,9 @@
 
 PORTNAME=	smstools
 PORTVERSION=	2.2.20
+PORTREVISION=	1
 CATEGORIES=	comms
-MASTER_SITES=	http://www.meinemullemaus.de/smstools/packages/
+MASTER_SITES=	http://smstools.meinemullemaus.de/packages/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Tools to handle Short Message Service
@@ -39,20 +40,20 @@
 		sms2unicode sms2xml smsevent smsresend sql_demo unicode2sms
 
 post-patch:
-	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/install.sh
+	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/install.sh \
+		${WRKSRC}/src/smsd_cfg.c
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
 .endif
+
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/examples/,} ${EXAMPLESDIR}/
 .endif
 	@${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/scripts/,} ${PREFIX}/bin
-
-#post-install:
-	@${INSTALL_DATA} ${WRKSRC}/examples/smsd.conf.easy ${PREFIX}/etc/smsd.conf
+	@${INSTALL_DATA} ${WRKSRC}/examples/smsd.conf.easy ${PREFIX}/etc/smsd.conf.sample
 
 .include <bsd.port.mk>
Index: smstools/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/comms/smstools/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- smstools/pkg-plist	22 Feb 2008 13:24:18 -0000	1.6
+++ smstools/pkg-plist	18 May 2008 10:39:37 -0000
@@ -12,7 +12,7 @@
 bin/smsresend
 bin/sql_demo
 bin/unicode2sms
-etc/smsd.conf
+etc/smsd.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/alarmhandler.html
 %%PORTDOCS%%%%DOCSDIR%%/blacklist.html
 %%PORTDOCS%%%%DOCSDIR%%/book.html
Index: smstools/files/patch-install.sh
===================================================================
RCS file: /home/pcvs/ports/comms/smstools/files/patch-install.sh,v
retrieving revision 1.3
diff -u -r1.3 patch-install.sh
--- smstools/files/patch-install.sh	22 Feb 2008 13:24:22 -0000	1.3
+++ smstools/files/patch-install.sh	18 May 2008 10:39:37 -0000
@@ -1,5 +1,5 @@
---- install.sh.old	2008-02-05 23:45:04.000000000 -0200
-+++ install.sh	2008-02-05 23:45:05.000000000 -0200
+--- install.sh.old	Thu Dec 27 19:14:44 2007
++++ install.sh	Sun May 18 14:26:44 2008
 @@ -2,7 +2,7 @@
  #Do not run directly. This is a helper script for make.
  
@@ -14,11 +14,11 @@
  
  echo "Installing config file"
 -copy examples/smsd.conf.easy /etc/smsd.conf
-+copy examples/smsd.conf.easy %%PREFIX%%/etc/smsd.conf
++#copy examples/smsd.conf.easy %%PREFIX%%/etc/smsd.conf
  
  echo "Creating minimum spool directories"
  makedir $SPOOLDIR
-@@ -76,15 +76,6 @@
+@@ -76,15 +76,7 @@
  makedir $SPOOLDIR/outgoing
  makedir $SPOOLDIR/checked
  
@@ -34,4 +34,5 @@
  echo ""
  echo "Example script files are not installed automatically."
 -echo 'Please dont forget to edit /etc/smsd.conf.'
-+echo 'Please dont forget to edit %%PREFIX%%/etc/smsd.conf.'
++echo 'Please dont forget to rename and edit  %%PREFIX%%/etc/smsd.conf.sample'
++echo 'to %%PREFIX%%/etc/smsd.conf'
--- patch-smstools.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: