From 65193cf15f6acab41753ab86330131c5eedba307 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 23 Sep 2003 13:34:44 +0000
Subject: Fix build on Solaris. From Jonathan Perkin in PR 22907.

---
 sysutils/dog/Makefile         |  9 ++++++++-
 sysutils/dog/distinfo         |  4 ++--
 sysutils/dog/patches/patch-aa | 23 ++++++++++++++---------
 3 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'sysutils/dog')

diff --git a/sysutils/dog/Makefile b/sysutils/dog/Makefile
index 5ddba47307c..18afe667656 100644
--- a/sysutils/dog/Makefile
+++ b/sysutils/dog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:53:28 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/23 13:34:44 wiz Exp $
 # FreeBSD Id: ports/misc/dog/Makefile,v 1.1 2000/06/10 05:45:34 will Exp
 
 DISTNAME=	dog-1.7
@@ -12,4 +12,11 @@ COMMENT=	Dog writes the contents of each given file, URL, or stdin
 USE_GMAKE=	yes
 ALL_TARGET=	dog
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+LDFLAGS+=	-lsocket -lnsl
+MAKE_ENV+=	OBJS="getopt.o getopt1.o"
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dog/distinfo b/sysutils/dog/distinfo
index 78bb74e9c87..28dad7b29ad 100644
--- a/sysutils/dog/distinfo
+++ b/sysutils/dog/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:01 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/09/23 13:34:45 wiz Exp $
 
 SHA1 (dog-1.7.tar.gz) = a1af9c76daa0c9768cdf0c31839b3004e6ccc417
 Size (dog-1.7.tar.gz) = 30433 bytes
-SHA1 (patch-aa) = c0dc5315d16950f3cc927074ea7b7536adac880c
+SHA1 (patch-aa) = d7fdbe2bfa5c6c69493f8b68802a45841869899f
diff --git a/sysutils/dog/patches/patch-aa b/sysutils/dog/patches/patch-aa
index b7126b382b4..f4b6ec3a244 100644
--- a/sysutils/dog/patches/patch-aa
+++ b/sysutils/dog/patches/patch-aa
@@ -1,17 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/19 01:35:05 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2003/09/23 13:34:45 wiz Exp $
 
---- Makefile.orig	Tue Jul 13 20:32:24 1999
-+++ Makefile
-@@ -12,18 +12,20 @@
+--- Makefile.orig	Wed Jun 21 17:00:57 2000
++++ Makefile	Tue Sep 23 10:15:48 2003
+@@ -18,22 +18,23 @@
  #  dogboy@photodex.com!
  
  INSTALL = /usr/bin/install -c
 -OBJS = dog.o getopt.o getopt1.o
 -CFLAGS = -O3 -Wall
 +#HF#OBJS = dog.o getopt.o getopt1.o
-+OBJS = dog.o # NetBSD (and about any other Unix) has getopt in libc :-)
-+CC ?= cc
-+CFLAGS ?= -O -pipe
++OBJS += dog.o # NetBSD (and about any other Unix) has getopt in libc :-)
++#CFLAGS = -O3 -Wall
  
 -prefix = /usr/local
 +prefix = ${PREFIX}
@@ -24,7 +23,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/01/19 01:35:05 hubertf Exp $
  
  dog:	${OBJS}
 -	gcc ${CFLAGS} -o dog ${OBJS}
-+	$(CC) ${CFLAGS} -o dog ${OBJS}
++	$(CC) ${CFLAGS} -o dog ${OBJS} ${LDFLAGS}
  
  install:	dog
- 	$(INSTALL) -m 644 dog.1 ${mandir}/man1
+-	$(INSTALL) -m 644 dog.1 ${mandir}/man1
+-	$(INSTALL) -m 755 dog ${bindir}
++	$(BSD_INSTALL_MAN) dog.1 ${mandir}/man1/dog.1
++	$(BSD_INSTALL_PROGRAM) dog ${bindir}/dog
+ 
+ clean:
+ 	rm -f dog *.o *~
-- 
cgit v1.2.3