5 files changed, 25 insertions, 41 deletions

diff --git a/japanese/kanjipad/Makefile b/japanese/kanjipad/Makefile
index a11c5fc90730..381915f7cfde 100644
--- a/japanese/kanjipad/Makefile
+++ b/japanese/kanjipad/Makefile
@@ -6,21 +6,32 @@
 #
 
 PORTNAME=	kanjipad
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	japanese x11
-MASTER_SITES=	ftp://ftp.gtk.org/pub/users/otaylor/kanjipad/
+MASTER_SITES=	http://fishsoup.net/software/kanjipad/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Japanese Handwriting recognition
 
 USE_X_PREFIX=	yes
-USE_XLIB=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20
 USE_PERL5=	yes
+USE_GMAKE=	yes
+MAKE_ARGS=	OPTIMIZE="${CFLAGS}" PREFIX="${PREFIX}" \
+		GTKINC="`pkg-config --cflags gtk+-2.0`"
 
-post-install:
-	strip ${PREFIX}/bin/kanjipad
-	strip ${PREFIX}/bin/kpengine
+PORTDOCS=	README
+PLIST_FILES=	bin/kanjipad bin/kpengine %%DATADIR%%/jdata.dat
+PLIST_DIRS=	%%DATADIR%%
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/kanjipad ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/kpengine ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/jdata.dat ${DATADIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/kanjipad/distinfo b/japanese/kanjipad/distinfo
index 888d1603a3cf..f2ad4818df25 100644
--- a/japanese/kanjipad/distinfo
+++ b/japanese/kanjipad/distinfo
@@ -1,3 +1,3 @@
-MD5 (kanjipad-1.2.1.tar.gz) = df12d493b4bdb3defdff3d790b689b74
-SHA256 (kanjipad-1.2.1.tar.gz) = e04279e645bacda0f8fdb42883d730ec62adb354d150b913144c2c9ae84d4f1e
-SIZE (kanjipad-1.2.1.tar.gz) = 74287
+MD5 (kanjipad-2.0.0.tar.gz) = bdfe75534322840b3ff566e0a91c472d
+SHA256 (kanjipad-2.0.0.tar.gz) = 28272f61ec09c607a3578e3626e9e4fd43d1d9d1e21cb64328745766d00ee9e1
+SIZE (kanjipad-2.0.0.tar.gz) = 75930
diff --git a/japanese/kanjipad/files/patch-Makefile b/japanese/kanjipad/files/patch-Makefile
deleted file mode 100644
index d00d8b17b047..000000000000
--- a/japanese/kanjipad/files/patch-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	Sat Mar 30 17:12:23 2002
-+++ Makefile	Sat Mar 30 17:12:10 2002
-@@ -1,10 +1,10 @@
- OPTIMIZE=-g -Wall
- #OPTIMIZE=-O2 
- 
--GTKLIBS=`gtk-config --libs`
--GTKINC=`gtk-config --cflags`
-+GTKLIBS=`$(GTK_CONFIG) --libs`
-+GTKINC=`$(GTK_CONFIG) --cflags`
- 
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- DATADIR=$(PREFIX)/share
- 
- # location in which binaries are installed
-@@ -17,7 +17,7 @@
- ####### No editing should be needed below here ##########
- 
- OBJS = kpengine.o scoring.o util.o
--CFLAGS = $(OPTIMIZE) $(GTKINC) -DFOR_PILOT_COMPAT -DKP_LIBDIR=\"$(LIBDIR)\"
-+CFLAGS += $(OPTIMIZE) $(GTKINC) -DFOR_PILOT_COMPAT -DKP_LIBDIR=\"$(LIBDIR)\"
- 
- all: kpengine kanjipad jdata.dat
diff --git a/japanese/kanjipad/pkg-descr b/japanese/kanjipad/pkg-descr
index 6815b2c7d676..60db9db3c52e 100644
--- a/japanese/kanjipad/pkg-descr
+++ b/japanese/kanjipad/pkg-descr
@@ -1,8 +1,9 @@
-KanjiPad - Japanese Handwriting recognition - By Owen Taylor <otaylor@gtk.org>
+KanjiPad - Japanese Handwriting recognition
 
 KanjiPad is a very simple program for handwriting recognition -
 The user draws a character into the box, then requests translation.
 The best candidates are displayed along the right hand side of
 the window and can be selected for pasting into other programs.
 
-WWW: http://www.gtk.org/~otaylor/kanjipad/
+Author: Owen Taylor <otaylor@fishsoup.net>
+WWW: http://fishsoup.net/software/kanjipad/
diff --git a/japanese/kanjipad/pkg-plist b/japanese/kanjipad/pkg-plist
deleted file mode 100644
index 44b979fabc68..000000000000
--- a/japanese/kanjipad/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/kanjipad
-bin/kpengine
-share/kanjipad/jdata.dat
-@dirrm share/kanjipad