From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 6 05:30:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E36C616A418 for ; Wed, 6 Feb 2008 05:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D8D1513C469 for ; Wed, 6 Feb 2008 05:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m165U137024257 for ; Wed, 6 Feb 2008 05:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m165U1Zs024256; Wed, 6 Feb 2008 05:30:01 GMT (envelope-from gnats) Resent-Date: Wed, 6 Feb 2008 05:30:01 GMT Resent-Message-Id: <200802060530.m165U1Zs024256@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Felippe de Meirelles Motta Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1C8616A417 for ; Wed, 6 Feb 2008 05:23:52 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id D729B13C45A for ; Wed, 6 Feb 2008 05:23:52 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m165Lp4J048538 for ; Wed, 6 Feb 2008 05:21:51 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m165Losl048537; Wed, 6 Feb 2008 05:21:50 GMT (envelope-from nobody) Message-Id: <200802060521.m165Losl048537@www.freebsd.org> Date: Wed, 6 Feb 2008 05:21:50 GMT From: Felippe de Meirelles Motta To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/120310: [UPDATE] comms/smstools X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Feb 2008 05:30:02 -0000 >Number: 120310 >Category: ports >Synopsis: [UPDATE] comms/smstools >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Feb 06 05:30:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Felippe de Meirelles Motta >Release: FreeBSD 7.0-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD 7.0-PRERELEASE #0: Thu Jan 10 01:55:37 BRST 2008 lippe@shire.freebsd.org:/usr/obj/usr/src/sys/GENERIC >Description: - Updated to 2.2.20; - Now respecting PORTDOCS/PORTEXAMPLES; - Fix and update pkg-plist; - Remove unnecessary patches. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/comms/smstools/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- Makefile 24 Oct 2007 13:25:40 -0000 1.7 +++ Makefile 6 Feb 2008 05:21:34 -0000 @@ -6,8 +6,7 @@ # PORTNAME= smstools -PORTVERSION= 2.2.18 -PORTREVISION= 1 +PORTVERSION= 2.2.20 CATEGORIES= comms MASTER_SITES= http://www.meinemullemaus.de/smstools/packages/ @@ -16,15 +15,40 @@ LIB_DEPENDS= mm:${PORTSDIR}/devel/mm -WRKSRC= ${WRKDIR}/smstools +WRKSRC= ${WRKDIR}/${PORTNAME} USE_GMAKE= yes USE_RC_SUBR= smsd.sh +SPOOLDIR?= /var/spool/sms +PLIST_SUB+= PREFIX="${PREFIX}" \ + SPOOLDIR="${SPOOLDIR}" + +DOCS= alarmhandler.html blacklist.html book.html butterfly.gif \ + compiling.html configure.html configure2.html costs.html \ + email.gif eventhandler.html faq.html fileformat.html \ + gpl.html gpl_de.html hardwarecomp.html index.html \ + license.html links.html paypalbutton.gif raster.gif \ + references.html releasenotes.html run.html softwarecomp.html \ + statformat.html statusmonitor.html support.gif support.html \ + udh.html windows.html +EXAMPLES= .procmailrc .qmailrc operator_logo1.sms operator_logo2.sms \ + received_report.sms received_sms.sms send_sms.sms \ + send_sms_unicode.sms smsd.conf.easy smsd.conf.full +SCRIPTS= email2sms hex2bin hex2dec mysmsd sendsms sms sms2html \ + sms2unicode sms2xml smsevent smsresend sql_demo unicode2sms post-patch: - @${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/src/smsd_cfg.c \ - ${WRKSRC}/install.sh \ - ${WRKSRC}/examples/smsd.conf.easy \ - ${WRKSRC}/examples/smsd.conf.full + @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/install.sh + +do-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/ + @${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 .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/comms/smstools/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 24 Oct 2007 13:25:40 -0000 1.6 +++ distinfo 6 Feb 2008 05:21:34 -0000 @@ -1,3 +1,3 @@ -MD5 (smstools-2.2.18.tar.gz) = 3272133cebafc46de224e91d08a1d14f -SHA256 (smstools-2.2.18.tar.gz) = ac2c2d6b506a9f22042623219825592d51c1eb22528367270b3603927e91c86b -SIZE (smstools-2.2.18.tar.gz) = 176805 +MD5 (smstools-2.2.20.tar.gz) = 6d59c3815a7bdb8d2f1b8cfa71f1258d +SHA256 (smstools-2.2.20.tar.gz) = 8eee958946332580bbe314f2e839734e633db487deb43bbb5d9bbc94b8f506bb +SIZE (smstools-2.2.20.tar.gz) = 172234 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/comms/smstools/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- pkg-plist 22 Aug 2007 19:43:51 -0000 1.5 +++ pkg-plist 6 Feb 2008 05:21:34 -0000 @@ -1,24 +1,61 @@ +bin/email2sms +bin/hex2bin +bin/hex2dec +bin/mysmsd bin/sendsms +bin/sms bin/sms2html bin/sms2unicode -bin/smsd +bin/sms2xml +bin/smsevent +bin/smsresend +bin/sql_demo bin/unicode2sms -etc/smsd.conf.sample -%%EXAMPLESDIR%%/email2sms -%%EXAMPLESDIR%%/mysmsd -%%EXAMPLESDIR%%/operator_logo1.sms -%%EXAMPLESDIR%%/operator_logo2.sms -%%EXAMPLESDIR%%/received_report.sms -%%EXAMPLESDIR%%/received_sms.sms -%%EXAMPLESDIR%%/send_sms.sms -%%EXAMPLESDIR%%/send_sms_unicode.sms -%%EXAMPLESDIR%%/smsd.conf.easy -%%EXAMPLESDIR%%/smsd.conf.full -%%EXAMPLESDIR%%/smsevent -%%EXAMPLESDIR%%/sql_demo -@dirrm %%EXAMPLESDIR%% -@cwd / -@dirrm var/spool/sms/outgoing -@dirrm var/spool/sms/incoming -@dirrm var/spool/sms/checked -@dirrm var/spool/sms +etc/smsd.conf +%%PORTDOCS%%%%DOCSDIR%%/alarmhandler.html +%%PORTDOCS%%%%DOCSDIR%%/blacklist.html +%%PORTDOCS%%%%DOCSDIR%%/book.html +%%PORTDOCS%%%%DOCSDIR%%/butterfly.gif +%%PORTDOCS%%%%DOCSDIR%%/compiling.html +%%PORTDOCS%%%%DOCSDIR%%/configure.html +%%PORTDOCS%%%%DOCSDIR%%/configure2.html +%%PORTDOCS%%%%DOCSDIR%%/costs.html +%%PORTDOCS%%%%DOCSDIR%%/email.gif +%%PORTDOCS%%%%DOCSDIR%%/eventhandler.html +%%PORTDOCS%%%%DOCSDIR%%/faq.html +%%PORTDOCS%%%%DOCSDIR%%/fileformat.html +%%PORTDOCS%%%%DOCSDIR%%/gpl.html +%%PORTDOCS%%%%DOCSDIR%%/gpl_de.html +%%PORTDOCS%%%%DOCSDIR%%/hardwarecomp.html +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/license.html +%%PORTDOCS%%%%DOCSDIR%%/links.html +%%PORTDOCS%%%%DOCSDIR%%/paypalbutton.gif +%%PORTDOCS%%%%DOCSDIR%%/raster.gif +%%PORTDOCS%%%%DOCSDIR%%/references.html +%%PORTDOCS%%%%DOCSDIR%%/releasenotes.html +%%PORTDOCS%%%%DOCSDIR%%/run.html +%%PORTDOCS%%%%DOCSDIR%%/softwarecomp.html +%%PORTDOCS%%%%DOCSDIR%%/statformat.html +%%PORTDOCS%%%%DOCSDIR%%/statusmonitor.html +%%PORTDOCS%%%%DOCSDIR%%/support.gif +%%PORTDOCS%%%%DOCSDIR%%/support.html +%%PORTDOCS%%%%DOCSDIR%%/udh.html +%%PORTDOCS%%%%DOCSDIR%%/windows.html +%%PORTDOCS%%%%EXAMPLESDIR%%/.procmailrc +%%PORTDOCS%%%%EXAMPLESDIR%%/.qmailrc +%%PORTDOCS%%%%EXAMPLESDIR%%/operator_logo1.sms +%%PORTDOCS%%%%EXAMPLESDIR%%/operator_logo2.sms +%%PORTDOCS%%%%EXAMPLESDIR%%/received_report.sms +%%PORTDOCS%%%%EXAMPLESDIR%%/received_sms.sms +%%PORTDOCS%%%%EXAMPLESDIR%%/send_sms.sms +%%PORTDOCS%%%%EXAMPLESDIR%%/send_sms_unicode.sms +%%PORTDOCS%%%%EXAMPLESDIR%%/smsd.conf.easy +%%PORTDOCS%%%%EXAMPLESDIR%%/smsd.conf.full +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@exec mkdir -p %%SPOOLDIR%%/incoming %%SPOOLDIR%%/outgoing %%SPOOLDIR%%/checked +@unexec echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" +@unexec echo "If you are permanently removing smstools, you should also:" | /usr/bin/fmt +@unexec echo "'rm -rf %%SPOOLDIR%%'" | /usr/bin/fmt +@unexec echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" Index: files/patch-Makefile =================================================================== RCS file: /home/ncvs/ports/comms/smstools/files/patch-Makefile,v retrieving revision 1.2 diff -u -r1.2 patch-Makefile --- files/patch-Makefile 25 Apr 2006 11:35:33 -0000 1.2 +++ files/patch-Makefile 6 Feb 2008 05:21:34 -0000 @@ -1,27 +1,28 @@ ---- Makefile Fri Apr 21 11:25:01 2006 -+++ Makefile Fri Apr 21 13:23:24 2006 -@@ -1,18 +1,18 @@ - # Makefile +--- Makefile.old 2008-02-05 23:39:45.000000000 -0200 ++++ Makefile 2008-02-05 23:40:48.000000000 -0200 +@@ -2,17 +2,17 @@ --VERSION=$(shell grep package_version src/version.h | cut -f2) -+VERSION=2.0.7 + VERSION=$(shell grep package_version src/version.h | cut -f2) -compile: - cd src && $(MAKE) -$(MAKEFLAGS) -+all: ++all: + cd src && $(MAKE) $(MAKEFLAGS) -install: compile - ./install.sh -+install: ++install: + @$(SH) ./install.sh uninstall: - ./uninstall.sh +- ./uninstall.sh ++ @$(SH) ./uninstall.sh clean: - cd src && $(MAKE) -$(MAKEFLAGS) clean + cd src && $(MAKE) $(MAKEFLAGS) clean - package: compile clean - ./package.sh +-package: compile clean +- ./package.sh ++package: clean ++ @$(SH) ./package.sh Index: files/patch-examples_smsd.conf.easy =================================================================== RCS file: files/patch-examples_smsd.conf.easy diff -N files/patch-examples_smsd.conf.easy --- files/patch-examples_smsd.conf.easy 22 Aug 2007 19:43:51 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- examples/smsd.conf.easy.orig Sat Feb 4 14:52:06 2006 -+++ examples/smsd.conf.easy Fri Jul 20 09:41:03 2007 -@@ -5,6 +5,7 @@ - loglevel = 7 - - [GSM1] --device = /dev/ttyS0 -+device = /dev/cuad0 - incoming = yes -+#baudrate = 9600 - #pin = 1111 Index: files/patch-examples_smsd.conf.full =================================================================== RCS file: files/patch-examples_smsd.conf.full diff -N files/patch-examples_smsd.conf.full --- files/patch-examples_smsd.conf.full 22 Aug 2007 19:43:51 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,61 +0,0 @@ ---- examples/smsd.conf.full.orig Sat Jul 29 14:58:42 2006 -+++ examples/smsd.conf.full Fri Jul 20 09:39:38 2007 -@@ -6,21 +6,21 @@ - #failed = /var/spool/sms/failed - incoming = /var/spool/sms/incoming - #sent = /var/spool/sms/sent --mypath = /usr/local/bin -+mypath = %%PREFIX%%/bin - #logfile = /var/log/smsd.log - loglevel = 7 --#alarmhandler = /usr/local/bin/alarmevent -+#alarmhandler = %%PREFIX%%/bin/alarmevent - alarmlevel = 4 - delaytime = 10 - errorsleeptime = 10 - blocktime = 3600 --#eventhandler = /usr/local/bin/smsevent -+#eventhandler = %%PREFIX%%/bin/smsevent - #stats = /var/log/smsd_stats - #stats_interval = 3600 - #stats_no_zeroes = no - #blacklist = /etc/smsd.black - #whitelist = /etc/smsd.white --#checkhandler = /usr/local/bin/smscheck -+#checkhandler = %%PREFIX%%/bin/smscheck - receive_before_send = no - # autosplit 0=no 1=yes 2=with text numbers 3=concatenated - autosplit = 3 -@@ -47,8 +47,8 @@ - - [GSM1] - init = ATE0+CPMS="SM"+CNMI=2,0,0,2,1 --# Windows: /dev/com1, Solaris: /dev/cua/a, Linux /dev/ttyS0 --device = /dev/ttyS0 -+# Windows: /dev/com1, Solaris: /dev/cua/a, Linux /dev/ttyS0, FreeBSD /dev/cuad0 -+device = /dev/cuad0 - incoming = yes - queues = OTHER - #You don't need a PIN for mobile phones -@@ -60,12 +60,12 @@ - cs_convert = yes - report = no - memory_start = 1 --#eventhandler = /usr/local/bin/smsevent -+#eventhandler = %%PREFIX%%/bin/smsevent - - [GSM2] - init = ATE0 --# Windows: /dev/com2, Solaris: /dev/cua/b, Linux /dev/ttyS1 --device = /dev/ttyS1 -+# Windows: /dev/com2, Solaris: /dev/cua/b, Linux /dev/ttyS1, FreeBSD /dev/cuad1 -+device = /dev/cuad1 - incoming = yes - queues = OTHER - #You don't need a PIN for mobile phones -@@ -77,4 +77,4 @@ - cs_convert = yes - report = no - memory_start = 1 --#eventhandler = /usr/local/bin/smsevent -+#eventhandler = %%PREFIX%%/bin/smsevent Index: files/patch-install.sh =================================================================== RCS file: /home/ncvs/ports/comms/smstools/files/patch-install.sh,v retrieving revision 1.2 diff -u -r1.2 patch-install.sh --- files/patch-install.sh 22 Aug 2007 19:43:51 -0000 1.2 +++ files/patch-install.sh 6 Feb 2008 05:21:34 -0000 @@ -1,55 +1,26 @@ ---- install.sh.orig Sat Jul 29 14:50:42 2006 -+++ install.sh Fri Jul 20 09:49:08 2007 -@@ -47,24 +47,35 @@ - fi - - echo "Installing binary program files" --makedir /usr/local --makedir /usr/local/bin - if [ -f src/smsd.exe ]; then -- forcecopy src/smsd.exe /usr/local/bin/smsd.exe -+ forcecopy src/smsd.exe %%PREFIX%%/bin/smsd.exe - else -- forcecopy src/smsd /usr/local/bin/smsd -+ forcecopy src/smsd %%PREFIX%%/bin/smsd - fi --delete /usr/local/bin/getsms --delete /usr/local/bin/putsms - - echo "Installing some scripts" --copy scripts/sendsms /usr/local/bin/sendsms --copy scripts/sms2html /usr/local/bin/sms2html --copy scripts/sms2unicode /usr/local/bin/sms2unicode --copy scripts/unicode2sms /usr/local/bin/unicode2sms -+copy scripts/sendsms %%PREFIX%%/bin/sendsms -+copy scripts/sms2html %%PREFIX%%/bin/sms2html -+copy scripts/sms2unicode %%PREFIX%%/bin/sms2unicode -+copy scripts/unicode2sms %%PREFIX%%/bin/unicode2sms +--- install.sh.old 2008-02-05 23:45:04.000000000 -0200 ++++ install.sh 2008-02-05 23:45:05.000000000 -0200 +@@ -2,7 +2,7 @@ + #Do not run directly. This is a helper script for make. + + # Remember to edit the config file if you change these default path's. +-BINDIR=/usr/local/bin ++BINDIR=%%PREFIX%%/bin + SPOOLDIR=/var/spool/sms + + +@@ -68,7 +68,7 @@ + copy scripts/unicode2sms $BINDIR/unicode2sms echo "Installing config file" -copy examples/smsd.conf.easy /etc/smsd.conf -+copy examples/smsd.conf.full %%PREFIX%%/etc/smsd.conf.sample -+ -+echo "Installing additional examples" -+makedir %%EXAMPLESDIR%% -+copy examples/operator_logo1.sms %%EXAMPLESDIR%%/operator_logo1.sms -+copy examples/operator_logo2.sms %%EXAMPLESDIR%%/operator_logo2.sms -+copy examples/received_report.sms %%EXAMPLESDIR%%/received_report.sms -+copy examples/received_sms.sms %%EXAMPLESDIR%%/received_sms.sms -+copy examples/send_sms.sms %%EXAMPLESDIR%%/send_sms.sms -+copy examples/send_sms_unicode.sms %%EXAMPLESDIR%%/send_sms_unicode.sms -+copy examples/smsd.conf.easy %%EXAMPLESDIR%%/smsd.conf.easy -+copy examples/smsd.conf.full %%EXAMPLESDIR%%/smsd.conf.full -+copy scripts/email2sms %%EXAMPLESDIR%%/email2sms -+copy scripts/smsevent %%EXAMPLESDIR%%/smsevent -+copy scripts/sql_demo %%EXAMPLESDIR%%/sql_demo -+copy scripts/mysmsd %%EXAMPLESDIR%%/mysmsd ++copy examples/smsd.conf.easy %%PREFIX%%/etc/smsd.conf echo "Creating minimum spool directories" - makedir /var/spool -@@ -73,15 +84,5 @@ - makedir /var/spool/sms/outgoing - makedir /var/spool/sms/checked + makedir $SPOOLDIR +@@ -76,15 +76,6 @@ + makedir $SPOOLDIR/outgoing + makedir $SPOOLDIR/checked -echo "Installing start-script" -if [ -d /etc/init.d ]; then @@ -61,6 +32,6 @@ -fi - echo "" --echo "Example script files are not installed automatically." + echo "Example script files are not installed automatically." -echo 'Please dont forget to edit /etc/smsd.conf.' -+echo 'Please dont forget to create/edit %%PREFIX%%/etc/smsd.conf.' ++echo 'Please dont forget to edit %%PREFIX%%/etc/smsd.conf.' >Release-Note: >Audit-Trail: >Unformatted: