Wed Mar 7 17:19:56 2012 UTC ()
Fix build on SunOS.


(hans)
diff -r1.26 -r1.27 pkgsrc/net/upclient/Makefile
diff -r1.13 -r1.14 pkgsrc/net/upclient/distinfo
diff -r1.2 -r1.3 pkgsrc/net/upclient/patches/patch-ae
cvs diff -r1.26 -r1.27 pkgsrc/net/upclient/Makefile (expand / switch to unified diff)

--- pkgsrc/net/upclient/Makefile 2010/02/11 23:08:17 1.26
+++ pkgsrc/net/upclient/Makefile 2012/03/07 17:19:56 1.27
@@ -1,31 +1,33 @@ @@ -1,31 +1,33 @@
1# $NetBSD: Makefile,v 1.26 2010/02/11 23:08:17 joerg Exp $ 1# $NetBSD: Makefile,v 1.27 2012/03/07 17:19:56 hans Exp $
2# 2#
3 3
4DISTNAME= upclient-4.2.1.23 4DISTNAME= upclient-4.2.1.23
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= http://uptimes.atomicvoid.net/files/ 7MASTER_SITES= http://uptimes.atomicvoid.net/files/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://uptimes.hostingwired.com/ 10HOMEPAGE= http://uptimes.hostingwired.com/
11COMMENT= Keeps track of your server uptime, and compares it to other hosts 11COMMENT= Keeps track of your server uptime, and compares it to other hosts
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16 16
17.if ${OPSYS} == "DragonFly" 17.if ${OPSYS} == "DragonFly"
18BUILD_TARGET= dragonfly 18BUILD_TARGET= dragonfly
 19.elif ${OPSYS} == "SunOS"
 20BUILD_TARGET= solaris
19.else 21.else
20BUILD_TARGET= bsd 22BUILD_TARGET= bsd
21.endif 23.endif
22 24
23EGDIR= ${PREFIX}/share/examples/upclient 25EGDIR= ${PREFIX}/share/examples/upclient
24CONF_FILES= ${EGDIR}/upclient.conf ${PKG_SYSCONFDIR}/upclient.conf 26CONF_FILES= ${EGDIR}/upclient.conf ${PKG_SYSCONFDIR}/upclient.conf
25CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" 27CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
26 28
27RCD_SCRIPTS= upclient 29RCD_SCRIPTS= upclient
28 30
29BUILD_DIRS= ${WRKSRC}/src 31BUILD_DIRS= ${WRKSRC}/src
30 32
31INSTALLATION_DIRS= bin share/doc/upclient ${EGDIR} 33INSTALLATION_DIRS= bin share/doc/upclient ${EGDIR}
cvs diff -r1.13 -r1.14 pkgsrc/net/upclient/distinfo (expand / switch to unified diff)

--- pkgsrc/net/upclient/distinfo 2006/09/19 22:25:48 1.13
+++ pkgsrc/net/upclient/distinfo 2012/03/07 17:19:56 1.14
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.13 2006/09/19 22:25:48 joerg Exp $ 1$NetBSD: distinfo,v 1.14 2012/03/07 17:19:56 hans Exp $
2 2
3SHA1 (upclient-4.2.1.23.tar.gz) = c6595959c6a5058b03ab7096a6bf9c0dbfa4285a 3SHA1 (upclient-4.2.1.23.tar.gz) = c6595959c6a5058b03ab7096a6bf9c0dbfa4285a
4RMD160 (upclient-4.2.1.23.tar.gz) = bc5df520a6ab73049ab45bf2d3ed230a80bf561e 4RMD160 (upclient-4.2.1.23.tar.gz) = bc5df520a6ab73049ab45bf2d3ed230a80bf561e
5Size (upclient-4.2.1.23.tar.gz) = 29386 bytes 5Size (upclient-4.2.1.23.tar.gz) = 29386 bytes
6SHA1 (patch-aa) = 2e1dacd293b69e0d2338e1a316d7d1d7015447c2 6SHA1 (patch-aa) = 2e1dacd293b69e0d2338e1a316d7d1d7015447c2
7SHA1 (patch-ab) = dd1e318cee6e27fcf433b2123cf8f3f6ed8eb548 7SHA1 (patch-ab) = dd1e318cee6e27fcf433b2123cf8f3f6ed8eb548
8SHA1 (patch-ac) = 5fa3dad86297d9a6bf5047008813996c0e930e7c 8SHA1 (patch-ac) = 5fa3dad86297d9a6bf5047008813996c0e930e7c
9SHA1 (patch-ad) = 57aac6d38f7f4fcdc1b4545d2f6df0815a9db496 9SHA1 (patch-ad) = 57aac6d38f7f4fcdc1b4545d2f6df0815a9db496
10SHA1 (patch-ae) = c21c66c00e8be45407d462ba0cf0223a5b9a703b 10SHA1 (patch-ae) = f8b73cfa9d736f3b06556224373486144548afc8
cvs diff -r1.2 -r1.3 pkgsrc/net/upclient/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/upclient/patches/patch-ae 2006/01/25 17:00:25 1.2
+++ pkgsrc/net/upclient/patches/patch-ae 2012/03/07 17:19:56 1.3
@@ -1,25 +1,34 @@ @@ -1,25 +1,34 @@
1$NetBSD: patch-ae,v 1.2 2006/01/25 17:00:25 joerg Exp $ 1$NetBSD: patch-ae,v 1.3 2012/03/07 17:19:56 hans Exp $
2 2
3--- src/Makefile.orig 2001-06-16 22:48:35.000000000 +0000 3--- src/Makefile.orig 2001-06-16 22:48:35.000000000 +0000
4+++ src/Makefile 4+++ src/Makefile
5@@ -36,10 +36,17 @@ nothing-specified: 5@@ -36,10 +36,17 @@ nothing-specified:
6 @echo "" 6 @echo ""
7  7
8 bsd: 8 bsd:
9- $(MAKE) CC=gcc \ 9- $(MAKE) CC=gcc \
10- LDFLAGS='-lkvm' \ 10- LDFLAGS='-lkvm' \
11+ $(MAKE) \ 11+ $(MAKE) \
12+ LDFLAGS='$(LDFLAGS) -lkvm' \ 12+ LDFLAGS='$(LDFLAGS) -lkvm' \
13 OBJECTS='stats-bsd.c $(STDOPTS)' \ 13 OBJECTS='stats-bsd.c $(STDOPTS)' \
14- CFLAGS='-DPLATFORM_BSD -DCONFIGFILE=\"$(CONFIGFILE)\"' \ 14- CFLAGS='-DPLATFORM_BSD -DCONFIGFILE=\"$(CONFIGFILE)\"' \
15+ CFLAGS='$(CFLAGS) -DPLATFORM_BSD -DCONFIGFILE=\"$(CONFIGFILE)\"' \ 15+ CFLAGS='$(CFLAGS) -DPLATFORM_BSD -DCONFIGFILE=\"$(CONFIGFILE)\"' \
16+ upclient 16+ upclient
17+ 17+
18+dragonfly: 18+dragonfly:
19+ $(MAKE) \ 19+ $(MAKE) \
20+ LDFLAGS='$(LDFLAGS) -lkinfo' \ 20+ LDFLAGS='$(LDFLAGS) -lkinfo' \
21+ OBJECTS='stats-bsd.c $(STDOPTS)' \ 21+ OBJECTS='stats-bsd.c $(STDOPTS)' \
22+ CFLAGS='$(CFLAGS) -DPLATFORM_BSD -DCONFIGFILE=\"$(CONFIGFILE)\"' \ 22+ CFLAGS='$(CFLAGS) -DPLATFORM_BSD -DCONFIGFILE=\"$(CONFIGFILE)\"' \
23 upclient 23 upclient
24  24
25 darwin: 25 darwin:
 26@@ -82,7 +89,7 @@ solaris:
 27 $(MAKE) CC=gcc \
 28 LDFLAGS='-lsocket -lnsl' \
 29 OBJECTS='stats-sol.c $(STDOPTS)' \
 30- CFLAGS='-DPLATFORM_SOLARIS -DCONFIGFILE=\"$(CONFIGFILE)\"' \
 31+ CFLAGS='$(CFLAGS) -DPLATFORM_SOLARIS -DCONFIGFILE=\"$(CONFIGFILE)\"' \
 32 upclient
 33
 34 linux: