Fri Mar 9 12:49:25 2012 UTC ()
Honor LIBS from pkgsrc. Set license.


(fhajny)
diff -r1.22 -r1.23 pkgsrc/devel/cvsps/Makefile
diff -r1.10 -r1.11 pkgsrc/devel/cvsps/distinfo
diff -r1.6 -r1.7 pkgsrc/devel/cvsps/patches/patch-aa
cvs diff -r1.22 -r1.23 pkgsrc/devel/cvsps/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cvsps/Makefile 2009/08/30 17:16:53 1.22
+++ pkgsrc/devel/cvsps/Makefile 2012/03/09 12:49:25 1.23
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.22 2009/08/30 17:16:53 schmonz Exp $ 1# $NetBSD: Makefile,v 1.23 2012/03/09 12:49:25 fhajny Exp $
2# 2#
3 3
4DISTNAME= cvsps-2.1 4DISTNAME= cvsps-2.1
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= devel scm 6CATEGORIES= devel scm
7MASTER_SITES= ${HOMEPAGE} 7MASTER_SITES= ${HOMEPAGE}
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= http://www.cobite.com/cvsps/ 10HOMEPAGE= http://www.cobite.com/cvsps/
11COMMENT= Generates 'patchset' information from a CVS repository 11COMMENT= Generates 'patchset' information from a CVS repository
 12LICENSE= gnu-gpl-v2
12 13
13PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16USE_TOOLS+= gmake 17USE_TOOLS+= gmake
17 18
18INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 19INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
19 20
20LIBS.SunOS+= -lnsl -lsocket 21LIBS.SunOS+= -lnsl -lsocket
21MAKE_ENV+= LIBS=${LIBS:M*:Q} 22MAKE_ENV+= LIBS=${LIBS:M*:Q}
22MAKE_ENV+= prefix=${DESTDIR}${PREFIX} 23MAKE_ENV+= prefix=${DESTDIR}${PREFIX}
23 24
24.include "../../devel/zlib/buildlink3.mk" 25.include "../../devel/zlib/buildlink3.mk"
cvs diff -r1.10 -r1.11 pkgsrc/devel/cvsps/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cvsps/distinfo 2011/11/29 06:12:51 1.10
+++ pkgsrc/devel/cvsps/distinfo 2012/03/09 12:49:25 1.11
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.10 2011/11/29 06:12:51 sbd Exp $ 1$NetBSD: distinfo,v 1.11 2012/03/09 12:49:25 fhajny Exp $
2 2
3SHA1 (cvsps-2.1.tar.gz) = a53a62b121e7b86e07a393bcb8aa4f0492a747c4 3SHA1 (cvsps-2.1.tar.gz) = a53a62b121e7b86e07a393bcb8aa4f0492a747c4
4RMD160 (cvsps-2.1.tar.gz) = a3063f638fbf1136761549658432d5842e4a766f 4RMD160 (cvsps-2.1.tar.gz) = a3063f638fbf1136761549658432d5842e4a766f
5Size (cvsps-2.1.tar.gz) = 61634 bytes 5Size (cvsps-2.1.tar.gz) = 61634 bytes
6SHA1 (patch-aa) = 47ca9934a3dc84bbe140e5172db342a213f45270 6SHA1 (patch-aa) = fae6fe786c59ba7ea5ef5c8d14838558fd1a014f
7SHA1 (patch-ab) = c9357a01388a9631ba960661183981bb31cbf53b 7SHA1 (patch-ab) = c9357a01388a9631ba960661183981bb31cbf53b
8SHA1 (patch-ac) = 07f6d1955c0fde42784f8891b1136f12fa5dbfa4 8SHA1 (patch-ac) = 07f6d1955c0fde42784f8891b1136f12fa5dbfa4
9SHA1 (patch-ad) = 20d84dc236a5c259677fdf68268de5bb64e6d26f 9SHA1 (patch-ad) = 20d84dc236a5c259677fdf68268de5bb64e6d26f
10SHA1 (patch-ae) = 345036b4021f90a2f6629a5d32e85caa786d961f 10SHA1 (patch-ae) = 345036b4021f90a2f6629a5d32e85caa786d961f
11SHA1 (patch-af) = d32eb67ede1d81ee3abe55a7f94515fcf3ea93cf 11SHA1 (patch-af) = d32eb67ede1d81ee3abe55a7f94515fcf3ea93cf
cvs diff -r1.6 -r1.7 pkgsrc/devel/cvsps/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/cvsps/patches/patch-aa 2011/11/29 06:12:51 1.6
+++ pkgsrc/devel/cvsps/patches/patch-aa 2012/03/09 12:49:25 1.7
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-aa,v 1.6 2011/11/29 06:12:51 sbd Exp $ 1$NetBSD: patch-aa,v 1.7 2012/03/09 12:49:25 fhajny Exp $
2 2
3--- Makefile.orig 2005-05-26 03:39:40.000000000 +0000 3--- Makefile.orig 2005-05-26 03:39:40.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -3,7 +3,7 @@ MINOR=1 5@@ -3,7 +3,7 @@ MINOR=1
6 CC?=gcc 6 CC?=gcc
7 CFLAGS?=-g -O2 -Wall  7 CFLAGS?=-g -O2 -Wall
8 CFLAGS+=-I. -DVERSION=\"$(MAJOR).$(MINOR)\" 8 CFLAGS+=-I. -DVERSION=\"$(MAJOR).$(MINOR)\"
9-prefix?=/usr/local 9-prefix?=/usr/local
10+prefix?=${PREFIX} 10+prefix?=${PREFIX}
11 OBJS=\ 11 OBJS=\
12 cbtcommon/debug.o\ 12 cbtcommon/debug.o\
13 cbtcommon/hash.o\ 13 cbtcommon/hash.o\
14@@ -21,13 +21,13 @@ OBJS=\ 14@@ -21,13 +21,13 @@ OBJS=\
15 all: cvsps 15 all: cvsps
16  16
17 cvsps: $(OBJS) 17 cvsps: $(OBJS)
18- $(CC) -o cvsps $(OBJS) -lz 18- $(CC) -o cvsps $(OBJS) -lz
19+ $(CC) $(LDFLAGS) -o cvsps $(OBJS) -lz 19+ $(CC) $(LDFLAGS) -o cvsps $(OBJS) -lz $(LIBS)
20  20
21 install: 21 install:
22 [ -d $(prefix)/bin ] || mkdir -p $(prefix)/bin 22 [ -d $(prefix)/bin ] || mkdir -p $(prefix)/bin
23- [ -d $(prefix)/share/man/man1 ] || mkdir -p $(prefix)/share/man/man1 23- [ -d $(prefix)/share/man/man1 ] || mkdir -p $(prefix)/share/man/man1
24+ [ -d $(prefix)/man/man1 ] || mkdir -p $(prefix)/man/man1 24+ [ -d $(prefix)/man/man1 ] || mkdir -p $(prefix)/man/man1
25 install cvsps $(prefix)/bin 25 install cvsps $(prefix)/bin
26- install -m 644 cvsps.1 $(prefix)/share/man/man1 26- install -m 644 cvsps.1 $(prefix)/share/man/man1
27+ install -m 644 cvsps.1 $(prefix)/$(PKGMANDIR)/man1 27+ install -m 644 cvsps.1 $(prefix)/$(PKGMANDIR)/man1
28  28
29 clean: 29 clean:
30 rm -f cvsps *.o cbtcommon/*.o core 30 rm -f cvsps *.o cbtcommon/*.o core