6 files changed, 19 insertions, 113 deletions

diff --git a/polish/sms2/Makefile b/polish/sms2/Makefile
index a6842d3bdb1d..d5bf5ce22b2c 100644
--- a/polish/sms2/Makefile
+++ b/polish/sms2/Makefile
@@ -1,48 +1,23 @@
-# Ports collection makefile for: sms
-# Date created:		23 dec 2001
-# Whom: 		Michal Pasternak <doc@lublin.t1.pl>
+# New ports collection makefile for: sms2
+# Date created:		04 sep 2004
+# Whom:			Krzysztof Kowalewski <pyzmen@kam.pl>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sms
-PORTVERSION=	1.9.2m
+PORTVERSION=	2.0.0
 CATEGORIES=	polish
-MASTER_SITES=	http://www.ceti.pl/~miki/komputery/download/sms/
+MASTER_SITES=	http://ceti.pl/~miki/komputery/download/sms/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Send SMS to cellular phones in Poland (Idea, ERA, Plus)
 
-WRKSRC=	${WRKDIR}/sms
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-REINPLACE_ARGS=	-i ""
-MAKE_ARGS=	CXX="${CXX}"
-
-.if defined(NOPORTDOCS)
-MAKE_ARGS+=	NOPORTDOCS=1
-.endif
-
-.if defined(WITHOUT_ADDRESSBOOK)
-EXTRA_PATCHES+=	${FILESDIR}/noaddressbook.patch
-.else
-LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-.endif
-
-MAN1=		sms.1 smsaddr.1
-MAN5=		smsrc.5
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
+		pcre.0:${PORTSDIR}/devel/pcre \
+		gdbm.3:${PORTSDIR}/databases/gdbm
+BUILD_DEPENDS=	${LOCALBASE}/include/pcre++.h:${PORTSDIR}/devel/pcre++
 
-post-extract:
-	@${FIND} ${WRKSRC} -name CVS | ${XARGS} -n 1 ${RM} -r
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,/etc/smsrc,${PREFIX}/etc/smsrc,' \
-		${WRKSRC}/sms.h \
-		${WRKSRC}/README.smsrc
-	@${REINPLACE_CMD} -e 's,bash,sh,' \
-		${WRKSRC}/contrib/sms-conf
-
-post-install:
-	     ${STRIP_CMD} ${PREFIX}/bin/sms
+USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/polish/sms2/distinfo b/polish/sms2/distinfo
index fe9dfe7e7103..e7f4b1b3d4b8 100644
--- a/polish/sms2/distinfo
+++ b/polish/sms2/distinfo
@@ -1,2 +1,2 @@
-MD5 (sms-1.9.2m.tar.gz) = ed7f9aae71de570a9dd0d1ac609e9a7a
-SIZE (sms-1.9.2m.tar.gz) = 88240
+MD5 (sms-2.0.0.tar.gz) = 6651efecd15f93e78b08f225e77b3e60
+SIZE (sms-2.0.0.tar.gz) = 47191
diff --git a/polish/sms2/files/noaddressbook.patch b/polish/sms2/files/noaddressbook.patch
deleted file mode 100644
index 7601d2ce449c..000000000000
--- a/polish/sms2/files/noaddressbook.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig	Wed Aug 25 13:03:09 2004
-+++ Makefile	Wed Aug 25 13:03:15 2004
-@@ -35,11 +35,11 @@
- 
- # jesli chcesz wylaczyc obsluge ksiazki adresowej zakomentuj caly
- # ponizszy blok:
--GDBM=-lgdbm
--ADDR_DEF=-DADDR_BOOK
--ADDR_O=cgdbm.o addrbook.o
--SMSADDR=smsaddr
--LNCMD=rm -f $(SMSADDR); ln -s $(TARGET) $(SMSADDR)
-+#GDBM=-lgdbm
-+#ADDR_DEF=-DADDR_BOOK
-+#ADDR_O=cgdbm.o addrbook.o
-+#SMSADDR=smsaddr
-+#LNCMD=rm -f $(SMSADDR); ln -s $(TARGET) $(SMSADDR)
- 
- # nw katalogi nie sa przeszukiwane automatycznie na FreeBSD, NetBSD i OpenBSD.
- # Odkomentuj ponizsze linie jesli kompilujesz program na tych systemach
diff --git a/polish/sms2/files/patch-Makefile b/polish/sms2/files/patch-Makefile
deleted file mode 100644
index cf54529d35e5..000000000000
--- a/polish/sms2/files/patch-Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig	Wed Aug 25 12:52:38 2004
-+++ Makefile	Wed Aug 25 12:53:44 2004
-@@ -22,7 +22,7 @@
- #
- # wszystkie ww opcje nalezy dodawac do zmiennej CFLAGS
- 
--CFLAGS+=-O2
-+#CFLAGS+=-O2
- 
- # dla starszych wersji Solarisa (tam gdzie nie ma snprintf, getdomainname,
- # itd.) odkomentuj ponizsze dwie linie:
-@@ -43,8 +43,8 @@
- 
- # nw katalogi nie sa przeszukiwane automatycznie na FreeBSD, NetBSD i OpenBSD.
- # Odkomentuj ponizsze linie jesli kompilujesz program na tych systemach
--# BSD_INC=-I/usr/local/include -I/usr/pkg/include
--# BSD_LIB=-L/usr/local/lib -L/usr/pkg/lib
-+BSD_INC=-I/usr/local/include -I/usr/pkg/include
-+BSD_LIB=-L/usr/local/lib -L/usr/pkg/lib
- 
- # jesli kompilujemu program w systemie AmigaOS nalezy odkomentowac
- # ponizsze linie:
-@@ -55,7 +55,7 @@
- PREFIX?=/usr/local
- INSTALL_PREFIX=$(PREFIX)
- INSTALL_BIN=$(INSTALL_PREFIX)/bin
--INSTALL_DOC=$(INSTALL_PREFIX)/share/sms
-+INSTALL_DOC=$(INSTALL_PREFIX)/share/doc/pl-sms
- INSTALL_MAN=$(INSTALL_PREFIX)/man
- 
- # ponizej juz nic nie powinno sie zmieniac
diff --git a/polish/sms2/pkg-descr b/polish/sms2/pkg-descr
index 70cd32fbc223..d5f45b46d1e8 100644
--- a/polish/sms2/pkg-descr
+++ b/polish/sms2/pkg-descr
@@ -1,3 +1,4 @@
 A program to send SMS to cellular phones in Poland (Idea, ERA, Plus).
+Development version, completly rewritten.
 
 WWW: http://www.ceti.pl/~miki/komputery/sms.html
diff --git a/polish/sms2/pkg-plist b/polish/sms2/pkg-plist
index 43f79a0a2cf6..31a39e903e4d 100644
--- a/polish/sms2/pkg-plist
+++ b/polish/sms2/pkg-plist
@@ -1,28 +1,8 @@
 bin/sms
 bin/smsaddr
-%%PORTDOCS%%share/doc/pl-sms/contrib/tksms/tksms
-%%PORTDOCS%%share/doc/pl-sms/contrib/tksms/sms_wr
-%%PORTDOCS%%share/doc/pl-sms/contrib/tksms/README
-%%PORTDOCS%%share/doc/pl-sms/contrib/test/test-sms.html
-%%PORTDOCS%%share/doc/pl-sms/contrib/test/test-sms.cgi
-%%PORTDOCS%%share/doc/pl-sms/contrib/sms.spec
-%%PORTDOCS%%share/doc/pl-sms/contrib/sms.html
-%%PORTDOCS%%share/doc/pl-sms/contrib/sms.cgi
-%%PORTDOCS%%share/doc/pl-sms/contrib/sms-get
-%%PORTDOCS%%share/doc/pl-sms/contrib/sms-conf
-%%PORTDOCS%%share/doc/pl-sms/contrib/procmailrc
-%%PORTDOCS%%share/doc/pl-sms/contrib/mimecut
-%%PORTDOCS%%share/doc/pl-sms/contrib/miastoplusa/mpl.sh
-%%PORTDOCS%%share/doc/pl-sms/contrib/miastoplusa/README
-%%PORTDOCS%%share/doc/pl-sms/contrib/gtksms
-%%PORTDOCS%%share/doc/pl-sms/contrib/freebsd
-%%PORTDOCS%%share/doc/pl-sms/contrib/Makefile.amiga
-%%PORTDOCS%%share/doc/pl-sms/README
-%%PORTDOCS%%share/doc/pl-sms/README.first
-%%PORTDOCS%%share/doc/pl-sms/README.smsrc
-%%PORTDOCS%%share/doc/pl-sms/README.supersms
-%%PORTDOCS%%@dirrm share/doc/pl-sms/contrib/tksms
-%%PORTDOCS%%@dirrm share/doc/pl-sms/contrib/test
-%%PORTDOCS%%@dirrm share/doc/pl-sms/contrib/miastoplusa
-%%PORTDOCS%%@dirrm share/doc/pl-sms/contrib
-%%PORTDOCS%%@dirrm share/doc/pl-sms
+%%DATADIR%%/README
+%%DATADIR%%/README.smsrc
+%%DATADIR%%/mimecut
+%%DATADIR%%/procmailrc
+%%DATADIR%%/sms-get
+@dirrm %%DATADIR%%