[pkgsrc/trunk]: pkgsrc/net/ripe-whois-tools tidy up how extra libraries are p...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3ca446ab53f7
branches:  trunk
changeset: 467235:3ca446ab53f7
user:      grant <grant%pkgsrc.org@localhost>
date:      Tue Jan 27 13:40:03 2004 +0000

description:
tidy up how extra libraries are passed and add libs required on
Solaris.

diffstat:

 net/ripe-whois-tools/Makefile         |  11 ++++-------
 net/ripe-whois-tools/distinfo         |   4 ++--
 net/ripe-whois-tools/patches/patch-aa |   9 ++++-----
 3 files changed, 10 insertions(+), 14 deletions(-)

diffs (70 lines):

diff -r 673481a95537 -r 3ca446ab53f7 net/ripe-whois-tools/Makefile
--- a/net/ripe-whois-tools/Makefile     Tue Jan 27 13:29:43 2004 +0000
+++ b/net/ripe-whois-tools/Makefile     Tue Jan 27 13:40:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:22:21 agc Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/27 13:40:03 grant Exp $
 #
 
 DISTNAME=      ripe-whois-tools-2.4
@@ -11,12 +11,9 @@
 
 WRKSRC=                ${WRKDIR}
 
-.include "../../mk/bsd.prefs.mk"
+LIBS.NetBSD=   -lcrypt
+LIBS.SunOS=    -lnsl -lsocket
 
-.if ${OPSYS} == "NetBSD"
-EXTRA_LIBS=    -lcrypt
-.endif
-
-MAKE_ENV+=     EXTRA_LIBS=${EXTRA_LIBS}
+MAKE_ENV+=     LIBS="${LIBS}"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 673481a95537 -r 3ca446ab53f7 net/ripe-whois-tools/distinfo
--- a/net/ripe-whois-tools/distinfo     Tue Jan 27 13:29:43 2004 +0000
+++ b/net/ripe-whois-tools/distinfo     Tue Jan 27 13:40:03 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/05/18 11:39:29 rh Exp $
+$NetBSD: distinfo,v 1.2 2004/01/27 13:40:03 grant Exp $
 
 SHA1 (ripe-whois-tools-2.4.tar.gz) = 0ce107294de244da74efe01928596eaebe090a62
 Size (ripe-whois-tools-2.4.tar.gz) = 8613 bytes
-SHA1 (patch-aa) = b90ecd2cd29dabc37b7b35715a4cc1dbfdef2016
+SHA1 (patch-aa) = 94508f4e63e941b5078dbdcb9fd79127344c7598
 SHA1 (patch-ab) = 241f9c51ceb834ae90d44b3567dd59116c5696f8
 SHA1 (patch-ac) = 2340f3e8abf02f6ecd3c32e52c076f11fc12773b
diff -r 673481a95537 -r 3ca446ab53f7 net/ripe-whois-tools/patches/patch-aa
--- a/net/ripe-whois-tools/patches/patch-aa     Tue Jan 27 13:29:43 2004 +0000
+++ b/net/ripe-whois-tools/patches/patch-aa     Tue Jan 27 13:40:03 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/18 11:39:29 rh Exp $
+$NetBSD: patch-aa,v 1.2 2004/01/27 13:40:03 grant Exp $
 
---- Makefile.orig      Mon Nov 16 17:38:32 1998
+--- Makefile.orig      1998-11-17 03:38:32.000000000 +1100
 +++ Makefile
-@@ -19,14 +19,16 @@
+@@ -19,14 +19,15 @@
  
  DEFINES= -DRIPE
  PROG=  whois cryptpw
@@ -16,7 +16,6 @@
 +INSTALL_MAN= ${BSD_INSTALL_MAN}
 +
  CFLAGS=  ${DEFINES}
-+LIBS=    ${EXTRA_LIBS}
  #
  # for BSDI
 -CC=shlicc2 -Wall -ansi -pedantic -O6 -m486
@@ -24,7 +23,7 @@
  #
  # for Linux
  #CC=gcc -Wall -ansi -pedantic -O6 -m486
-@@ -45,8 +47,10 @@
+@@ -45,8 +46,10 @@ cryptpw: Makefile cryptpw.c
        $(CC) ${CFLAGS} cryptpw.c -o cryptpw ${LIBS}
  
  install: ${PROG}