From 1923b5a9ae97e3f62e8f024e2aa6ee8c8ab8341d Mon Sep 17 00:00:00 2001
From: jschauma <jschauma@pkgsrc.org>
Date: Tue, 18 Jan 2005 03:15:07 +0000
Subject: Apply patches from Georg Schwarz in PR pkg/28628 to make this work
 (better) on IRIX

---
 editors/pico/Makefile         | 14 ++++++++++----
 editors/pico/distinfo         |  3 ++-
 editors/pico/patches/patch-ah | 45 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 editors/pico/patches/patch-ah

(limited to 'editors')

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 9a4f8218b44..7886cdb5c24 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2004/10/03 00:14:39 tv Exp $
+# $NetBSD: Makefile,v 1.58 2005/01/18 03:15:07 jschauma Exp $
 
 DISTNAME=	pine4.61
 PKGNAME=	pico-4.8
@@ -19,13 +19,19 @@ USE_LIBTOOL=	YES
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-BUILDNAME=	so5
-.elif ${OPSYS} == "Darwin"
+.if ${OPSYS} == "Darwin"
 BUILDNAME=	osx
 LIBS+=		-lcurses
+.elif ${OPSYS} == "IRIX"
+.  if ${OS_VERSION} >= 6.5
+BUILDNAME=	sg6
+.  else
+BUILDNAME=	sgi
+.  endif
 .elif ${OPSYS} == "Linux"
 BUILDNAME=	lnx
+.elif ${OPSYS} == "SunOS"
+BUILDNAME=	so5
 .else
 BUILDNAME=	neb
 .endif
diff --git a/editors/pico/distinfo b/editors/pico/distinfo
index 33c218738df..2a355aec7cd 100644
--- a/editors/pico/distinfo
+++ b/editors/pico/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2004/08/12 12:12:33 adam Exp $
+$NetBSD: distinfo,v 1.16 2005/01/18 03:15:07 jschauma Exp $
 
 SHA1 (pine4.61.tar.bz2) = 74d3b5d0d7e7364be48d705d67fa52fb8eb1b5fc
 Size (pine4.61.tar.bz2) = 3032253 bytes
@@ -8,3 +8,4 @@ SHA1 (patch-ad) = a5145664372b0ad308a0ee2501211e927d343971
 SHA1 (patch-ae) = f228f3c7f61be31a36730b252dfa37d611e8be4b
 SHA1 (patch-af) = ebc41187ea97f57f1553a6919c81c773013a1428
 SHA1 (patch-ag) = 7166128e46a10b879c44caea1207b84d13d1b0f4
+SHA1 (patch-ah) = 5e24024a5cc71f91e3c303c92fcbbfb4a1c3aec8
diff --git a/editors/pico/patches/patch-ah b/editors/pico/patches/patch-ah
new file mode 100644
index 00000000000..9513fcb3641
--- /dev/null
+++ b/editors/pico/patches/patch-ah
@@ -0,0 +1,45 @@
+$NetBSD: patch-ah,v 1.1 2005/01/18 03:15:07 jschauma Exp $
+
+--- pico/makefile.sgi.orig	Mon Jan 17 22:03:01 2005
++++ pico/makefile.sgi	Mon Jan 17 22:04:34 2005
+@@ -32,15 +32,12 @@
+ MAKE=        make
+ OPTIMIZE=    # -O
+ PROFILE=     # -pg
+-DEBUG=       -g -DDEBUG
++DEBUG=       # -g -DDEBUG
+ 
+ STDCFLAGS=	-Dsgi -DJOB_CONTROL -DMOUSE
+ CFLAGS=         $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
+ 
+ # switches for library building
+-LIBCMD=		ar
+-LIBARGS=	ru
+-RANLIB=		/bin/true
+ 
+ LIBS=		$(EXTRALDFLAGS) -ltermcap -lc
+ 
+@@ -55,17 +52,17 @@
+ # dependencies for the Unix versions of pico and libpico.a
+ #
+ all:		pico pilot
+-pico pilot:	libpico.a
++pico pilot:	libpico.la
+ 
+ pico:		main.o
+-		$(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
++		$(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
+ 
+ pilot:		pilot.o
+-		$(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
++		$(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
+ 
+-libpico.a:	$(OFILES)
+-		$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
+-		$(RANLIB) libpico.a
++libpico.la:	$(OFILES)
++		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
++			-version-info 4:0
+ 
+ clean:
+ 		rm -f *.a *.o *~ pico_os.c os.h pico pilot
-- 
cgit v1.2.3