diff options
Diffstat (limited to 'editors/ng')
| -rw-r--r-- | editors/ng/Makefile | 8 | ||||
| -rw-r--r-- | editors/ng/files/md5 | 4 | ||||
| -rw-r--r-- | editors/ng/files/patch-sum | 4 | ||||
| -rw-r--r-- | editors/ng/patches/patch-aa | 35 |
4 files changed, 23 insertions, 28 deletions
diff --git a/editors/ng/Makefile b/editors/ng/Makefile index aa1c60b4ff1..45767d06326 100644 --- a/editors/ng/Makefile +++ b/editors/ng/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:44 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/18 01:16:50 jun Exp $ -DISTNAME= ng-1.4 +DISTNAME= ng-1.4.3 CATEGORIES= editors japanese MASTER_SITES= http://ha3.seikyou.ne.jp/home/amura/archives/ng/ @@ -23,10 +23,6 @@ ALL_TARGET= ng MAKEFLAGS+= USE_CANNA=${USE_CANNA} post-patch: -.if ${USE_CANNA} != "YES" - @(cd ${WRKSRC}; ${MV} config.h config.h.orig ) - @(cd ${WRKSRC}; ${SED} -e "s/#define CANNA/#undef CANNA/" config.h.orig > config.h ) -.endif @(cd ${WRKSRC}; ${LN} -s sys/bsd/Makefile . ) do-install: diff --git a/editors/ng/files/md5 b/editors/ng/files/md5 index b3a15083874..914a718311c 100644 --- a/editors/ng/files/md5 +++ b/editors/ng/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/10/19 23:54:37 hubertf Exp $ +$NetBSD: md5,v 1.2 2001/03/18 01:16:51 jun Exp $ -MD5 (ng-1.4.tar.gz) = 83fd519100b78ba0f6809ba4899b1863 +MD5 (ng-1.4.3.tar.gz) = abf49d8472cdfc9187bb97a4fababc55 diff --git a/editors/ng/files/patch-sum b/editors/ng/files/patch-sum index 4ca2847a36d..6daf84e18e4 100644 --- a/editors/ng/files/patch-sum +++ b/editors/ng/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.2 2000/12/15 20:02:01 wiz Exp $ +$NetBSD: patch-sum,v 1.3 2001/03/18 01:16:51 jun Exp $ -MD5 (patch-aa) = 01a8666c32877f67e89a12463f8c5be2 +MD5 (patch-aa) = 38931a750527d56ac5a557d6b4bbb3b3 diff --git a/editors/ng/patches/patch-aa b/editors/ng/patches/patch-aa index 8b09278f64c..c0d1220b9c6 100644 --- a/editors/ng/patches/patch-aa +++ b/editors/ng/patches/patch-aa @@ -1,24 +1,23 @@ -$NetBSD: patch-aa,v 1.2 2000/12/15 20:02:02 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2001/03/18 01:16:51 jun Exp $ ---- sys/bsd/Makefile.orig Tue Jun 27 10:48:02 2000 -+++ sys/bsd/Makefile Thu Sep 7 06:02:02 2000 -@@ -8,14 +8,17 @@ - # Modified for Ng 1.0 by Shigeki Yoshida (shige@csk.CO.JP) 1990.01.29 - +--- sys/bsd/Makefile.orig Sun Oct 1 00:59:42 2000 ++++ sys/bsd/Makefile Thu Feb 15 18:28:30 2001 +@@ -13,12 +13,15 @@ SYS = bsd --LIBS = -L/usr/pkg/lib -lcanna -ltermcap -+LIBS = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltermcap + + # Canna configurations (ex. for NetBSD) +-#CANNADEF = -DCANNA +-#CANNALIB = -L/usr/pkg/lib -lcanna +-#CANNAINC = -I/usr/pkg/include +.if ${USE_CANNA} == "YES" -+LIBS += -lcanna ++CANNADEF = -DCANNA ++CANNALIB = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lcanna ++CANNAINC = -I${PREFIX}/include ++.else + CANNADEF = + CANNALIB = + CANNAINC = +.endif + # CDEFS gets defines, and gets passed to lint. CFLAGS gets flags, and doesn't # get passed to lint. - # - # Now, compile time options are defined in a "config.h". - # - CDEFS = --CFLAGS = -O2 -I/usr/pkg/include $(CDEFS) -+CFLAGS = -O2 -I${PREFIX}/include $(CDEFS) - - # If your machine don't have an alloca(), please define ALLOCA. - #ALLOCA = alloca.o |