diff options
| author | sakamoto <sakamoto@pkgsrc.org> | 1999-09-03 04:11:07 +0000 |
|---|---|---|
| committer | sakamoto <sakamoto@pkgsrc.org> | 1999-09-03 04:11:07 +0000 |
| commit | c651898136c4df6d5afe10e7675d00ca906accdd (patch) | |
| tree | ffde62015ab40c33750f0ded4470f9d035ccdc36 /japanese | |
| parent | 580978d17c62db41c6ce062f91f5aba9d758ab38 (diff) | |
| download | pkgsrc-c651898136c4df6d5afe10e7675d00ca906accdd.tar.gz | |
Change version from v3 to 3.0
Fix default wnnlibdir(include ${LOCALBASE}/include/wnn/config.h).
Use LDFLAGS instead of "-L${LOCALBASE} -Wl,-rpath...".
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/kinput2/Makefile | 11 | ||||
| -rw-r--r-- | japanese/kinput2/files/patch-sum | 3 | ||||
| -rw-r--r-- | japanese/kinput2/patches/patch-aa | 10 |
3 files changed, 19 insertions, 5 deletions
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile index 43768771036..4177b127c4d 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 1999/08/24 10:56:53 sakamoto Exp $ +# $NetBSD: Makefile,v 1.4 1999/09/03 04:11:07 sakamoto Exp $ # FreeBSD Id: Makefile,v 1.4 1999/06/06 13:19:49 taoka Exp $ DISTNAME= kinput2-v3 +PKGNAME= kinput2-3.0 CATEGORIES= japanese MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/ @@ -20,24 +21,24 @@ IGNORE= "is ignored. because USE_CANNA,USE_WNN4,USE_WNN6,USE_SJ3 are \"NO\"" .if !defined(USE_CANNA) || ${USE_CANNA} == YES DEPENDS+= Canna-lib-3.5b2:../../japanese/canna-lib KINPUT2_DEF+= -DUseCanna -Dport_CANNASRC=${LOCALBASE}/include/canna \ - -Dport_CANNALIB="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -lcanna16" + -Dport_CANNALIB="${LDFLAGS} -lcanna16" .endif #.if defined(USE_WNN6) && ${USE_WNN6} == YES #DEPENDS+= #KINPUT2_DEF+= -DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn \ -# -Dport_WNNLIB="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -lwnn6 -lcrypt" +# -Dport_WNNLIB="${LDFLAGS} -lwnn6 -lcrypt" #.elif (!defined(USE_WNN4) || ${USE_WNN4} == YES) .if !defined(USE_WNN4) || ${USE_WNN4} == YES DEPENDS+= ja-FreeWnn-lib-1.10:../../japanese/freewnn-lib KINPUT2_DEF+= -DUseWnn -Dport_WNNINCDIR=${LOCALBASE}/include/wnn \ - -Dport_WNNLIB="-L${LOCALBASE}/lib -lwnn -lcrypt" + -Dport_WNNLIB="${LDFLAGS} -lwnn -lcrypt" .endif .if !defined(USE_SJ3) || ${USE_SJ3} == YES DEPENDS+= sj3-lib-2.0.1.20:../../japanese/sj3-lib KINPUT2_DEF+= -DUseSj3 -Dport_SJ3SRC=${LOCALBASE}/include \ - -Dport_SJ3LIB="-L${LOCALBASE}/lib -lsj3lib" + -Dport_SJ3LIB="${LDFLAGS} -lsj3lib" .endif MAKE_ENV+= PORT_IMAKE_DEFINES='${KINPUT2_DEF}' diff --git a/japanese/kinput2/files/patch-sum b/japanese/kinput2/files/patch-sum new file mode 100644 index 00000000000..8c58d16e0c2 --- /dev/null +++ b/japanese/kinput2/files/patch-sum @@ -0,0 +1,3 @@ +$NetBSD: patch-sum,v 1.1 1999/09/03 04:11:08 sakamoto Exp $ + +MD5 (patch-aa) = 0952d83a22466243015ee8924f484d8e diff --git a/japanese/kinput2/patches/patch-aa b/japanese/kinput2/patches/patch-aa new file mode 100644 index 00000000000..8baec40218a --- /dev/null +++ b/japanese/kinput2/patches/patch-aa @@ -0,0 +1,10 @@ +$NetBSD: patch-aa,v 1.1 1999/09/03 04:11:08 sakamoto Exp $ + +--- include/wnnlib.h.orig Thu May 27 08:55:22 1999 ++++ include/wnnlib.h Fri Sep 3 09:34:09 1999 +@@ -29,4 +29,5 @@ + #define _wnnlib_h + ++#include <config.h> + #include <commonhd.h> + #include <jllib.h> |