Thu Feb 4 17:37:51 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.1.1.1 -r1.2 pkgsrc/misc/open2300/Makefile
diff -r1.5 -r1.6 pkgsrc/misc/open2300/Makefile.common
diff -r1.7 -r1.8 pkgsrc/misc/open2300/distinfo
diff -r1.8 -r1.9 pkgsrc/misc/open2300-mysql/Makefile
diff -r1.4 -r1.5 pkgsrc/misc/open2300/patches/patch-aa
cvs diff -r1.1.1.1 -r1.2 pkgsrc/misc/open2300/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/open2300/Makefile 2004/11/10 08:19:46 1.1.1.1
+++ pkgsrc/misc/open2300/Makefile 2010/02/04 17:37:51 1.2
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
1# $NetBSD: Makefile,v 1.1.1.1 2004/11/10 08:19:46 martin Exp $ 1# $NetBSD: Makefile,v 1.2 2010/02/04 17:37:51 joerg Exp $
2# 2#
3 3
 4PKG_DESTDIR_SUPPORT= user-destdir
 5
4COMMENT= WS 23xx weather station support software 6COMMENT= WS 23xx weather station support software
5 7
 8INSTALLATION_DIRS+= bin
 9
6.include "Makefile.common" 10.include "Makefile.common"
cvs diff -r1.5 -r1.6 pkgsrc/misc/open2300/Makefile.common (expand / switch to unified diff)

--- pkgsrc/misc/open2300/Makefile.common 2005/07/31 13:35:37 1.5
+++ pkgsrc/misc/open2300/Makefile.common 2010/02/04 17:37:51 1.6
@@ -1,11 +1,14 @@ @@ -1,11 +1,14 @@
1# $NetBSD: Makefile.common,v 1.5 2005/07/31 13:35:37 grant Exp $ 1# $NetBSD: Makefile.common,v 1.6 2010/02/04 17:37:51 joerg Exp $
2# 2#
3 3
4DISTNAME= open2300-1.8 4DISTNAME= open2300-1.8
5CATEGORIES= misc 5CATEGORIES= misc
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=open2300/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=open2300/}
7 7
8MAINTAINER= martin@NetBSD.org 8MAINTAINER= martin@NetBSD.org
9HOMEPAGE= http://open2300.sourceforge.net/ 9HOMEPAGE= http://open2300.sourceforge.net/
10 10
 11PATCHDIR= ${.CURDIR}/../open2300/patches
 12DISTINFO_FILE= ${.CURDIR}/../open2300/distinfo
 13
11.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/misc/open2300/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/open2300/distinfo 2005/07/31 14:03:28 1.7
+++ pkgsrc/misc/open2300/distinfo 2010/02/04 17:37:51 1.8
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.7 2005/07/31 14:03:28 grant Exp $ 1$NetBSD: distinfo,v 1.8 2010/02/04 17:37:51 joerg Exp $
2 2
3SHA1 (open2300-1.8.tar.gz) = 86fd2dcdef995498ed17062dd4b8df5db6b3383d 3SHA1 (open2300-1.8.tar.gz) = 86fd2dcdef995498ed17062dd4b8df5db6b3383d
4RMD160 (open2300-1.8.tar.gz) = d0b7618cfa7d0ea92708d949fd4521311627865f 4RMD160 (open2300-1.8.tar.gz) = d0b7618cfa7d0ea92708d949fd4521311627865f
5Size (open2300-1.8.tar.gz) = 330320 bytes 5Size (open2300-1.8.tar.gz) = 330320 bytes
6SHA1 (patch-aa) = 9bdd5011c60b2af676d9f86b96e18d67cad6bf0d 6SHA1 (patch-aa) = b008ae36711b3f0543555d6cc00afa3a03c04d67
7SHA1 (patch-ab) = 9437137a36e434fcabde6acc5373be04523357e9 7SHA1 (patch-ab) = 9437137a36e434fcabde6acc5373be04523357e9
8SHA1 (patch-ac) = 48762f4c60ca475031659cad94701a1bc83b6795 8SHA1 (patch-ac) = 48762f4c60ca475031659cad94701a1bc83b6795
cvs diff -r1.8 -r1.9 pkgsrc/misc/open2300-mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/open2300-mysql/Makefile 2006/02/05 23:10:13 1.8
+++ pkgsrc/misc/open2300-mysql/Makefile 2010/02/04 17:37:51 1.9
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.8 2006/02/05 23:10:13 joerg Exp $ 1# $NetBSD: Makefile,v 1.9 2010/02/04 17:37:51 joerg Exp $
2# 2#
3 3
4PKGNAME= ${DISTNAME:S/-/-mysql-/} 4PKGNAME= ${DISTNAME:S/-/-mysql-/}
5PKGREVISION= 2 5PKGREVISION= 2
6COMMENT= WS 23xx weather station MySQL support 6COMMENT= WS 23xx weather station MySQL support
7 7
8PATCHDIR= ${.CURDIR}/../open2300/patches 8PKG_DESTDIR_SUPPORT= user-destdir
9DISTINFO_FILE= ${.CURDIR}/../open2300/distinfo 
10 9
11BUILD_TARGET= mysql2300 10BUILD_TARGET= mysql2300
12INSTALL_TARGET= install-mysql 11INSTALL_TARGET= install-mysql
13 12
14LIBS+= -lmysqlclient 13LIBS+= -lmysqlclient
15LIBS.SunOS+= -lnsl -lsocket 14LIBS.SunOS+= -lnsl -lsocket
16MAKE_ENV+= LIBS=${LIBS:M*:Q} 15MAKE_ENV+= LIBS=${LIBS:M*:Q}
17 16
 17INSTALLATION_DIRS+= bin
 18
18.include "../../mk/mysql.buildlink3.mk" 19.include "../../mk/mysql.buildlink3.mk"
19.include "../../misc/open2300/Makefile.common" 20.include "../../misc/open2300/Makefile.common"
cvs diff -r1.4 -r1.5 pkgsrc/misc/open2300/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/misc/open2300/patches/patch-aa 2005/07/31 14:03:28 1.4
+++ pkgsrc/misc/open2300/patches/patch-aa 2010/02/04 17:37:51 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.4 2005/07/31 14:03:28 grant Exp $ 1$NetBSD: patch-aa,v 1.5 2010/02/04 17:37:51 joerg Exp $
2 2
3--- Makefile.orig 2004-11-13 11:25:31.000000000 +1100 3--- Makefile.orig 2004-11-13 11:25:31.000000000 +1100
4+++ Makefile 4+++ Makefile
5@@ -14,11 +14,11 @@ 5@@ -14,11 +14,11 @@
6  6
7 prefix = /usr/local 7 prefix = /usr/local
8 exec_prefix = ${prefix} 8 exec_prefix = ${prefix}
9-bindir = ${exec_prefix}/bin 9-bindir = ${exec_prefix}/bin
10+bindir = ${PREFIX}/bin 10+bindir = ${PREFIX}/bin
11  11
12 ######################################### 12 #########################################
13  13
14-CC = gcc 14-CC = gcc
@@ -43,33 +43,33 @@ $NetBSD: patch-aa,v 1.4 2005/07/31 14:03 @@ -43,33 +43,33 @@ $NetBSD: patch-aa,v 1.4 2005/07/31 14:03
43- mkdir -p $(bindir) 43- mkdir -p $(bindir)
44- $(INSTALL) open2300 $(bindir) 44- $(INSTALL) open2300 $(bindir)
45- $(INSTALL) dump2300 $(bindir) 45- $(INSTALL) dump2300 $(bindir)
46- $(INSTALL) log2300 $(bindir) 46- $(INSTALL) log2300 $(bindir)
47- $(INSTALL) fetch2300 $(bindir) 47- $(INSTALL) fetch2300 $(bindir)
48- $(INSTALL) wu2300 $(bindir) 48- $(INSTALL) wu2300 $(bindir)
49- $(INSTALL) cw2300 $(bindir) 49- $(INSTALL) cw2300 $(bindir)
50- $(INSTALL) histlog2300 $(bindir) 50- $(INSTALL) histlog2300 $(bindir)
51- $(INSTALL) xml2300 $(bindir) 51- $(INSTALL) xml2300 $(bindir)
52- $(INSTALL) light2300 $(bindir) 52- $(INSTALL) light2300 $(bindir)
53- $(INSTALL) interval2300 $(bindir) 53- $(INSTALL) interval2300 $(bindir)
54- $(INSTALL) minmax2300 $(bindir) 54- $(INSTALL) minmax2300 $(bindir)
55-  55-
56+ ${BSD_INSTALL_PROGRAM} open2300 $(bindir) 56+ ${BSD_INSTALL_PROGRAM} open2300 ${DESTDIR}$(bindir)
57+ ${BSD_INSTALL_PROGRAM} dump2300 $(bindir) 57+ ${BSD_INSTALL_PROGRAM} dump2300 ${DESTDIR}$(bindir)
58+ ${BSD_INSTALL_PROGRAM} log2300 $(bindir) 58+ ${BSD_INSTALL_PROGRAM} log2300 ${DESTDIR}$(bindir)
59+ ${BSD_INSTALL_PROGRAM} fetch2300 $(bindir) 59+ ${BSD_INSTALL_PROGRAM} fetch2300 ${DESTDIR}$(bindir)
60+ ${BSD_INSTALL_PROGRAM} wu2300 $(bindir) 60+ ${BSD_INSTALL_PROGRAM} wu2300 ${DESTDIR}$(bindir)
61+ ${BSD_INSTALL_PROGRAM} cw2300 $(bindir) 61+ ${BSD_INSTALL_PROGRAM} cw2300 ${DESTDIR}$(bindir)
62+ ${BSD_INSTALL_PROGRAM} histlog2300 $(bindir) 62+ ${BSD_INSTALL_PROGRAM} histlog2300 ${DESTDIR}$(bindir)
63+ ${BSD_INSTALL_PROGRAM} xml2300 $(bindir) 63+ ${BSD_INSTALL_PROGRAM} xml2300 ${DESTDIR}$(bindir)
64+ ${BSD_INSTALL_PROGRAM} light2300 $(bindir) 64+ ${BSD_INSTALL_PROGRAM} light2300 ${DESTDIR}$(bindir)
65+ ${BSD_INSTALL_PROGRAM} interval2300 $(bindir) 65+ ${BSD_INSTALL_PROGRAM} interval2300 ${DESTDIR}$(bindir)
66+ ${BSD_INSTALL_PROGRAM} minmax2300 $(bindir) 66+ ${BSD_INSTALL_PROGRAM} minmax2300 ${DESTDIR}$(bindir)
67+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/open2300 67+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/open2300
68+ ${BSD_INSTALL_DATA} open2300-dist.conf ${PREFIX}/share/examples/open2300/open2300.conf 68+ ${BSD_INSTALL_DATA} open2300-dist.conf ${DESTDIR}${PREFIX}/share/examples/open2300/open2300.conf
69+ 69+
70+install-mysql: 70+install-mysql:
71+ ${BSD_INSTALL_PROGRAM} mysql2300 $(bindir) 71+ ${BSD_INSTALL_PROGRAM} mysql2300 ${DESTDIR}$(bindir)
72+ 72+
73 uninstall: 73 uninstall:
74 rm -f $(bindir)/open2300 $(bindir)/dump2300 $(bindir)/log2300 $(bindir)/fetch2300 $(bindir)/wu2300 $(bindir)/cw2300 $(bindir)/xml2300 $(bindir)/light2300 $(bindir)/interval2300 $(bindir)/minmax2300 74 rm -f $(bindir)/open2300 $(bindir)/dump2300 $(bindir)/log2300 $(bindir)/fetch2300 $(bindir)/wu2300 $(bindir)/cw2300 $(bindir)/xml2300 $(bindir)/light2300 $(bindir)/interval2300 $(bindir)/minmax2300
75  75