Make this package work on Solaris.

5 files changed, 39 insertions, 19 deletions

diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index 85a21cd3a10..2f4efcb5baa 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/07/06 08:00:10 jlam Exp $
+# $NetBSD: Makefile,v 1.7 1999/11/12 16:07:01 agc Exp $
 #
 
 DISTNAME=	hexedit-1.1.0
@@ -10,8 +10,6 @@ EXTRACT_SUFX=	.src.tgz
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.chez.com/prigaux/hexedit.html
 
-DEPENDS+=	ncurses-4.2:../../devel/ncurses
-
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib	# for -lncurses
 
@@ -21,4 +19,10 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/hexedit
 .endfor
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+DEPENDS+=	ncurses-4.2:../../devel/ncurses
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/hexedit/files/md5 b/editors/hexedit/files/md5
index 5939a3e4892..e10d3112d2b 100644
--- a/editors/hexedit/files/md5
+++ b/editors/hexedit/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1999/10/14 05:55:43 simonb Exp $
+$NetBSD: md5,v 1.7 1999/11/12 16:07:02 agc Exp $
 
-MD5 (hexedit-1.1.0.src.tgz) = 91d610d21288e99092a1498daaa01fc8
+MD5 (hexedit-1.1.0.src.tgz) = 29972c7afc503f55e728a8310ef8491a
diff --git a/editors/hexedit/files/patch-sum b/editors/hexedit/files/patch-sum
index 8d19310ac81..90f968a18de 100644
--- a/editors/hexedit/files/patch-sum
+++ b/editors/hexedit/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.2 1999/10/14 05:55:43 simonb Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/12 16:07:02 agc Exp $
 
 MD5 (patch-aa) = efacfb827bba19945a03423e689f710a
-MD5 (patch-ab) = 2d7d61503faabcfc58d2bde6b28544b7
-MD5 (patch-ac) = 25b140526f2271decf31109e9844e649
+MD5 (patch-ab) = 135cf432fc3ddbad517e5458ac5f78c5
+MD5 (patch-ac) = c2d929333ce9ee8aae88cc2873213d88
diff --git a/editors/hexedit/patches/patch-ab b/editors/hexedit/patches/patch-ab
index d3ad4f63917..81d3e79c6e3 100644
--- a/editors/hexedit/patches/patch-ab
+++ b/editors/hexedit/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.3 1998/09/28 10:35:56 frueauf Exp $
+$NetBSD: patch-ab,v 1.4 1999/11/12 16:07:02 agc Exp $
 
---- hexedit.h.orig	Mon Aug 31 20:50:50 1998
-+++ hexedit.h	Tue Sep 15 13:45:05 1998
-@@ -12,7 +12,7 @@
+--- hexedit.h	1999/11/12 15:56:55	1.1
++++ hexedit.h	1999/11/12 15:57:32
+@@ -12,7 +12,11 @@
  #if HAVE_UNISTD_H
  #include <unistd.h>
  #endif
--#include <curses.h>
++#ifdef __NetBSD__
 +#include <ncurses.h>
++#else
+ #include <curses.h>
++#endif
  #include <ctype.h>
  #include <signal.h>
  #if HAVE_SYS_WAIT_H
diff --git a/editors/hexedit/patches/patch-ac b/editors/hexedit/patches/patch-ac
index b2c2dbb9429..d6414192516 100644
--- a/editors/hexedit/patches/patch-ac
+++ b/editors/hexedit/patches/patch-ac
@@ -1,6 +1,8 @@
---- Makefile.in.orig	Thu Sep 24 18:41:31 1998
-+++ Makefile.in	Thu Oct 14 15:38:52 1999
-@@ -7,6 +7,7 @@
+$NetBSD: patch-ac,v 1.4 1999/11/12 16:07:02 agc Exp $
+
+--- Makefile.in.orig	Wed Feb 17 14:22:57 1999
++++ Makefile.in	Fri Nov 12 16:04:03 1999
+@@ -7,11 +7,18 @@
  
  CC = @CC@
  CFLAGS = @CFLAGS@
@@ -8,13 +10,24 @@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  DEFS = @DEFS@
-@@ -39,7 +40,5 @@
+ INSTALL = @INSTALL@
+ 
++OPSYS!= uname -s
++
++.if ${OPSYS} == "SunOS"
++LIBS+= -lcurses
++.endif
++
+ # Installation directories
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+@@ -39,7 +46,5 @@
  	rm -f Makefile config.cache config.status config.log
  
  install: $(PRODUCT)
 -	$(INSTALL) -d -m 755 $(bindir)
--	$(INSTALL) -s -m 755 -o root $(PRODUCT) $(bindir)
+-	$(INSTALL) -s -m 755 $(PRODUCT) $(bindir)
 -	$(INSTALL) -d -m 755 $(mandir)
--	$(INSTALL) -m 644 -o root $(PRODUCT).1 $(mandir)
+-	$(INSTALL) -m 644 $(PRODUCT).1 $(mandir)
 +	$(BSD_INSTALL_PROGRAM) $(PRODUCT) $(bindir)
 +	$(BSD_INSTALL_DATA) $(PRODUCT).1 $(mandir)