From 2f5e48669a217584c8d10452663d4fe2e0a9c822 Mon Sep 17 00:00:00 2001 From: sakamoto Date: Mon, 10 Jun 2002 10:21:25 +0000 Subject: bump PKGREVISION. add buildlink.mk. use devel/nbitools instead of ${X11BASE}/xmkmf. --- inputmethod/sj3-lib/Makefile | 10 ++++++++-- inputmethod/sj3-lib/PLIST | 2 +- inputmethod/sj3-lib/buildlink.mk | 34 ++++++++++++++++++++++++++++++++++ inputmethod/sj3-lib/distinfo | 4 ++-- inputmethod/sj3-lib/patches/patch-aa | 2 +- inputmethod/sj3-lib/patches/patch-ab | 2 +- inputmethod/sj3-lib/patches/patch-ac | 2 +- inputmethod/sj3-lib/patches/patch-ad | 4 ++-- inputmethod/sj3-lib/patches/patch-ae | 2 +- inputmethod/sj3-lib/patches/patch-af | 2 +- inputmethod/sj3-lib/patches/patch-ag | 2 +- 11 files changed, 53 insertions(+), 13 deletions(-) create mode 100644 inputmethod/sj3-lib/buildlink.mk (limited to 'inputmethod/sj3-lib') diff --git a/inputmethod/sj3-lib/Makefile b/inputmethod/sj3-lib/Makefile index 6805c8c965a..d7d782eee35 100644 --- a/inputmethod/sj3-lib/Makefile +++ b/inputmethod/sj3-lib/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:00:27 seb Exp $ +# $NetBSD: Makefile,v 1.2 2002/06/10 10:21:25 sakamoto Exp $ # FreeBSD Id: Makefile,v 1.9 1998/11/28 05:08:27 asami Exp $ DISTNAME= sj3-2.0.1.20 PKGNAME= sj3-lib-2.0.1.20 +PKGREVISION= 1 CATEGORIES= japanese inputmethod MASTER_SITES= ftp://ftp.sony.co.jp/pub/unsupported/src/ \ ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/ @@ -10,12 +11,17 @@ MASTER_SITES= ftp://ftp.sony.co.jp/pub/unsupported/src/ \ MAINTAINER= tech-pkg-ja@jp.netbsd.org COMMENT= Japanese input method (library) +.include "../../mk/bsd.prefs.mk" + +MAKE_ENV+= IMDICTDIR=${IMDICTDIR} + pre-configure: @${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig @${SED} -e 's|\(SUBDIRS = \).*\(sj3lib\).*|\1\2|' \ ${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile do-configure: - @(cd ${WRKSRC}; ${X11BASE}/bin/xmkmf; ${MAKE} Makefiles) + @(cd ${WRKSRC}; ${XMKMF_CMD}; ${MAKE} Makefiles) +.include "../../devel/nbitools/nbitools.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/sj3-lib/PLIST b/inputmethod/sj3-lib/PLIST index a65abfd4359..ccf66d2a1cf 100644 --- a/inputmethod/sj3-lib/PLIST +++ b/inputmethod/sj3-lib/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:27 seb Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/06/10 10:21:25 sakamoto Exp $ include/sj3lib.h lib/libsj3lib.a diff --git a/inputmethod/sj3-lib/buildlink.mk b/inputmethod/sj3-lib/buildlink.mk new file mode 100644 index 00000000000..f7724f79aff --- /dev/null +++ b/inputmethod/sj3-lib/buildlink.mk @@ -0,0 +1,34 @@ +# $NetBSD: buildlink.mk,v 1.1 2002/06/10 10:21:25 sakamoto Exp $ +# +# This Makefile fragment is included by packages that use sj3. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.sj3 to the dependency pattern +# for the version of sj3 desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(SJ3_BUILDLINK_MK) +SJ3_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.sj3?= sj3-lib>=2.0.1.20nb1 +DEPENDS+= ${BUILDLINK_DEPENDS.sj3}:../../inputmethod/sj3-lib + +EVAL_PREFIX+= BUILDLINK_PREFIX.sj3=sj3-lib +BUILDLINK_PREFIX.sj3_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.sj3= include/sj3lib.h +BUILDLINK_FILES.sj3+= lib/libsj3lib.a + +BUILDLINK_TARGETS.sj3= sj3-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.sj3} + +pre-configure: ${BUILDLINK_TARGETS.sj3} +sj3-buildlink: _BUILDLINK_USE + +.endif # SJ3_BUILDLINK_MK diff --git a/inputmethod/sj3-lib/distinfo b/inputmethod/sj3-lib/distinfo index 8a6f59f3f22..236f55c3819 100644 --- a/inputmethod/sj3-lib/distinfo +++ b/inputmethod/sj3-lib/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:00:27 seb Exp $ +$NetBSD: distinfo,v 1.2 2002/06/10 10:21:25 sakamoto Exp $ SHA1 (sj3-2.0.1.20.tar.gz) = b1cae59065ebc9caf5e198143ceb9558c932f259 Size (sj3-2.0.1.20.tar.gz) = 584065 bytes SHA1 (patch-aa) = e2c60ca8709f8b78833ebc4f506b4cc63812a5bd SHA1 (patch-ab) = a64f78ccb3db3f4349f191abe47c6daebb2bbadd SHA1 (patch-ac) = a2a9c21618e7de1e56d371cb05cf866d549d50a1 -SHA1 (patch-ad) = be015448eb4ee267a2228838cc2a08e2586b0a85 +SHA1 (patch-ad) = 6f45996f04f894e28f2dd5d1276c31b3c6a7b12a SHA1 (patch-ae) = 3b07eb2ea9d72049a8f322220836a631598ea7dc SHA1 (patch-af) = 33ac72303dfa13929d423ecaf5d9b7cb308f8ff5 SHA1 (patch-ag) = b01fda538eb70a8f66cd42bcc719e24da848929f diff --git a/inputmethod/sj3-lib/patches/patch-aa b/inputmethod/sj3-lib/patches/patch-aa index 8857af6cf48..2aa679cf098 100644 --- a/inputmethod/sj3-lib/patches/patch-aa +++ b/inputmethod/sj3-lib/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:00:27 seb Exp $ +$NetBSD: patch-aa,v 1.2 2002/06/10 10:21:26 sakamoto Exp $ diff -arcN ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms ./doc/doc/sj3lib.ms *** ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms Fri Jun 3 17:00:49 1994 diff --git a/inputmethod/sj3-lib/patches/patch-ab b/inputmethod/sj3-lib/patches/patch-ab index 6ba8de99e41..12bf413f114 100644 --- a/inputmethod/sj3-lib/patches/patch-ab +++ b/inputmethod/sj3-lib/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:27 seb Exp $ +$NetBSD: patch-ab,v 1.2 2002/06/10 10:21:26 sakamoto Exp $ --- include/Const.h.orig Thu Jan 23 12:20:52 1997 +++ include/Const.h Wed Dec 8 10:33:54 1999 diff --git a/inputmethod/sj3-lib/patches/patch-ac b/inputmethod/sj3-lib/patches/patch-ac index 1bbd2cd32d7..0e18e8002d9 100644 --- a/inputmethod/sj3-lib/patches/patch-ac +++ b/inputmethod/sj3-lib/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:00:27 seb Exp $ +$NetBSD: patch-ac,v 1.2 2002/06/10 10:21:26 sakamoto Exp $ --- dict/dict/Imakefile.~1~ Thu Jan 23 20:20:51 1997 +++ dict/dict/Imakefile Tue Aug 18 10:51:14 1998 diff --git a/inputmethod/sj3-lib/patches/patch-ad b/inputmethod/sj3-lib/patches/patch-ad index d287141a79b..80ab4563265 100644 --- a/inputmethod/sj3-lib/patches/patch-ad +++ b/inputmethod/sj3-lib/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:00:27 seb Exp $ +$NetBSD: patch-ad,v 1.2 2002/06/10 10:21:26 sakamoto Exp $ --- sj3.tmpl.orig Thu Jan 23 20:20:58 1997 +++ sj3.tmpl Fri Jul 30 20:27:08 1999 @@ -14,7 +14,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:00:27 seb Exp $ -SJ3CONFDIR = $(SJ3TOP)/lib/sj3 -SJ3DICTDIR = $(SJ3CONFDIR)/dict +SJ3CONFDIR = $(SJ3TOP)/share/sj3 -+SJ3DICTDIR = $(DICT_DIR)/sj3 ++SJ3DICTDIR = $(IMDICTDIR)/sj3 /* * Change for FreeBSD. diff --git a/inputmethod/sj3-lib/patches/patch-ae b/inputmethod/sj3-lib/patches/patch-ae index 65ef5a725bb..1e6ece5eebb 100644 --- a/inputmethod/sj3-lib/patches/patch-ae +++ b/inputmethod/sj3-lib/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:27 seb Exp $ +$NetBSD: patch-ae,v 1.2 2002/06/10 10:21:26 sakamoto Exp $ --- include/Paths.h.in.orig Thu Jan 23 20:20:57 1997 +++ include/Paths.h.in Tue Aug 18 11:29:00 1998 diff --git a/inputmethod/sj3-lib/patches/patch-af b/inputmethod/sj3-lib/patches/patch-af index 3bb6087913c..63be34b9ba5 100644 --- a/inputmethod/sj3-lib/patches/patch-af +++ b/inputmethod/sj3-lib/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:00:27 seb Exp $ +$NetBSD: patch-af,v 1.2 2002/06/10 10:21:26 sakamoto Exp $ --- server/main.c.orig Mon Mar 23 19:48:03 1998 +++ server/main.c Mon Aug 2 19:26:45 1999 diff --git a/inputmethod/sj3-lib/patches/patch-ag b/inputmethod/sj3-lib/patches/patch-ag index 06bf917595c..f91171ba3b0 100644 --- a/inputmethod/sj3-lib/patches/patch-ag +++ b/inputmethod/sj3-lib/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:00:27 seb Exp $ +$NetBSD: patch-ag,v 1.2 2002/06/10 10:21:26 sakamoto Exp $ --- server/setup.c.orig Mon May 7 12:15:08 2001 +++ server/setup.c Mon May 7 12:50:19 2001 -- cgit v1.2.3