10 files changed, 106 insertions, 40 deletions

diff --git a/polish/sms/Makefile b/polish/sms/Makefile
index 50dc8dd94177..a6842d3bdb1d 100644
--- a/polish/sms/Makefile
+++ b/polish/sms/Makefile
@@ -6,25 +6,35 @@
 #
 
 PORTNAME=	sms
-PORTVERSION=	1.9.2d
-PORTREVISION=	1
+PORTVERSION=	1.9.2m
 CATEGORIES=	polish
 MASTER_SITES=	http://www.ceti.pl/~miki/komputery/download/sms/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Send SMS to cellular phones in Poland (Idea, ERA, Plus)
 
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
-
 WRKSRC=	${WRKDIR}/sms
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-REINPLACE_ARGS= -i ""
+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
+
+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 \
diff --git a/polish/sms/distinfo b/polish/sms/distinfo
index 892f1f8127e0..fe9dfe7e7103 100644
--- a/polish/sms/distinfo
+++ b/polish/sms/distinfo
@@ -1,2 +1,2 @@
-MD5 (sms-1.9.2d.tar.gz) = 6d1b64ba8ef7a85ec38dafe2e93919f9
-SIZE (sms-1.9.2d.tar.gz) = 91251
+MD5 (sms-1.9.2m.tar.gz) = ed7f9aae71de570a9dd0d1ac609e9a7a
+SIZE (sms-1.9.2m.tar.gz) = 88240
diff --git a/polish/sms/files/noaddressbook.patch b/polish/sms/files/noaddressbook.patch
new file mode 100644
index 000000000000..7601d2ce449c
--- /dev/null
+++ b/polish/sms/files/noaddressbook.patch
@@ -0,0 +1,19 @@
+--- 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/sms/files/patch-Makefile b/polish/sms/files/patch-Makefile
index 7953636a842e..cf54529d35e5 100644
--- a/polish/sms/files/patch-Makefile
+++ b/polish/sms/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Wed Mar 19 11:03:10 2003
-+++ Makefile	Sat Mar 29 19:50:28 2003
+--- 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
@@ -15,21 +15,17 @@
  # 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${LOCALBASE}/include -I/usr/pkg/include
-+BSD_LIB=-L${LOCALBASE}/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:
-@@ -52,10 +52,10 @@
- 
- # katalog pod ktorym program zostanie zainstalowany po make install - binaria
- # ida do $DIR/$BIN, reszta do $DIR/$DOC
--PREFIX?=/usr/local
-+PREFIX?={PREFIX}
+@@ -55,7 +55,7 @@
+ PREFIX?=/usr/local
  INSTALL_PREFIX=$(PREFIX)
  INSTALL_BIN=$(INSTALL_PREFIX)/bin
--INSTALL_DOC=$(INSTALL_PREFIX)/doc/sms
+-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/sms/pkg-plist b/polish/sms/pkg-plist
index 80296f6d82bb..43f79a0a2cf6 100644
--- a/polish/sms/pkg-plist
+++ b/polish/sms/pkg-plist
@@ -3,6 +3,8 @@ 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
@@ -10,11 +12,17 @@ bin/smsaddr
 %%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/
+%%PORTDOCS%%@dirrm share/doc/pl-sms
diff --git a/polish/sms2/Makefile b/polish/sms2/Makefile
index 50dc8dd94177..a6842d3bdb1d 100644
--- a/polish/sms2/Makefile
+++ b/polish/sms2/Makefile
@@ -6,25 +6,35 @@
 #
 
 PORTNAME=	sms
-PORTVERSION=	1.9.2d
-PORTREVISION=	1
+PORTVERSION=	1.9.2m
 CATEGORIES=	polish
 MASTER_SITES=	http://www.ceti.pl/~miki/komputery/download/sms/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Send SMS to cellular phones in Poland (Idea, ERA, Plus)
 
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
-
 WRKSRC=	${WRKDIR}/sms
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-REINPLACE_ARGS= -i ""
+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
+
+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 \
diff --git a/polish/sms2/distinfo b/polish/sms2/distinfo
index 892f1f8127e0..fe9dfe7e7103 100644
--- a/polish/sms2/distinfo
+++ b/polish/sms2/distinfo
@@ -1,2 +1,2 @@
-MD5 (sms-1.9.2d.tar.gz) = 6d1b64ba8ef7a85ec38dafe2e93919f9
-SIZE (sms-1.9.2d.tar.gz) = 91251
+MD5 (sms-1.9.2m.tar.gz) = ed7f9aae71de570a9dd0d1ac609e9a7a
+SIZE (sms-1.9.2m.tar.gz) = 88240
diff --git a/polish/sms2/files/noaddressbook.patch b/polish/sms2/files/noaddressbook.patch
new file mode 100644
index 000000000000..7601d2ce449c
--- /dev/null
+++ b/polish/sms2/files/noaddressbook.patch
@@ -0,0 +1,19 @@
+--- 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
index 7953636a842e..cf54529d35e5 100644
--- a/polish/sms2/files/patch-Makefile
+++ b/polish/sms2/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Wed Mar 19 11:03:10 2003
-+++ Makefile	Sat Mar 29 19:50:28 2003
+--- 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
@@ -15,21 +15,17 @@
  # 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${LOCALBASE}/include -I/usr/pkg/include
-+BSD_LIB=-L${LOCALBASE}/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:
-@@ -52,10 +52,10 @@
- 
- # katalog pod ktorym program zostanie zainstalowany po make install - binaria
- # ida do $DIR/$BIN, reszta do $DIR/$DOC
--PREFIX?=/usr/local
-+PREFIX?={PREFIX}
+@@ -55,7 +55,7 @@
+ PREFIX?=/usr/local
  INSTALL_PREFIX=$(PREFIX)
  INSTALL_BIN=$(INSTALL_PREFIX)/bin
--INSTALL_DOC=$(INSTALL_PREFIX)/doc/sms
+-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-plist b/polish/sms2/pkg-plist
index 80296f6d82bb..43f79a0a2cf6 100644
--- a/polish/sms2/pkg-plist
+++ b/polish/sms2/pkg-plist
@@ -3,6 +3,8 @@ 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
@@ -10,11 +12,17 @@ bin/smsaddr
 %%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/
+%%PORTDOCS%%@dirrm share/doc/pl-sms