pkg/38083: patch to fix csup dependencies, fix build on Linux and other changes

[cesium2%gmail.com@localhost]

>Number:         38083
>Category:       pkg
>Synopsis:       patch to fix csup dependencies, fix build on Linux and other 
>changes
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Feb 22 15:00:00 +0000 2008
>Originator:     Yair K.
>Release:        N/A
>Organization:
>Environment:
>Description:
The attached patch makes the following changes to csup:

A) Add a dependency on openssl, as csup won't compile without it.
B) Use the supplied GNUmakefile on Linux and Darwin as the inline comments 
there suggest. Add USE_TOOLS+=gmake in that case. A build on Linux was 
successful.
C) Add DESTDIR support
D) UNAME was set with "UNAME!= /usr/bin/uname" in Makefile, which seems to have 
prevented pkgsrc from overriding it. Set it with "?=" to prevent a warning on 
systems where uname isn't there.
>How-To-Repeat:

>Fix:
--- pkgsrc/net/csup.orig/distinfo       2008-02-22 13:49:18.563178961 +0200
+++ pkgsrc/net/csup/distinfo    2008-02-22 14:21:45.209179371 +0200
@@ -3,5 +3,5 @@
 SHA1 (csup-snap-20070216.tar.gz) = b2a5b5a95496f166caa6f4c03003fe354a4e76c2
 RMD160 (csup-snap-20070216.tar.gz) = 7d96422461d7538b8f5ff2afaff9341a38ad2a8f
 Size (csup-snap-20070216.tar.gz) = 80734 bytes
-SHA1 (patch-aa) = 9f0792cb8d3f6acd28df3db6fd6b629800c4cc1c
-SHA1 (patch-ab) = 3ae5cc715d204d2b08042b0ace24092cbc423f01
+SHA1 (patch-aa) = 6c0d6ff72ecfa8aa03bdae23ada6aefe10d79078
+SHA1 (patch-ab) = 90111c31fc4ac1a834f2eeccdc73b0736dd2c573
--- pkgsrc/net/csup.orig/Makefile       2008-02-22 13:49:18.563178961 +0200
+++ pkgsrc/net/csup/Makefile    2008-02-22 14:21:41.410178035 +0200
@@ -10,9 +10,18 @@
 HOMEPAGE=      http://www.mu.org/~mux/csup.html
 COMMENT=       Rewrite of the CVSup file updating client in C
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    lex yacc
 WRKSRC=                ${WRKDIR}/csup
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux" || ${OPSYS} == "Darwin"
+MAKE_FILE=     GNUmakefile
+USE_TOOLS+=    gmake
+.endif
+
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 CFLAGS+=    ${PTHREAD_CFLAGS}
@@ -21,9 +30,10 @@
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/csup ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/csup.1 ${PREFIX}/${PKGMANDIR}/man1/csup.1
+       ${INSTALL_PROGRAM} ${WRKSRC}/csup ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/csup.1 
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/csup.1
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- pkgsrc/net/csup.orig/patches/patch-aa       2008-02-22 13:49:18.563178961 
+0200
+++ pkgsrc/net/csup/patches/patch-aa    2008-02-22 14:21:41.410178035 +0200
@@ -11,3 +11,11 @@
  
  .PHONY: all clean install
  
+@@ -59,5 +59,5 @@
+       gzip -cn $< > $@
+ 
+ install: csup csup.1.gz
+-      install -s -o $(OWNER) -g $(GROUP) csup $(PREFIX)/bin
+-      install -s -o $(OWNER) -g $(GROUP) csup.1.gz $(PREFIX)/share/man/man1
++      install -s -o $(OWNER) -g $(GROUP) csup ${DESTDIR}$(PREFIX)/bin
++      install -s -o $(OWNER) -g $(GROUP) csup.1.gz 
${DESTDIR}$(PREFIX)/share/man/man1
--- pkgsrc/net/csup.orig/patches/patch-ab       2008-02-22 13:49:18.563178961 
+0200
+++ pkgsrc/net/csup/patches/patch-ab    2008-02-22 14:21:41.410178035 +0200
@@ -1,8 +1,16 @@
 $NetBSD$
 
---- Makefile.orig      2006-03-07 19:10:25.000000000 +0000
-+++ Makefile
-@@ -11,33 +11,13 @@ SRCS=      attrstack.c config.c detailer.c di
+--- Makefile.orig      2006-03-07 21:10:25.000000000 +0200
++++ Makefile   2008-02-22 13:49:47.680177308 +0200
+@@ -4,40 +4,20 @@
+ BINDIR?=      ${PREFIX}/bin
+ MANDIR?=      ${PREFIX}/man/man
+ 
+-UNAME!=               /usr/bin/uname -s
++UNAME?=               /usr/bin/uname -s
+ 
+ PROG= csup
+ SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \
        globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \
        pathcomp.c proto.c status.c stream.c threads.c token.l updater.c