pkg/47363: Please update devel/cvsps to 3.2

[ryoon%NetBSD.org@localhost]

>Number:         47363
>Category:       pkg
>Synopsis:       Please update devel/cvsps to 3.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Dec 25 10:50:00 +0000 2012
>Originator:     Ryo ONODERA
>Release:        NetBSD 6.99.16
>Organization:
        
>Environment:
        
        
System: NetBSD tellurium.elements.tetera.org 6.99.16 NetBSD 6.99.16 (NODKWEDGE) 
#93: Sun Dec 23 16:26:53 JST 2012 
root%tellurium.elements.tetera.org@localhost:/usr/obj/sys/arch/amd64/compile/NODKWEDGE
 amd64
Architecture: x86_64
Machine: amd64
>Description:
Please update devel/cvsps to forked version 3.2.
It seems that this version includes almost all patches of pkgsrc.
        
>How-To-Repeat:
        
>Fix:
        
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cvsps/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile    31 Oct 2012 11:16:50 -0000      1.25
+++ Makefile    25 Dec 2012 10:43:52 -0000
@@ -1,13 +1,12 @@
 # $NetBSD: Makefile,v 1.25 2012/10/31 11:16:50 asau Exp $
 #
 
-DISTNAME=      cvsps-2.1
-PKGREVISION=   3
+DISTNAME=      cvsps-3.2
 CATEGORIES=    devel scm
 MASTER_SITES=  ${HOMEPAGE}
 
 MAINTAINER=    schmonz%NetBSD.org@localhost
-HOMEPAGE=      http://www.cobite.com/cvsps/
+HOMEPAGE=      http://www.catb.org/~esr/cvsps/
 COMMENT=       Generates 'patchset' information from a CVS repository
 LICENSE=       gnu-gpl-v2
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cvsps/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo    29 Jun 2012 14:59:24 -0000      1.12
+++ distinfo    25 Dec 2012 10:43:52 -0000
@@ -1,12 +1,6 @@
 $NetBSD: distinfo,v 1.12 2012/06/29 14:59:24 christos Exp $
 
-SHA1 (cvsps-2.1.tar.gz) = a53a62b121e7b86e07a393bcb8aa4f0492a747c4
-RMD160 (cvsps-2.1.tar.gz) = a3063f638fbf1136761549658432d5842e4a766f
-Size (cvsps-2.1.tar.gz) = 61634 bytes
-SHA1 (patch-aa) = fae6fe786c59ba7ea5ef5c8d14838558fd1a014f
-SHA1 (patch-ab) = c9357a01388a9631ba960661183981bb31cbf53b
-SHA1 (patch-ac) = 07f6d1955c0fde42784f8891b1136f12fa5dbfa4
-SHA1 (patch-ad) = 20d84dc236a5c259677fdf68268de5bb64e6d26f
-SHA1 (patch-ae) = 345036b4021f90a2f6629a5d32e85caa786d961f
-SHA1 (patch-af) = d32eb67ede1d81ee3abe55a7f94515fcf3ea93cf
-SHA1 (patch-ag) = 38ea212acde5e07aee33413c79f893e311ebb85e
+SHA1 (cvsps-3.2.tar.gz) = fd4a3d3a0dc630381456d4fcc06fe72c6ca60689
+RMD160 (cvsps-3.2.tar.gz) = af75060a260e74919802b651c76ccb33fa07e240
+Size (cvsps-3.2.tar.gz) = 60627 bytes
+SHA1 (patch-aa) = 5e8880dc0bc7f6b7f80262746fd2a971c954cc3d
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cvsps/patches/patch-aa,v
retrieving revision 1.7
diff -u -r1.7 patch-aa
--- patches/patch-aa    9 Mar 2012 12:49:25 -0000       1.7
+++ patches/patch-aa    25 Dec 2012 10:43:52 -0000
@@ -1,30 +1,36 @@
 $NetBSD: patch-aa,v 1.7 2012/03/09 12:49:25 fhajny Exp $
 
---- Makefile.orig      2005-05-26 03:39:40.000000000 +0000
+* Pass pkgsrc environment variables
+
+--- Makefile.orig      2012-12-24 20:12:10.000000000 +0000
 +++ Makefile
-@@ -3,7 +3,7 @@ MINOR=1
+@@ -3,7 +3,7 @@ VERSION=3.2
  CC?=gcc
  CFLAGS?=-g -O2 -Wall 
- CFLAGS+=-I. -DVERSION=\"$(MAJOR).$(MINOR)\"
+ CPPFLAGS+=-I. -DVERSION=\"$(VERSION)\"
 -prefix?=/usr/local
 +prefix?=${PREFIX}
  OBJS=\
        cbtcommon/debug.o\
        cbtcommon/hash.o\
-@@ -21,13 +21,13 @@ OBJS=\
- all: cvsps
+@@ -22,7 +22,7 @@ deps:
+       makedepend -Y -I. *.c cbtcommon/*.c
  
  cvsps: $(OBJS)
 -      $(CC) -o cvsps $(OBJS) -lz
-+      $(CC) $(LDFLAGS) -o cvsps $(OBJS) -lz $(LIBS)
++      $(CC) ${LDFLAGS} -o cvsps $(OBJS) -lz ${LIBS}
  
- install:
+ check:
+       @(cd test >/dev/null; make --quiet)
+@@ -38,9 +38,9 @@ cvsps.html: cvsps.asc
+ 
+ install: cvsps.1
        [ -d $(prefix)/bin ] || mkdir -p $(prefix)/bin
 -      [ -d $(prefix)/share/man/man1 ] || mkdir -p $(prefix)/share/man/man1
-+      [ -d $(prefix)/man/man1 ] || mkdir -p $(prefix)/man/man1
++      [ -d $(prefix)/${PKGMANDIR}/man1 ] || mkdir -p 
$(prefix)/${PKGMANDIR}/man1
        install cvsps $(prefix)/bin
 -      install -m 644 cvsps.1 $(prefix)/share/man/man1
-+      install -m 644 cvsps.1 $(prefix)/$(PKGMANDIR)/man1
++      install -m 644 cvsps.1 $(prefix)/${PKGMANDIR}/man1
  
- clean:
-       rm -f cvsps *.o cbtcommon/*.o core
+ tags: *.c *.h cbtcommon/*.c cbtcommon/*.h
+       ctags *.c *.h cbtcommon/*.c cbtcommon/*.h

>Unformatted: