Update polsms to 1.8.9

Changes:
o several new options in config file revelant when sending messages to Plus phones;
  now supports ICQ gateway, too
o yet another change in Era handling code
o improved way to parse email address from both environment variables and config file
o improved hostname detection code

* converted to use buildlink.mk files
* simplified patch-aa

4 files changed, 42 insertions, 23 deletions

diff --git a/net/polsms/Makefile b/net/polsms/Makefile
index 5315740f45b..5be33870de8 100644
--- a/net/polsms/Makefile
+++ b/net/polsms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/04/03 07:05:43 zuntum Exp $
+# $NetBSD: Makefile,v 1.3 2001/07/09 09:11:27 zuntum Exp $
 #
 
-DISTNAME=	sms-1.8.8d
-PKGNAME=	polsms-1.8.8d
+DISTNAME=	sms-1.8.9
+PKGNAME=	pol${DISTNAME}
 CATEGORIES=	net
 MASTER_SITES=	http://www.ceti.pl/~miki/komputery/download/sms/
 
@@ -10,9 +10,8 @@ MAINTAINER=	zuntum@netbsd.org
 HOMEPAGE=	http://www.ceti.pl/~miki/komputery/sms.html
 COMMENT=	useful command-line interface to sending SMS to Polish GSM networks
 
-DEPENDS+=	gdbm-*:../../databases/gdbm
-
-USE_GMAKE=	YES
+USE_BUILDLINK_ONLY=	YES
+USE_GMAKE=		YES
 
 WRKSRC=		${WRKDIR}/sms
 
@@ -30,4 +29,5 @@ do-install:
 	cd ${WRKSRC}/contrib && ${INSTALL_DATA} mimecut procmailrc	\
 		sms.cgi sms.html ${PREFIX}/share/sms/contrib
 
+.include "../../databases/gdbm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/polsms/distinfo b/net/polsms/distinfo
index e390dc927bf..c7cb27c9e63 100644
--- a/net/polsms/distinfo
+++ b/net/polsms/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:29 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/07/09 09:11:27 zuntum Exp $
 
-SHA1 (sms-1.8.8d.tar.gz) = e5f2f5038350edf5c986e869ec1b12e0b86747fc
-Size (sms-1.8.8d.tar.gz) = 45168 bytes
-SHA1 (patch-aa) = c91b2f04caa3becad22eff1278e8fbfed849609b
+SHA1 (sms-1.8.9.tar.gz) = 268938dae24cc8aab96026c35beb09b021c6168f
+Size (sms-1.8.9.tar.gz) = 49522 bytes
+SHA1 (patch-aa) = 5e5a7b872b928c70d3d4dc36f66f6fc0cdd20fe7
+SHA1 (patch-ab) = a0d1d4078de892c0460f17cf59c66974a4308319
diff --git a/net/polsms/patches/patch-aa b/net/polsms/patches/patch-aa
index 2df3efd495e..273a4d043f1 100644
--- a/net/polsms/patches/patch-aa
+++ b/net/polsms/patches/patch-aa
@@ -1,17 +1,19 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/23 22:11:24 zuntum Exp $
+$NetBSD: patch-aa,v 1.2 2001/07/09 09:11:28 zuntum Exp $
 
---- Makefile.orig	Sun Mar  4 18:16:16 2001
+--- Makefile.orig	Sun Jul  1 14:28:08 2001
 +++ Makefile
-@@ -2,8 +2,6 @@
+@@ -2,8 +2,8 @@
  # przez mkmake - (c) Mikolaj Rydzewski, <miki@ceti.pl>
  
  TARGET=sms
 -CC=g++
 -C=gcc
++CC?=g++
++C?=gcc
  
- # jesli masz klopoty z wysylaniem wiadomosci na komorki sieci Plus mozesz
- # wymusic na programie wysylanie mali na bramke text.plusgsm.pl zamiast
-@@ -23,7 +21,7 @@
+ # aby skompilowac program z opcja sledzenia dodaj opcje -DDEBUG
+ #
+@@ -17,7 +17,7 @@
  #
  # wszystkie ww opcje nalezy dodawac do zmiennej CFLAGS
  
@@ -20,14 +22,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/23 22:11:24 zuntum Exp $
  
  # dla starszych wersji Solarisa (tam gdzie nie ma snprintf, getdomainname,
  # itd.) odkomentuj ponizsze dwie linie:
-@@ -44,12 +42,12 @@
- 
- # nw katalogi nie sa przeszukiwane automatycznie na FreeBSD oraz NetBSD.
+@@ -40,10 +40,11 @@
  # 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
-+BSD_LIB=-L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib
+ # BSD_INC=-I/usr/local/include -I/usr/pkg/include
+ # BSD_LIB=-L/usr/local/lib -L/usr/pkg/lib
++BSD_LIB=-L$(BUILDLINK_DIR)/lib -Wl,-R$(LOCALBASE)/lib
  
  # katalog pod ktorym program zostanie zainstalowany po make install - binaria
  # ida do $DIR/$BIN, reszta do $DIR/$DOC
diff --git a/net/polsms/patches/patch-ab b/net/polsms/patches/patch-ab
new file mode 100644
index 00000000000..b7924ea6bba
--- /dev/null
+++ b/net/polsms/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1 2001/07/09 09:11:28 zuntum Exp $
+
+--- main.cc.orig	Fri Jun 29 15:37:35 2001
++++ main.cc
+@@ -135,10 +135,14 @@
+ 			tick = 1;
+ 		}
+ 
++#ifdef PLUS_MAIL
++			konfig.plus_mail = 1;
++#else
+ 		if (!strcmp(argv[start_arg], "--plusmail")) {
+ 			tick = 1;
+ 			konfig.plus_mail = 1;
+ 		}
++#endif
+ 
+ 		if (!tick) break;
+ 		start_arg++;