- Update to 2.05.

- Install English manpage and more documents, and do not install a
  copy of GPL.

- Support NOPORTDOCS properly.

- Add WWW.

- Hand maintainership over to the submitter. (MAINTAINER timeout)

7 files changed, 39 insertions, 156 deletions

diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile
index 916b8cfbef8e..9ce1725b15cc 100644
--- a/japanese/skkinput/Makefile
+++ b/japanese/skkinput/Makefile
@@ -6,26 +6,40 @@
 #
 
 PORTNAME=	skkinput
-PORTVERSION=	2.03
+PORTVERSION=	2.05
 CATEGORIES=	japanese x11
-MASTER_SITES=	http://member.nifty.ne.jp/Tatari_SAKAMOTO/
+MASTER_SITES=	http://downloads.sourceforge.jp/skkinput2/864/
 
-MAINTAINER=	yasuf@big.or.jp
+MAINTAINER=	koma2@jiro.c.u-tokyo.ac.jp
 
+USE_IMAKE=	yes
+
+.include <bsd.port.pre.mk>
+
+# sanity check
+.if defined(WITH_DBSKKD) && defined(WITH_RSKKSERV)
+.error Cannot define both WITH_DBSKKD and WITH_RSKKSERV simultaneously.
+.endif
+
+.if defined(WITH_DBSKKD) || exists(${LOCALBASE}/libexec/dbskkd-cdb) && !defined(WITH_RSKKSERV)
+RUN_DEPENDS=	${LOCALBASE}/libexec/dbskkd-cdb:${PORTSDIR}/japanese/dbskkd-cdb
+.elif defined(WITH_RSKKSERV) || exists(${LOCALBASE}/libexec/rskkserv) && !defined(WITH_DBSKKD)
+RUN_DEPENDS=	${LOCALBASE}/libexec/rskkserv:${PORTSDIR}/japanese/rskkserv
+.else
 RUN_DEPENDS=	${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skkserv
+.endif
 
-USE_IMAKE=	yes
-MANLANG=	ja
+MANLANG=	"" ja
 MAN1=		skkinput.1
 MANCOMPRESSED=	yes
 
-DOCS=		*.jis skkinput.doc myeval/skkinputlisp.doc dot.skkinput
+DOCS=		*.jis ChangeLog skkinput.doc \
+		myeval/skkinputlisp.doc dot.skkinput
 
-post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/skkinput
-	@( cd ${WRKSRC} ; \
-	   ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/skkinput )
+post-install:
+	@${MKDIR} ${DOCSDIR}
+	@( cd ${WRKSRC} ; ${INSTALL_DATA} ${DOCS} ${DOCSDIR})
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/skkinput/distinfo b/japanese/skkinput/distinfo
index 5fab6a4c8938..92698e2c889c 100644
--- a/japanese/skkinput/distinfo
+++ b/japanese/skkinput/distinfo
@@ -1 +1 @@
-MD5 (skkinput-2.03.tar.gz) = 74c08620e8e916a3d56f3bb3e85a5d62
+MD5 (skkinput-2.05.tar.gz) = a3f521a4391d31ce685a7d5d9f21391f
diff --git a/japanese/skkinput/files/patch-aa b/japanese/skkinput/files/patch-aa
deleted file mode 100644
index 7b14bafd3f1a..000000000000
--- a/japanese/skkinput/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- Imakefile.org	Wed Jan 28 19:19:42 1998
-+++ Imakefile	Wed Jan 28 19:19:55 1998
-@@ -1,5 +1,7 @@
- XCOMM $ Imakefile for skkinput,v 0.10 96/10/16 12:45 $
- 
-+MANDIR	=	${PREFIX}/man/ja/man1
-+
- /* SKK Server Address */
- #define SkkServer	localhost
- 
diff --git a/japanese/skkinput/files/patch-ab b/japanese/skkinput/files/patch-ab
deleted file mode 100644
index 2c821d423f75..000000000000
--- a/japanese/skkinput/files/patch-ab
+++ /dev/null
@@ -1,111 +0,0 @@
---- imattr.c.orig	Tue Mar  3 20:58:22 1998
-+++ imattr.c	Fri Mar 19 14:24:12 1999
-@@ -127,6 +127,11 @@
- static int getFontSet( IMIC *, unsigned int, int, int, char *, int ) ;
- static int getLineSpace( IMIC *, unsigned int, int, int, char *, int ) ;
- static int getCursor( IMIC *, unsigned int, int, int, char *, int ) ;
-+ 
-+#ifndef	ORIGINAL
-+static int setFilterEvents( IMIC *, char *, int, int, int, int );
-+static int getFilterEvents( IMIC *, unsigned int, int, int, char *, int );
-+#endif
- 
- static ICAttribute icAttributes[] = {
-   { XNInputStyle, TYPE_CARD32, OP_C|OP_G,
-@@ -135,6 +140,8 @@
-     setClientWindow, getClientWindow },
-   { XNFocusWindow, TYPE_WINDOW, OP_C|OP_S|OP_G,
-     setFocusWindow, getFocusWindow },
-+  { XNFilterEvents, TYPE_CARD32, OP_C|OP_S|OP_G,
-+    setFilterEvents, getFilterEvents },
-   { XNPreeditAttributes, TYPE_NESTED_LIST, OP_C|OP_S|OP_G,
-     setPreeditAttributes, getPreeditAttributes },
-   { XNStatusAttributes, TYPE_NESTED_LIST, OP_C|OP_S|OP_G,
-@@ -495,6 +502,26 @@
-   return 0 ;
- }
- 
-+#ifndef	ORIGINAL
-+/* ARGSUSED */
-+static int
-+setFilterEvents
-+( IMIC *icp, char *value, int len, int order, int nest, int op )
-+{
-+  unsigned long filter_events;
-+
-+  CHECK_ICATTR_SIZE(4, IMBadSomething);
-+
-+  filter_events = (unsigned long)getC32(value, order);
-+
-+  if (!(icp->common_attr.set_mask & ATTR_MASK_FILTER_EVENTS) ||
-+      filter_events != icp->common_attr.filter_events) {
-+    icp->common_attr.change_mask |= ATTR_MASK_FILTER_EVENTS;
-+  }
-+  return 0;
-+}
-+#endif
-+
- /* ARGSUSED */
- static int setPreeditAttributes
- ( IMIC *icp, char *value, int len, int order, int nest, int op )
-@@ -1061,6 +1088,35 @@
-   }
- }
- 
-+#ifndef	ORIGINAL
-+/* ARGSUSED */
-+static int
-+getFilterEvents
-+( IMIC *icp, unsigned int id, int nest, int offset,
-+  char *data, int len )
-+{
-+  IMConnection *conn = icp->im->connection;
-+
-+  if (!(icp->common_attr.set_mask & ATTR_MASK_FILTER_EVENTS)) {
-+    /* fill default value */
-+    fillCommonDefault(icp, (unsigned long)ATTR_MASK_FILTER_EVENTS);
-+  }
-+
-+  if (icp->common_attr.set_mask & ATTR_MASK_FILTER_EVENTS) {
-+    IMPutC16(conn, id);		/* attribute ID */
-+    IMPutC16(conn, 4);		/* value length */
-+    IMPutC32(conn, icp->common_attr.filter_events);
-+  }
-+  else {
-+    /* no default is available */
-+    IMCancelRequest(conn, offset);
-+    IMSendError(conn, IMBadSomething, icp->im->id, icp->id,
-+                "filter events not specified yet");
-+    return -1;
-+  }
-+}
-+#endif
-+
- /* ARGSUSED */
- static int getArea
- ( IMIC *icp, unsigned int id, int nest,
-@@ -1383,6 +1439,12 @@
-       icp->focus_profile = icp->client_profile ;
-     }
-   }
-+#ifndef	ORIGINAL
-+  if (mask & ATTR_MASK_FILTER_EVENTS) {
-+    ap->filter_events = NoEventMask;
-+    ap->set_mask |= ATTR_MASK_FILTER_EVENTS;
-+  }
-+#endif
- }
- 
- static int getNaturalLineSpace( IMIC *icp )
-@@ -1520,6 +1582,11 @@
-       SENDERROR( IMBadFocusWindow, "invalid focus window ID" ) ;
-     }
-   }
-+#ifndef	ORIGINAL
-+  if (mask & ATTR_MASK_FILTER_EVENTS) {
-+    SENDERROR(IMBadSomething, "filter events not support");
-+  }
-+#endif
- 
-   return ret ;
- #undef SENDERROR
diff --git a/japanese/skkinput/files/patch-ac b/japanese/skkinput/files/patch-ac
deleted file mode 100644
index be59901419be..000000000000
--- a/japanese/skkinput/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- im.h.orig	Tue Mar  3 21:08:33 1998
-+++ im.h	Fri Mar 19 14:10:22 1999
-@@ -148,6 +148,10 @@
-     XIMStyle input_style ;
-     Window client ;			/* client window */
-     Window focus ;			/* focus window */
-+#ifndef	ORIGINAL
-+#define ATTR_MASK_FILTER_EVENTS	(1<<3)
-+    unsigned long filter_events;	/* Event mask that IM need */
-+#endif
- } IMCommonAttributes;
- 
- typedef struct {
diff --git a/japanese/skkinput/pkg-descr b/japanese/skkinput/pkg-descr
index 8e08fa44b934..ea1b78bea330 100644
--- a/japanese/skkinput/pkg-descr
+++ b/japanese/skkinput/pkg-descr
@@ -8,3 +8,5 @@ client.
 
 The port was done by Murata Shuuichirou <mrt@mickey.ai.kyutech.ac.jp>.
 It requires skk server.
+
+WWW: http://skkinput2.sourceforge.jp/
diff --git a/japanese/skkinput/pkg-plist b/japanese/skkinput/pkg-plist
index a5c69227c148..74fabcea3ca8 100644
--- a/japanese/skkinput/pkg-plist
+++ b/japanese/skkinput/pkg-plist
@@ -1,12 +1,13 @@
 bin/skkinput
 lib/X11/app-defaults/Skkinput
-share/doc/skkinput/BUGS.jis
-share/doc/skkinput/CHANGES.jis
-share/doc/skkinput/FAQ.jis
-share/doc/skkinput/PROGRAM.jis
-share/doc/skkinput/README.jis
-share/doc/skkinput/TODO.jis
-share/doc/skkinput/dot.skkinput
-share/doc/skkinput/skkinput.doc
-share/doc/skkinput/skkinputlisp.doc
-@dirrm share/doc/skkinput
+%%PORTDOCS%%share/doc/skkinput/BUGS.jis
+%%PORTDOCS%%share/doc/skkinput/CHANGES.jis
+%%PORTDOCS%%share/doc/skkinput/ChangeLog
+%%PORTDOCS%%share/doc/skkinput/FAQ.jis
+%%PORTDOCS%%share/doc/skkinput/PROGRAM.jis
+%%PORTDOCS%%share/doc/skkinput/README.jis
+%%PORTDOCS%%share/doc/skkinput/TODO.jis
+%%PORTDOCS%%share/doc/skkinput/dot.skkinput
+%%PORTDOCS%%share/doc/skkinput/skkinput.doc
+%%PORTDOCS%%share/doc/skkinput/skkinputlisp.doc
+%%PORTDOCS%%@dirrm share/doc/skkinput