Add DragonFly support. Add explicit rpath for /usr/pkg/lib.

5 files changed, 40 insertions, 10 deletions

diff --git a/net/llnlxdir/distinfo b/net/llnlxdir/distinfo
index 7a9a8307778..61c1ec0f63f 100644
--- a/net/llnlxdir/distinfo
+++ b/net/llnlxdir/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:13:52 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/03/22 23:15:29 joerg Exp $
 
 SHA1 (llnlxdir2_1_2.tar.Z) = b9e8f79929e693d4f0fd3b41f7ce3ceb76abd252
 RMD160 (llnlxdir2_1_2.tar.Z) = 124acfad9f18730dd560e2bf44887b7381a3e484
 Size (llnlxdir2_1_2.tar.Z) = 574027 bytes
-SHA1 (patch-aa) = 54ebaf3b006d6f1253b6baaad984addd698e9728
-SHA1 (patch-ab) = 734e8b92bc3c1efeb71138acf60eab04bd8639a6
+SHA1 (patch-aa) = 4bc2943612db8b22d7b782b4a56cf19870bcd16f
+SHA1 (patch-ab) = 977e88048bccc4ba8fe0fd95709d1762e4b1ece5
+SHA1 (patch-ac) = bfa98390b65d2bc26fa23212a349aaadd7a0d300
+SHA1 (patch-ad) = c46dd7785488b42c90d731d78fca87c80f549e81
diff --git a/net/llnlxdir/patches/patch-aa b/net/llnlxdir/patches/patch-aa
index 47d65c78771..fbcca9041cb 100644
--- a/net/llnlxdir/patches/patch-aa
+++ b/net/llnlxdir/patches/patch-aa
@@ -1,14 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/12 05:43:42 ben Exp $
+$NetBSD: patch-aa,v 1.2 2006/03/22 23:15:30 joerg Exp $
 
---- diag.c.orig	1999-11-22 16:07:31.000000000 -0800
+--- diag.c.orig	1999-11-23 00:07:31.000000000 +0000
 +++ diag.c
-@@ -125,7 +125,9 @@ extern int diagnostics;
+@@ -125,8 +125,10 @@ extern int diagnostics;
  extern struct st_host_info hinfo[];
  extern int initial_diagnostics;
  extern int screen;
-+#if !defined(__NetBSD__)
++#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
  extern int sys_nerr;
+-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__GNU_LIBRARY__) && !defined(__GLIBC__) && !defined(__EMX__)
 +#endif
- #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__GNU_LIBRARY__) && !defined(__GLIBC__) && !defined(__EMX__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__GNU_LIBRARY__) && !defined(__GLIBC__) && !defined(__EMX__) && !defined(__DragonFly__)
  extern char *sys_errlist[];
  #endif
+ 
diff --git a/net/llnlxdir/patches/patch-ab b/net/llnlxdir/patches/patch-ab
index b822a753854..1be2e460eb4 100644
--- a/net/llnlxdir/patches/patch-ab
+++ b/net/llnlxdir/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2004/02/23 14:45:57 ben Exp $
+$NetBSD: patch-ab,v 1.2 2006/03/22 23:15:30 joerg Exp $
 
 --- lconnect.c.orig	1999-11-22 16:07:32.000000000 -0800
 +++ lconnect.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2004/02/23 14:45:57 ben Exp $
  
  	/* Get user name */
 -#if defined(__sony_news) || defined(__MACHTEN__)
-+#if defined(__sony_news) || defined(__MACHTEN__) || defined(__NetBSD__)
++#if defined(__sony_news) || defined(__MACHTEN__) || defined(__NetBSD__) || defined(__DragonFly__)
  	if((username = getenv("USER")) || (username = getlogin()))
  #else
  	if((username = getenv("USER")) || (username = cuserid(NULL)))
diff --git a/net/llnlxdir/patches/patch-ac b/net/llnlxdir/patches/patch-ac
new file mode 100644
index 00000000000..bc0b09936d2
--- /dev/null
+++ b/net/llnlxdir/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/03/22 23:15:30 joerg Exp $
+
+--- launch.c.orig	2006-03-22 22:56:35.000000000 +0000
++++ launch.c
+@@ -76,7 +76,7 @@ extern struct st_host_info hinfo[];
+ extern int beep_when_ops_done;
+ extern int child_to_parent_pipe[];
+ extern struct dirwin_st *dirwin_head;
+-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__GNU_LIBRARY__) && !defined(__GLIBC__) && !defined(__EMX__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__GNU_LIBRARY__) && !defined(__GLIBC__) && !defined(__EMX__) && !defined(__DragonFly__)
+ extern char *sys_errlist[];
+ #endif
+ 
diff --git a/net/llnlxdir/patches/patch-ad b/net/llnlxdir/patches/patch-ad
new file mode 100644
index 00000000000..40007641fd6
--- /dev/null
+++ b/net/llnlxdir/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/03/22 23:15:30 joerg Exp $
+
+--- Imakefile.orig	2006-03-22 23:05:04.000000000 +0000
++++ Imakefile
+@@ -134,7 +134,7 @@ CCOPTIONS = -Aa -D_HPUX_SOURCE -I/usr/in
+ LOCAL_LIBRARIES = -L/usr/lib/$(MOTIF_VER) -lXm $(XTOOLLIB) $(XLIB) $(SOCKS_LIBS)
+ #else
+ #ifndef XMLIB
+-XMLIB = -lXm
++XMLIB = ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lXm
+ #endif
+ #ifdef XmClientLibs
+ LOCAL_LIBRARIES = XmClientLibs $(SOCKS_LIBS)