Pullup ticket 643 - requested by Grant Beattie

portability fixes for bsflite

Revisions pulled up:
- pkgsrc/chat/bsflite/Makefile		1.4
- pkgsrc/chat/bsflite/distinfo		1.4
- pkgsrc/chat/bsflite/patches/patch-aa	1.1
- pkgsrc/chat/bsflite/patches/patch-ab	1.1

   Module Name:		pkgsrc
   Committed By:	grant
   Date:		Fri Jul 29 04:50:39 UTC 2005

   Modified Files:
   	pkgsrc/chat/bsflite: Makefile distinfo
   Added Files:
   	pkgsrc/chat/bsflite/patches: patch-aa patch-ab

   Log Message:
   honour LDFLAGS and LIBS.

4 files changed, 55 insertions, 2 deletions

diff --git a/chat/bsflite/Makefile b/chat/bsflite/Makefile
index 387f0f7351b..b5db1fc8cfe 100644
--- a/chat/bsflite/Makefile
+++ b/chat/bsflite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/16 16:44:53 recht Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2005/08/02 21:21:37 salo Exp $
 
 DISTNAME=	bsflite-0.80
 CATEGORIES=	chat
@@ -18,4 +18,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/config-example \
 		${PREFIX}/share/examples/bsflite
 
+LIBS.SunOS+=	-lnsl -lsocket
+MAKE_ENV+=	LIBS=${LIBS:Q}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/bsflite/distinfo b/chat/bsflite/distinfo
index 53765ee6e2a..051435cf84f 100644
--- a/chat/bsflite/distinfo
+++ b/chat/bsflite/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/04/16 16:44:53 recht Exp $
+$NetBSD: distinfo,v 1.3.2.1 2005/08/02 21:21:37 salo Exp $
 
 SHA1 (bsflite-0.80.tar.gz) = 228b02851dedc44a4ee6dbc2fd5dca6ff059c4e3
 RMD160 (bsflite-0.80.tar.gz) = cec3b13fcf4afc37f4ee0a382d63f024b1f31861
 Size (bsflite-0.80.tar.gz) = 50529 bytes
+SHA1 (patch-aa) = e4afa22dab3b8538f490670c9e1474dba5eca079
+SHA1 (patch-ab) = 03dfe600654f9df4342fc7768665f5f9308e72d3
diff --git a/chat/bsflite/patches/patch-aa b/chat/bsflite/patches/patch-aa
new file mode 100644
index 00000000000..e57f28beb75
--- /dev/null
+++ b/chat/bsflite/patches/patch-aa
@@ -0,0 +1,35 @@
+$NetBSD: patch-aa,v 1.1.2.2 2005/08/02 21:21:37 salo Exp $
+
+--- Makefile.orig	2005-04-14 02:23:06.000000000 +1000
++++ Makefile
+@@ -2,7 +2,7 @@ EXEC=bsflite
+ #EXEC=bsflite.exe
+ #CC=i386-pc-msdosdjgpp-gcc
+ #CC=mingw32-gcc
+-CC=gcc
++#CC=gcc
+ #
+ # Remove -DTIMESTAMPS to remove timestamps on messages/events
+ #
+@@ -23,10 +23,10 @@ CFLAGS=-O -DTIMESTAMPS
+ #
+ # Add -lsocket -lnsl for Solaris
+ #
+-LIBS=-limcomm
++#LIBS=-limcomm
+ #LIBS+=-lwatt
+ #LIBS+=-lwsock32
+-LDFLAGS=-Limcomm/ -s
++#LDFLAGS=-Limcomm/ -s
+ #LDFLAGS+=-L/usr/local/djgpp/watt/lib
+ OBJECTS=aim.o away.o bsf.o cleaner.o config.o conn.o input.o log.o out.o queue.o util.o
+ 
+@@ -35,7 +35,7 @@ all:
+ 	$(MAKE) $(MFLAGS) $(EXEC)
+ 
+ $(EXEC):$(OBJECTS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJECTS) $(LIBS)
++	$(CC) $(CFLAGS) -Limcomm $(LDFLAGS) -o $(EXEC) $(OBJECTS) -limcomm $(LIBS)
+ 
+ clean:
+ 	rm -f *.o *~ $(EXEC)
diff --git a/chat/bsflite/patches/patch-ab b/chat/bsflite/patches/patch-ab
new file mode 100644
index 00000000000..3e7999350d4
--- /dev/null
+++ b/chat/bsflite/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.2.2 2005/08/02 21:21:37 salo Exp $
+
+--- imcomm/Makefile.orig	2005-04-14 02:22:49.000000000 +1000
++++ imcomm/Makefile
+@@ -8,7 +8,7 @@ RANLIB=ranlib
+ LIB=libimcomm.a
+ #CC=i386-pc-msdosdjgpp-gcc
+ #CC=mingw32-gcc
+-CC=gcc
++#CC=gcc
+ CFLAGS=-O
+ RM=rm -f
+ #CFLAGS+=-I/usr/local/djgpp/watt/inc