summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2006-12-17 20:09:26 +0000
committerminskim <minskim@pkgsrc.org>2006-12-17 20:09:26 +0000
commitc0a7e174853320b60262018296245b4592379009 (patch)
treef66f8c4a629e2d02cb0eaf1e573215bac9fc57d4
parente3e60537b713a77f09435816303ae0314d26cc55 (diff)
downloadpkgsrc-c0a7e174853320b60262018296245b4592379009.tar.gz
Do not use libcrypt on Darwin. Darwin has crypt(3) in libc.
-rw-r--r--sysutils/rtty/Makefile8
-rw-r--r--sysutils/rtty/distinfo4
-rw-r--r--sysutils/rtty/patches/patch-aa19
3 files changed, 18 insertions, 13 deletions
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index 59d57c0cefc..31a81b3827e 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:30:42 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/12/17 20:09:26 minskim Exp $
DISTNAME= rtty-3.2
PKGREVISION= 1
@@ -10,6 +10,12 @@ COMMENT= Multiuser "tip"/"cu" replacement with logging
WRKSRC= ${WRKDIR}
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+MAKE_ENV+= LIBS="-lcrypt"
+.endif
+
pre-configure:
${CHMOD} -R u+w ${WRKDIR}
for f in `${FIND} ${WRKDIR}/. -type f -print | ${XARGS} ${GREP} -l '/usr/local'`; do \
diff --git a/sysutils/rtty/distinfo b/sysutils/rtty/distinfo
index f8114ce640a..8e7a142d88f 100644
--- a/sysutils/rtty/distinfo
+++ b/sysutils/rtty/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:40:57 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/12/17 20:09:26 minskim Exp $
SHA1 (rtty-3.2.tar.gz) = 62587ee4eec0b551b2b38341f20fddebde1ee8a1
RMD160 (rtty-3.2.tar.gz) = 03863b5fbaf27a6f254c620e91c3dcd364df926a
Size (rtty-3.2.tar.gz) = 23445 bytes
-SHA1 (patch-aa) = 4d860aeeac21ff125bcff995f85a530caa208eb0
+SHA1 (patch-aa) = 347e1522c9f4a13f821799c17a8950421ec9170a
SHA1 (patch-ab) = 32644f9383ef43b45421fc100382509e2e6b2e34
SHA1 (patch-ac) = 8b1b1be9eb471f68d62b4454f9bd74dddb471d75
SHA1 (patch-ad) = dee546ca499fa4fb534f137d58fcbbb800b244d3
diff --git a/sysutils/rtty/patches/patch-aa b/sysutils/rtty/patches/patch-aa
index e9afe6fe77e..22d61729f89 100644
--- a/sysutils/rtty/patches/patch-aa
+++ b/sysutils/rtty/patches/patch-aa
@@ -1,10 +1,8 @@
-$NetBSD: patch-aa,v 1.3 1999/04/09 08:33:51 agc Exp $
+$NetBSD: patch-aa,v 1.4 2006/12/17 20:09:26 minskim Exp $
-Make this work on NetBSD and Solaris.
-
---- Makefile.orig Fri Apr 9 09:25:00 1999
-+++ Makefile Fri Apr 9 09:27:50 1999
-@@ -23,7 +23,7 @@
+--- Makefile.orig 1996-08-23 23:46:42.000000000 +0000
++++ Makefile
+@@ -23,7 +23,7 @@ DESTROOT =
DESTPATH = $(DESTROOT)/usr/local/rtty
DESTBIN = $(DESTPATH)/bin
@@ -13,7 +11,7 @@ Make this work on NetBSD and Solaris.
CDEBUG = -O -g
#
# use -U to undefine, -D to define
-@@ -35,15 +35,24 @@
+@@ -35,16 +35,25 @@ CDEBUG = -O -g
# NO_SOCKADDR_LEN if your "struct sockaddr_in" lacks a sin_len field
# NO_HSTRERROR if your C library has no hstrerror() function
#
@@ -24,12 +22,12 @@ Make this work on NetBSD and Solaris.
-CFLAGS = $(CDEBUG) $(CDEFS) -I/usr/local/include
-LIBS =
+CFLAGS+= $(CDEBUG) $(CDEFS)
-+LIBS = -lcrypt
++#LIBS =
#(if WANT_TCPIP defined and this isn't in your libc)
# -lresolv
#(if the resolver needs it, which BIND>=4.9's will on BSD>=4.4 systems)
# -l44bsd
-+
+
+OPSYS!= uname -s
+
+.if ${OPSYS} == "NetBSD"
@@ -38,6 +36,7 @@ Make this work on NetBSD and Solaris.
+LIBS+= -lsocket -lnsl
+CDEFS+= -DNEED_INET_ATON
+.endif
-
++
BINARY = ttysrv rtty locbrok
SCRIPT = Startup console startsrv agelogs agelog
+ ALL = $(BINARY) $(SCRIPT)