[pkgsrc/trunk]: pkgsrc/net/uftp Make sure we add an rpath to OpenSSL librarie...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/31c7360ee02b
branches:  trunk
changeset: 637259:31c7360ee02b
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Jul 25 14:18:18 2014 +0000

description:
Make sure we add an rpath to OpenSSL libraries, fixes check-shlibs-elf.awk

Take the opportunity to make this package look more like a normal pkgsrc
package and pkglint clean.

diffstat:

 net/uftp/MESSAGE                |   6 +++++-
 net/uftp/Makefile               |  13 +++++++++----
 net/uftp/distinfo               |   4 ++--
 net/uftp/patches/patch-makefile |  31 +++++++++++++++++++------------
 4 files changed, 35 insertions(+), 19 deletions(-)

diffs (112 lines):

diff -r 8d1483f78dee -r 31c7360ee02b net/uftp/MESSAGE
--- a/net/uftp/MESSAGE  Fri Jul 25 14:04:40 2014 +0000
+++ b/net/uftp/MESSAGE  Fri Jul 25 14:18:18 2014 +0000
@@ -1,4 +1,7 @@
-to use larger network buffer sizes:
+===========================================================================
+$NetBSD: MESSAGE,v 1.2 2014/07/25 14:18:18 jperkin Exp $
+
+To use larger network buffer sizes:
 
 Solaris: ndd -set /dev/udp udp_max_buf {value}
 
@@ -9,3 +12,4 @@
 (The actual maximum you can use is 8/9 of this value)
 
 NetBSD: sysctl -w kern.sbmax={value}
+===========================================================================
diff -r 8d1483f78dee -r 31c7360ee02b net/uftp/Makefile
--- a/net/uftp/Makefile Fri Jul 25 14:04:40 2014 +0000
+++ b/net/uftp/Makefile Fri Jul 25 14:18:18 2014 +0000
@@ -1,18 +1,23 @@
-# $NetBSD: Makefile,v 1.2 2014/02/12 23:18:26 tron Exp $
+# $NetBSD: Makefile,v 1.3 2014/07/25 14:18:18 jperkin Exp $
 
 DISTNAME=      uftp-4.1.2
 PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  http://sourceforge.net/projects/uftp-multicast/files/source-tar/
 EXTRACT_SUFX=  .tar
-USE_TOOLS+=            gmake
-NO_CONFIGURE=  yes
-MAKE_FILE=             makefile
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://uftp-multicast.sourceforge.net/
 COMMENT=       UFTP is an encrypted multicast file transfer program
 LICENSE=       gnu-gpl-v3
 
+USE_TOOLS+=    gmake
+NO_CONFIGURE=  yes
+MAKE_FILE=     makefile
+
+INSTALLATION_DIRS+=    bin sbin ${PKGMANDIR}/man1
+
+MAKE_ENV+=     LIB="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib"
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8d1483f78dee -r 31c7360ee02b net/uftp/distinfo
--- a/net/uftp/distinfo Fri Jul 25 14:04:40 2014 +0000
+++ b/net/uftp/distinfo Fri Jul 25 14:18:18 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2013/10/05 17:40:38 mspo Exp $
+$NetBSD: distinfo,v 1.2 2014/07/25 14:18:18 jperkin Exp $
 
 SHA1 (uftp-4.1.2.tar) = 11191127cc3716599a2554cfcc18329487757067
 RMD160 (uftp-4.1.2.tar) = eb8fdae3648de86976177fbf805099a43cff37ec
 Size (uftp-4.1.2.tar) = 1198080 bytes
-SHA1 (patch-makefile) = 275f24c09128155215c134f2d80b7ba0ffbb2390
+SHA1 (patch-makefile) = 116a202412b40076734caf3500566c60d31f33d0
 SHA1 (patch-uftp_common.c) = 87d3a6e4b1216d3cd81a55441412811152f0de3d
diff -r 8d1483f78dee -r 31c7360ee02b net/uftp/patches/patch-makefile
--- a/net/uftp/patches/patch-makefile   Fri Jul 25 14:04:40 2014 +0000
+++ b/net/uftp/patches/patch-makefile   Fri Jul 25 14:18:18 2014 +0000
@@ -1,7 +1,8 @@
-$NetBSD: patch-makefile,v 1.1 2013/10/05 17:40:38 mspo Exp $
-fixup install and add netbsd
+$NetBSD: patch-makefile,v 1.2 2014/07/25 14:18:18 jperkin Exp $
 
---- makefile-orig      2013-10-05 17:11:26.000000000 +0000
+Fixup install and add NetBSD
+
+--- makefile.orig      2013-08-19 01:10:13.000000000 +0000
 +++ makefile
 @@ -53,6 +53,11 @@ ifeq ("FreeBSD", "$(UNAME_S)")
  OPTIONS=-g -Wall -DHAS_GETIFADDRS -DNO_DUAL -DNO_MCAST_JOIN $(ENC_OPTS)
@@ -15,7 +16,16 @@
  # OSX, aka Darwin
  ifeq ("Darwin", "$(UNAME_S)")
  OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-@@ -197,12 +202,12 @@ uftp_keymgt: $(UFTP_KEYMGT_OBJS)
+@@ -64,7 +69,7 @@ CC = cc
+ OPTIONS=-g -DBSD_COMP -DNO_DUAL $(ENC_OPTS)
+ LDLIBS=-lnsl -lsocket -lm $(CRYPT_LIB)
+ CFLAGS=`getconf LFS_CFLAGS`
+-OPENSSL=/usr/sfw
++#OPENSSL=/usr/sfw
+ MTFLAGS=-mt
+ endif
+ 
+@@ -197,12 +202,9 @@ uftp_keymgt: $(UFTP_KEYMGT_OBJS)
        $(CC) $(OPTIONS) $(INCLUDE) $(CFLAGS) $(MTFLAGS) -c $<
  
  install: all
@@ -27,12 +37,9 @@
 -      /bin/cp -p uftpproxyd $(DESTDIR)/usr/sbin
 -      /bin/cp -p uftp_keymgt $(DESTDIR)/bin
 -      /bin/cp -p uftp.1 uftpd.1 uftpproxyd.1 uftp_keymgt.1 $(DESTDIR)/usr/share/man/man1
-+      install -m 755 -d $(DESTDIR)$(PREFIX)/bin
-+      install -m 755 -d $(DESTDIR)$(PREFIX)/sbin
-+      install -m 755 -d $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1
-+      /bin/cp -p uftp $(DESTDIR)$(PREFIX)/bin
-+      /bin/cp -p uftpd $(DESTDIR)$(PREFIX)/sbin
-+      /bin/cp -p uftpproxyd $(DESTDIR)$(PREFIX)/sbin
-+      /bin/cp -p uftp_keymgt $(DESTDIR)$(PREFIX)/bin
-+      /bin/cp -p uftp.1 uftpd.1 uftpproxyd.1 uftp_keymgt.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1
++      ${BSD_INSTALL_PROGRAM} uftp $(DESTDIR)$(PREFIX)/bin
++      ${BSD_INSTALL_PROGRAM} uftpd $(DESTDIR)$(PREFIX)/sbin
++      ${BSD_INSTALL_PROGRAM} uftpproxyd $(DESTDIR)$(PREFIX)/sbin
++      ${BSD_INSTALL_PROGRAM} uftp_keymgt $(DESTDIR)$(PREFIX)/bin
++      ${BSD_INSTALL_MAN} uftp.1 uftpd.1 uftpproxyd.1 uftp_keymgt.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1