update to open2300 1.10

4 files changed, 51 insertions, 38 deletions

diff --git a/misc/open2300/Makefile b/misc/open2300/Makefile
index da3fb1331f3..82a59be2fc4 100644
--- a/misc/open2300/Makefile
+++ b/misc/open2300/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2010/02/04 17:37:51 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/05 15:26:15 martin Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 COMMENT=		WS 23xx weather station support software
+LICENSE=		gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 INSTALLATION_DIRS+=	bin
 
diff --git a/misc/open2300/Makefile.common b/misc/open2300/Makefile.common
index 1d6f1c778f6..ccd506617af 100644
--- a/misc/open2300/Makefile.common
+++ b/misc/open2300/Makefile.common
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.common,v 1.6 2010/02/04 17:37:51 joerg Exp $
+# $NetBSD: Makefile.common,v 1.7 2010/02/05 15:26:15 martin Exp $
 #
+# used by misc/open2300-mysql/Makefile
 
-DISTNAME=		open2300-1.8
+DISTNAME=		open2300-1.10
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=open2300/}
 
 MAINTAINER=		martin@NetBSD.org
-HOMEPAGE=		http://open2300.sourceforge.net/
+HOMEPAGE=		http://www.lavrsen.dk/twiki/bin/view/Open2300/WebHome
 
 PATCHDIR=		${.CURDIR}/../open2300/patches
 DISTINFO_FILE=		${.CURDIR}/../open2300/distinfo
diff --git a/misc/open2300/distinfo b/misc/open2300/distinfo
index b0763b14d16..f0b92b03dc0 100644
--- a/misc/open2300/distinfo
+++ b/misc/open2300/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2010/02/04 17:37:51 joerg Exp $
+$NetBSD: distinfo,v 1.9 2010/02/05 15:26:15 martin Exp $
 
-SHA1 (open2300-1.8.tar.gz) = 86fd2dcdef995498ed17062dd4b8df5db6b3383d
-RMD160 (open2300-1.8.tar.gz) = d0b7618cfa7d0ea92708d949fd4521311627865f
-Size (open2300-1.8.tar.gz) = 330320 bytes
-SHA1 (patch-aa) = b008ae36711b3f0543555d6cc00afa3a03c04d67
+SHA1 (open2300-1.10.tar.gz) = 428d30bd885b5c0acee257bcd04cb47eee14bc3e
+RMD160 (open2300-1.10.tar.gz) = 0773bfdf3d0c18b9113f16556651c559cc61b25f
+Size (open2300-1.10.tar.gz) = 337926 bytes
+SHA1 (patch-aa) = 860a31abbfbe8deb6daaf1e6bdfbe2fb49794f49
 SHA1 (patch-ab) = 9437137a36e434fcabde6acc5373be04523357e9
 SHA1 (patch-ac) = 48762f4c60ca475031659cad94701a1bc83b6795
diff --git a/misc/open2300/patches/patch-aa b/misc/open2300/patches/patch-aa
index 3f82a3687df..28f16649c43 100644
--- a/misc/open2300/patches/patch-aa
+++ b/misc/open2300/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2010/02/04 17:37:51 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2010/02/05 15:26:15 martin Exp $
 
---- Makefile.orig	2004-11-13 11:25:31.000000000 +1100
-+++ Makefile
+--- Makefile.orig	2005-03-15 08:14:48.000000000 +0100
++++ Makefile	2010-02-04 18:52:12.000000000 +0100
 @@ -14,11 +14,11 @@
  
  prefix = /usr/local
@@ -16,27 +16,27 @@ $NetBSD: patch-aa,v 1.5 2010/02/04 17:37:51 joerg Exp $
  OBJ = open2300.o rw2300.o linux2300.o win2300.o
  LOGOBJ = log2300.o rw2300.o linux2300.o win2300.o
  FETCHOBJ = fetch2300.o rw2300.o linux2300.o win2300.o
-@@ -37,8 +37,8 @@ MINMAXOBJ = minmax2300.o rw2300.o linux2
+@@ -36,8 +36,8 @@
  
- VERSION = 1.8
+ VERSION = 1.10
  
 -CFLAGS = -Wall -O3 -DVERSION=\"$(VERSION)\"
 -CC_LDFLAGS = -lm
-+CFLAGS += -DVERSION=\"$(VERSION)\" ${CPPFLAGS}
++CFLAGS = -DVERSION=\"$(VERSION)\" ${CPPFLAGS}
 +CC_LDFLAGS = ${LDFLAGS} ${LIBS} -lm
  CC_WINFLAG = 
  # For Windows - comment the two line above and un-comment the two lines below.
- # CC_LDFLAGS = -lwsock32 -fno-exceptions -s
-@@ -80,7 +80,7 @@ xml2300 : $(XMLOBJ)
+ #CC_LDFLAGS = -lm -lwsock32
+@@ -79,7 +79,7 @@
  	$(CC) $(CFLAGS) -o $@ $(XMLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG)
  
- mysql2300: $(MYSQLOBJ)
--	$(CC) $(CFLAGS) -o $@ $(MYSQLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient
-+	$(CC) $(CFLAGS) -o $@ $(MYSQLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG)
- 	
- light2300: $(LIGHTOBJ)
- 	$(CC) $(CFLAGS) -o $@ $(LIGHTOBJ) $(CC_LDFLAGS)
-@@ -92,19 +92,23 @@ minmax2300: $(MINMAXOBJ)
+ mysql2300:
+-	$(CC) $(CFLAGS) -o mysql2300 mysql2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient
++	$(CC) $(CFLAGS) -o mysql2300 mysql2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG)
+ 
+ pgsql2300: $(PGSQLOBJ)
+ 	$(CC) $(CFLAGS) -o $@ $(PGSQLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/pgsql -L/usr/lib/pgsql -lpq
+@@ -94,19 +94,25 @@
  	$(CC) $(CFLAGS) -o $@ $(MINMAXOBJ) $(CC_LDFLAGS) $(CC_WINFLAG)
  
  install:
@@ -53,23 +53,32 @@ $NetBSD: patch-aa,v 1.5 2010/02/04 17:37:51 joerg Exp $
 -	$(INSTALL) interval2300 $(bindir)
 -	$(INSTALL) minmax2300 $(bindir)
 -	
-+	${BSD_INSTALL_PROGRAM} open2300 ${DESTDIR}$(bindir)
-+	${BSD_INSTALL_PROGRAM} dump2300 ${DESTDIR}$(bindir)
-+	${BSD_INSTALL_PROGRAM} log2300 ${DESTDIR}$(bindir)
-+	${BSD_INSTALL_PROGRAM} fetch2300 ${DESTDIR}$(bindir)
-+	${BSD_INSTALL_PROGRAM} wu2300 ${DESTDIR}$(bindir)
-+	${BSD_INSTALL_PROGRAM} cw2300 ${DESTDIR}$(bindir)
-+	${BSD_INSTALL_PROGRAM} histlog2300 ${DESTDIR}$(bindir)
-+	${BSD_INSTALL_PROGRAM} xml2300 ${DESTDIR}$(bindir)
-+	${BSD_INSTALL_PROGRAM} light2300 ${DESTDIR}$(bindir)
-+	${BSD_INSTALL_PROGRAM} interval2300 ${DESTDIR}$(bindir)
-+	${BSD_INSTALL_PROGRAM} minmax2300 ${DESTDIR}$(bindir)
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/open2300
-+	${BSD_INSTALL_DATA} open2300-dist.conf ${DESTDIR}${PREFIX}/share/examples/open2300/open2300.conf
++	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir)
++	${BSD_INSTALL_PROGRAM} open2300 $(DESTDIR)$(bindir)
++	${BSD_INSTALL_PROGRAM} dump2300 $(DESTDIR)$(bindir)
++	${BSD_INSTALL_PROGRAM} log2300 $(DESTDIR)$(bindir)
++	${BSD_INSTALL_PROGRAM} fetch2300 $(DESTDIR)$(bindir)
++	${BSD_INSTALL_PROGRAM} wu2300 $(DESTDIR)$(bindir)
++	${BSD_INSTALL_PROGRAM} cw2300 $(DESTDIR)$(bindir)
++	${BSD_INSTALL_PROGRAM} histlog2300 $(DESTDIR)$(bindir)
++	${BSD_INSTALL_PROGRAM} xml2300 $(DESTDIR)$(bindir)
++	${BSD_INSTALL_PROGRAM} light2300 $(DESTDIR)$(bindir)
++	${BSD_INSTALL_PROGRAM} interval2300 $(DESTDIR)$(bindir)
++	${BSD_INSTALL_PROGRAM} minmax2300 $(DESTDIR)$(bindir)
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/examples/open2300
++	${BSD_INSTALL_DATA} open2300-dist.conf $(DESTDIR)${PREFIX}/share/examples/open2300/open2300.conf
 +
 +install-mysql:
-+	${BSD_INSTALL_PROGRAM} mysql2300 ${DESTDIR}$(bindir)
++	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir)
++	${BSD_INSTALL_PROGRAM} mysql2300 $(DESTDIR)$(bindir)
 +
  uninstall:
  	rm -f $(bindir)/open2300 $(bindir)/dump2300 $(bindir)/log2300 $(bindir)/fetch2300 $(bindir)/wu2300 $(bindir)/cw2300 $(bindir)/xml2300 $(bindir)/light2300 $(bindir)/interval2300 $(bindir)/minmax2300
  
+@@ -114,4 +118,4 @@
+ 	rm -f *~ *.o open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 mysql2300 pgsql2300 light2300 interval2300 minmax2300
+ 
+ cleanexe:
+-	rm -f *~ *.o open2300.exe dump2300.exe log2300.exe fetch2300.exe wu2300.exe cw2300.exe history2300.exe histlog2300.exe bin2300.exe xml2300.exe mysql2300.exe pgsql2300.exe light2300.exe interval2300.exe minmax2300.exe
+\ No newline at end of file
++	rm -f *~ *.o open2300.exe dump2300.exe log2300.exe fetch2300.exe wu2300.exe cw2300.exe history2300.exe histlog2300.exe bin2300.exe xml2300.exe mysql2300.exe pgsql2300.exe light2300.exe interval2300.exe minmax2300.exe