- bump to 1.10 to 1.1.1-a021

   See ChangeLog, ChangeLog.en
   (too many lines to be listed here)

   Please note minimum security fixes had been updated after
   1.10 was committed, so not really whole thing between 1.10
   and 1.1.1-a021

 - And more, a021 to a022 (CVS version) equivalent patches
 - Thus
   PKGNAME=   ja-FreeWnn-{lib,server}-1.11alpha22
 - DESTDIR support  (That's why a022 patches added)
 - package structure adjusted
   from (-lib -dict -server -server-bin) to (-lib -server)
   for minimum modification from DISTFILE to pkgsrc.
 - some common VARIABLES have been moved to ja-freewnn-lib/Makefile.common

ja-freewnn-dict/{DESCR,Makefile,PLIST}
ja-freewnn-server-bin/{DESCR,Makefile}
  Removed

ja-freewnn-lib/Makefile.common
  More variables moved in

ja-freewnn-lib/patches
  70 files added for a021 -> a022 updates

ja-freewnn-server/PLIST
  - some executable moved sbin to bin
    by following line in Makefile
   +CONFIGURE_ARGS+=       --disable-traditional-layout

  - 23 of dictionary files in share/wnn/ja_JP/dic
    moved from ja-freewnn-dict/PLIST to ja-freewnn-server/PLIST

Thanks obache@ for correcting/proofreading for above Changes.

1 files changed, 25 insertions, 82 deletions

diff --git a/inputmethod/ja-freewnn-lib/Makefile.common b/inputmethod/ja-freewnn-lib/Makefile.common
index b01244e7ff2..22aa67eedf8 100644
--- a/inputmethod/ja-freewnn-lib/Makefile.common
+++ b/inputmethod/ja-freewnn-lib/Makefile.common
@@ -1,92 +1,35 @@
-# $NetBSD: Makefile.common,v 1.15 2008/08/15 02:43:50 obache Exp $
-#
+# $NetBSD: Makefile.common,v 1.16 2011/09/13 07:23:16 mef Exp $
+# used by inputmethod/ja-freewnn-server/Makefile
+# used by inputmethod/ja-freewnn-lib/Makefile
 
-DISTNAME=	FreeWnn-1.10
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=freewnn/11067/}	\
-		ftp://ftp.st.ryukoku.ac.jp/pub/japanese-im/FreeWnn/
+DISTNAME=	FreeWnn-1.1.1-a021
+MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE_JP:=freewnn/17724/}   \
+                ftp://ftp.st.ryukoku.ac.jp/pub/japanese-im/FreeWnn/
+CATEGORIES=	inputmethod
 
-PATCH_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=freewnn/11075/}	\
-		ftp://ftp.st.ryukoku.ac.jp/pub/japanese-im/FreeWnn/
-PATCHFILES=	patch-1.1.0-a01.gz
-PATCH_DIST_STRIP=	-p2
-DIST_SUBDIR=	freewnn
+MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
+HOMEPAGE=	http://freewnn.sourceforge.jp/
+COMMENT=	Japanese/Chinese/Korean input method
+LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/Xsi
-INSTALL_TARGET=	install install.man
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-.include "../../mk/bsd.prefs.mk"
-WNNOWNER?=	${FREEWNN_USER}
-SEDSCRIPT+=	-e 's|\(WNNOWNER = \).*|\1${WNNOWNER}|'
-SEDSCRIPT+=	-e 's|\([JCKT]\)\(WNNDICDIR = \).*|\1\2${IMDICTDIR}/wnn/$$(\1WNNLANG)|'
-
-PKG_USERS_VARS+=	WNNOWNER FREEWNN_USER
-
-.if defined(WNN_TARGET) && (${WNN_TARGET} == "SERVER")
-MAKE_ENV+=	"WNN_TARGET=SERVER"
-SEDSCRIPT+=	-e 's|$$([CK]*WNNJLIBSRC)/lib\([ck]*wnn\).a|-l\1|'
-SEDSCRIPT+=	-e 's|\(:.*\)$$(WNNJLIB)|\1|'
-.elif defined(WNN_TARGET) && (${WNN_TARGET} == "DICT")
-MAKE_ENV+=	"WNN_TARGET=DICT"
-.else
-MAKE_ENV+=	"WNN_TARGET=LIBRARY"
-.endif
-
-.if defined(WNNDIR)
-MAKE_ENV+=	"WNNDIR=${WNNDIR}"
-.endif
-.if defined(CWNNDIR)
-MAKE_ENV+=	"CWNNDIR=${CWNNDIR}"
-.endif
-.if defined(KWNNDIR)
-MAKE_ENV+=	"KWNNDIR=${KWNNDIR}"
-.endif
+USE_LIBTOOL=	YES
 
 GNU_CONFIGURE=	YES
 
-post-patch:
-	@for file in `${FIND} ${WRKSRC} -name Makefile.in -print`; do	\
-		${MV} $$file $$file.orig;			\
-		${SED} -e '/PREFIX = /d'			\
-			-e 's|\(WNNBINDIR = $${PREFIX}/\)\(bin\)|\1s\2|' \
-			-e 's|\([CK]*WNNBINDIR = $$(WNNBINDIR)\)/[ck]*Wnn4|\1|'\
-			-e 's|\(WNNWNNDIR = $${PREFIX}/\)lib\(/wnn\)|\1share\2|'\
-			-e 's|\(MANPATH = .*/\)man|\1$${PKGMANDIR}|'\
-			-e '/(COMPRESSMANCMD) /d'		\
-			-e 's|\/usr\/X11R6|$${PREFIX}|'		\
-			${SEDSCRIPT}				\
-			$$file.orig > $$file;			\
-	done
-	@for file in `${FIND} ${WRKSRC}/Wnn/man -name Makefile.in -print`; do\
-		${MV} $$file $$file.orig2;				\
-		${SED} -e 's|\(MANPATH = .*\)|\1/ja_JP.EUC|'		\
-			$$file.orig2 > $$file;				\
-	done
-	@(cd ${WRKSRC}/Wnn/include;				\
-		${MV} config.h config.h.orig;			\
-		${SED} -e 's|^\(\#define	LIBDIR		"\)/usr/local/lib\(/wnn"\)|\1${PREFIX}/share\2|' \
-			config.h.orig > config.h)
-
-.if defined(WNN_TARGET) && (${WNN_TARGET} == "SERVER")
-post-build:
-	@${MV} ${WRKSRC}/Wnn/jd/jserverrc ${WRKSRC}/Wnn/jd/jserverrc.orig
-	@${SED} -e 's|^\(jserver_dir\).*|\1 ${IMDICTDIR}/wnn/${WNN_LANG}|' \
-		${WRKSRC}/Wnn/jd/jserverrc.orig > ${WRKSRC}/Wnn/jd/jserverrc
-.endif
+FILESDIR=       ${.CURDIR}/../../inputmethod/ja-freewnn-lib/files
+DISTINFO_FILE=  ${.CURDIR}/../../inputmethod/ja-freewnn-lib/distinfo
+PATCHDIR=       ${.CURDIR}/../../inputmethod/ja-freewnn-lib/patches
 
-.if defined(WNN_TARGET) && (${WNN_TARGET} == "DICT")
-EVAL_PREFIX+=	WNNSERVERBINDIR=ja-FreeWnn-server-bin
+# will be taka care with pkg INSTALL script
+INSTALL_MAKE_FLAGS+=	WNNTOUCH=${TRUE}
+INSTALL_MAKE_FLAGS+=	WNNOWNER=${ROOT_USER}
 
-pre-build:
-	@for file in `${FIND} ${WRKSRC}/Wnn/pubdic ${WRKSRC}/Wnn/wnncons -name Makefile -print`; do	\
-		${MV} $$file $$file.orig2;				\
-		${SED} -e 's|\(ATOD = \).*|\1${WNNSERVERBINDIR}/sbin/atod|' \
-			-e 's|\(ATOF = \).*|\1${WNNSERVERBINDIR}/sbin/atof|' \
-			-e 's|\(WNNTOUCH = \).*|\1${WNNSERVERBINDIR}/sbin/wnntouch|' \
-			$$file.orig2 > $$file;				\
-	done;
-	@${MV} ${WRKSRC}/Wnn/Makefile ${WRKSRC}/Wnn/Makefile.orig2
-	@${SED} -e 's|\(MKDIRHIER.*=\).*|\1 ${TRUE}|' \
-		${WRKSRC}/Wnn/Makefile.orig2 > ${WRKSRC}/Wnn/Makefile
-.endif
+WNNDICTDIR=		${IMDICTDIR}/wnn
+FILES_SUBST=		WNNDICTDIR=${WNNDICTDIR}
 
-.include "../../mk/bsd.pkg.mk"
+SUBST_CLASSES+=		imdictdir
+SUBST_STAGE.imdictdir=	post-extract
+SUBST_SED.imdictdir=	-e 's|@LIBDIR/@LANG/dic|${WNNDICTDIR}/@LANG|'
+SUBST_FILES.imdictdir=	Wnn/jd/jserverrc