diff options
| author | sakamoto <sakamoto> | 2002-06-10 12:37:42 +0000 |
|---|---|---|
| committer | sakamoto <sakamoto> | 2002-06-10 12:37:42 +0000 |
| commit | 1434d3f2b3bce6a2e60cf20c3fde00f38392d2a6 (patch) | |
| tree | 7872e19428567e2e4bff0d151634b38f720323c2 /editors/ng | |
| parent | 7e1389544fc8cb566e71743ad069181376d2c672 (diff) | |
| download | pkgsrc-1434d3f2b3bce6a2e60cf20c3fde00f38392d2a6.tar.gz | |
use inputmethod/canna-lib/buildlink.mk and fix CANNAINC, CANNALIB.
Diffstat (limited to 'editors/ng')
| -rw-r--r-- | editors/ng/Makefile | 5 | ||||
| -rw-r--r-- | editors/ng/distinfo | 4 | ||||
| -rw-r--r-- | editors/ng/patches/patch-aa | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/editors/ng/Makefile b/editors/ng/Makefile index b73e194a501..fde661dbd46 100644 --- a/editors/ng/Makefile +++ b/editors/ng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/05/31 15:19:56 seb Exp $ +# $NetBSD: Makefile,v 1.11 2002/06/10 12:37:42 sakamoto Exp $ DISTNAME= ng-1.4.3 CATEGORIES= editors japanese @@ -15,8 +15,7 @@ USE_CANNA= YES .endif .if ${USE_CANNA} == "YES" -DEPENDS= Canna-lib>=3.5.2:../../inputmethod/canna-lib -USE_X11= YES +.include "../../inputmethod/canna-lib/buildlink.mk" .endif WRKSRC= ${WRKDIR}/ng diff --git a/editors/ng/distinfo b/editors/ng/distinfo index a8061bd2671..39ef3b59b8e 100644 --- a/editors/ng/distinfo +++ b/editors/ng/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/04/14 15:07:16 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/06/10 12:37:42 sakamoto Exp $ SHA1 (ng-1.4.3.tar.gz) = b5200da6c41f0e4d1d232a1a0c9548f8a37a96e2 Size (ng-1.4.3.tar.gz) = 586587 bytes -SHA1 (patch-aa) = c7a0417f222b5fbfd5664ebce5ed33bd11a532de +SHA1 (patch-aa) = 0df9627b2dc337df879d982fe51a8293b65f3155 diff --git a/editors/ng/patches/patch-aa b/editors/ng/patches/patch-aa index 711af363784..03a426b54ac 100644 --- a/editors/ng/patches/patch-aa +++ b/editors/ng/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2002/04/14 15:07:18 jlam Exp $ +$NetBSD: patch-aa,v 1.5 2002/06/10 12:37:43 sakamoto Exp $ --- sys/bsd/Makefile.orig Sun Oct 1 00:59:42 2000 +++ sys/bsd/Makefile Thu Feb 15 18:28:30 2001 @@ -11,8 +11,8 @@ $NetBSD: patch-aa,v 1.4 2002/04/14 15:07:18 jlam Exp $ -#CANNAINC = -I/usr/pkg/include +.if ${USE_CANNA} == "YES" +CANNADEF = -DCANNA -+CANNALIB = -Wl,-R${X11PREFIX}/lib -L${X11PREFIX}/lib -lcanna -+CANNAINC = -I${X11PREFIX}/include ++CANNALIB = ${LDFLAGS} -lcanna ++CANNAINC = ${CPPFLAGS} +.else CANNADEF = CANNALIB = |