Fix build on SunOS.

4 files changed, 16 insertions, 13 deletions

diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile
index e5b013cabe3..8ee8afc70e2 100644
--- a/comms/xisp/Makefile
+++ b/comms/xisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2012/02/06 12:39:43 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2012/02/17 13:49:47 hans Exp $
 #
 
 DISTNAME=		xisp-2.7p4
@@ -16,12 +16,16 @@ PKG_GROUPS=		${DIALER_GROUP}
 PKG_GROUPS_VARS+=	DIALER_GROUP
 MAKE_ENV+=		DIALER_GROUP="${DIALER_GROUP}"
 MAKE_ENV+=		VARBASE=${VARBASE:Q}
+MAKE_ENV+=		INSTALL=${TOOLS_PATH.install:Q}
 MESSAGE_SUBST+=		DIALER_GROUP=${DIALER_GROUP}
 # XXX TODO: maybe do MODEM_DEV also?
 
 INSTALLATION_DIRS+=	share/doc/xisp
 PKG_DESTDIR_SUPPORT=	destdir
 
+CFLAGS.SunOS+=		-DSUNOS5x
+LDFLAGS.SunOS+=		-lsocket -lnsl
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xisp/
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/xisp/
diff --git a/comms/xisp/distinfo b/comms/xisp/distinfo
index aa516f2cdf0..1524498e432 100644
--- a/comms/xisp/distinfo
+++ b/comms/xisp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2009/12/17 21:49:22 abs Exp $
+$NetBSD: distinfo,v 1.11 2012/02/17 13:49:47 hans Exp $
 
 SHA1 (xisp-2.7p4.tar.gz) = d6b7cba0cbde2d8c42405108d69aa21c96e73659
 RMD160 (xisp-2.7p4.tar.gz) = 617ad86157dc0bef19239359eb20d6f65ee8a00b
 Size (xisp-2.7p4.tar.gz) = 300156 bytes
-SHA1 (patch-aa) = 2d9b9a8c52ce1a146061cbcf8d9042c0732ef8f6
+SHA1 (patch-aa) = 0c90fc26d937f5ab3cda0bcaaeffe99b2a8fdaad
 SHA1 (patch-ab) = aebdef9938050ad251a4160f1d1d51b83c75c2c0
-SHA1 (patch-ac) = d066fcfe23bdfb80b852096a6bd1039dba1c6914
+SHA1 (patch-ac) = 0c94e133d36024ea27b33c3cdbb8b3c2b387ceff
diff --git a/comms/xisp/patches/patch-aa b/comms/xisp/patches/patch-aa
index 72b5f3dcb95..7bf5d1e4467 100644
--- a/comms/xisp/patches/patch-aa
+++ b/comms/xisp/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2009/12/17 21:49:22 abs Exp $
+$NetBSD: patch-aa,v 1.12 2012/02/17 13:49:47 hans Exp $
 
 --- Makefile.orig	2005-11-07 00:38:22.000000000 +0000
 +++ Makefile
@@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.11 2009/12/17 21:49:22 abs Exp $
  #
  # Debian vars (if your Debian distribution is relatively
  # old and does not use glibc2, use the lines which DO NOT
-@@ -186,25 +186,29 @@ INSTALL    = install
+@@ -186,25 +186,28 @@ INSTALL    = install
  #
  # NetBSD vars
  #-------------
@@ -101,20 +101,19 @@ $NetBSD: patch-aa,v 1.11 2009/12/17 21:49:22 abs Exp $
 +PPPDLCKDIR = $(VARBASE)/spool/lock
 +DESTDIR    = 
 +GROUP      = $(DIALER_GROUP)
-+CCFLAGS    = -Wall -O
++CCFLAGS    = -Wall -O ${CFLAGS}
 +EXTRADEFS  = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
 +.if defined(OPSYS) && ${OPSYS} == "DragonFly"
 +EXTRALIBS  = -lcipher
 +.else
 +EXTRALIBS  = -lcrypt
 +.endif
-+LINKX11    = -Wl,-R$(LIBX11)
++LINKX11    = -Wl,-R$(LIBX11) ${LDFLAGS}
 +LINKFORMS  = -Wl,-R$(LIBFORMS) -L$(LIBFORMS) -lforms
-+INSTALL    = /usr/bin/install
  #
  # FreeBSD vars
  #-------------
-@@ -324,19 +328,19 @@ network.o: network.h network.c
+@@ -324,19 +327,19 @@ network.o: network.h network.c
  	$(CC) $(CCOPTS) -c network.c
  
  xispdial: xispdial.o $(SHAREOBJ)
@@ -137,7 +136,7 @@ $NetBSD: patch-aa,v 1.11 2009/12/17 21:49:22 abs Exp $
  	$(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lXpm -lX11 -lm
  
  rcio.o: rcio.h rcio.c common.h version.h
-@@ -349,7 +353,7 @@ xisp_euidaccess.o: xisp_euidaccess.c
+@@ -349,7 +352,7 @@ xisp_euidaccess.o: xisp_euidaccess.c
  	$(CC) $(CCOPTS) -c xisp_euidaccess.c
  
  xispid: xispid.c
diff --git a/comms/xisp/patches/patch-ac b/comms/xisp/patches/patch-ac
index 8375627a64e..4b8e11bb9b1 100644
--- a/comms/xisp/patches/patch-ac
+++ b/comms/xisp/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2009/12/17 21:49:22 abs Exp $
+$NetBSD: patch-ac,v 1.6 2012/02/17 13:49:48 hans Exp $
 
 --- xispid.c.orig	2005-11-07 00:38:22.000000000 +0000
 +++ xispid.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.5 2009/12/17 21:49:22 abs Exp $
  #endif
  
 -#if !defined(__FreeBSD__) && !defined(linux) /* setgrent() is int in FreeBSD */
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(linux) /* setgrent() is int in FreeBSD */
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(linux) && !defined(__sun) /* setgrent() is int in FreeBSD */
  struct passwd *getpwuid();
  struct group *getgrgid(), *getgrent();
  uid_t getuid(), geteuid();