summaryrefslogtreecommitdiff
path: root/editors/joe
diff options
context:
space:
mode:
authorabs <abs>2003-06-08 15:20:40 +0000
committerabs <abs>2003-06-08 15:20:40 +0000
commit2952837b45b805f5f41858815dec876ed0dacb69 (patch)
tree5330341ee2ba6b91c8c0de2e70a608184c8fe6ba /editors/joe
parentac95a255c0caad10b69f7d0d38079efd3247fd74 (diff)
downloadpkgsrc-2952837b45b805f5f41858815dec876ed0dacb69.tar.gz
Update joe to 2.8nb2:
Do not unconditionally set CC, and remove unnecessary #include <varargs.h>
Diffstat (limited to 'editors/joe')
-rw-r--r--editors/joe/Makefile4
-rw-r--r--editors/joe/patches/patch-aa11
-rw-r--r--editors/joe/patches/patch-ai12
3 files changed, 22 insertions, 5 deletions
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 8ca8122b62e..7e774cfa93a 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/06/08 15:20:40 abs Exp $
#
DISTNAME= joe2.8
PKGNAME= joe-2.8
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/joe
CATEGORIES= editors
MASTER_SITES= ftp://ftp.std.com/src/editors/
diff --git a/editors/joe/patches/patch-aa b/editors/joe/patches/patch-aa
index f0cd6ea97d9..5af15f94a8b 100644
--- a/editors/joe/patches/patch-aa
+++ b/editors/joe/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2003/04/27 17:45:30 cjep Exp $
+$NetBSD: patch-aa,v 1.6 2003/06/08 15:20:41 abs Exp $
---- Makefile.orig 1995-01-23 06:01:28.000000000 +0000
+--- Makefile.orig Mon Jan 23 06:01:28 1995
+++ Makefile
@@ -9,9 +9,9 @@
# to go and where you want the man page
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.5 2003/04/27 17:45:30 cjep Exp $
# If you want to use TERMINFO, you have to set
# the following variable to 1. Also you have to
-@@ -27,7 +27,7 @@ TERMINFO = 0
+@@ -27,11 +27,11 @@ TERMINFO = 0
# C compiler options: make's built-in rules use this variable
@@ -24,6 +24,11 @@ $NetBSD: patch-aa,v 1.5 2003/04/27 17:45:30 cjep Exp $
# C compiler to use: make's built-in rules use this variable
+-CC = cc
++CC ?= cc
+
+ # You may have to include some extra libraries
+ # for some systems
@@ -45,7 +45,7 @@ CC = cc
# add '-ltinfo', '-lcurses' or '-ltermlib',
# depending on the system.
diff --git a/editors/joe/patches/patch-ai b/editors/joe/patches/patch-ai
new file mode 100644
index 00000000000..1d001b9fc27
--- /dev/null
+++ b/editors/joe/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2003/06/08 15:20:41 abs Exp $
+
+--- vs.c.orig Thu Oct 6 07:20:35 1994
++++ vs.c
+@@ -16,7 +16,6 @@ You should have received a copy of the G
+ JOE; see the file COPYING. If not, write to the Free Software Foundation,
+ 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+-#include <varargs.h>
+ #include "config.h"
+ #include "zstr.h"
+ #include "blocks.h"