4 files changed, 31 insertions, 22 deletions

diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index d45a677e8e82..42920ea5be61 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -7,38 +7,51 @@
 
 PORTNAME=	scim-input-pad
 PORTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION} \
+		http://anthesphoria.net/FreeBSD/ports/distfiles/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	SCIM add-on to input various symbols with on-screen pad
+MAINTAINER=	nikola.lecic@anthesphoria.net
+COMMENT=	SCIM add-on to input various symbols with customisable on-screen pad
 
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+DESKTOP_ENTRIES="SCIM Input Pad" \
+		"${COMMENT}" \
+		"${PREFIX}/share/scim/icons/input-pad.png" \
+		"scim-input-pad" \
+		"Utility;" \
+		false
+
+DOCS=		ChangeLog README
+
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
 USE_GNOME=	intlhack
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+post-patch:
+	@${REINPLACE_CMD} -E 's|(SCIM_LIBEXECDIR=).*|\1${PREFIX}/lib/scim-1.0|' \
+		${WRKSRC}/configure
 
 post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/scim-input-pad/files/patch-src-Makefile.in b/textproc/scim-input-pad/files/patch-src-Makefile.in
deleted file mode 100644
index 5f25bc2f343f..000000000000
--- a/textproc/scim-input-pad/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	Fri May  6 22:24:19 2005
-+++ src/Makefile.in	Fri May  6 22:24:19 2005
-@@ -280,6 +280,7 @@
- 	    		  -I$(top_srcdir) \
- 	    		  -I$(top_srcdir)/intl \
- 			  -I$(top_srcdir)/src \
-+			  -I/usr/local/include \
- 			  -DSCIM_ICONDIR=\"@SCIM_ICONDIR@\" \
- 			  -DSCIM_INPUT_PAD_LOCALEDIR=\"$(datadir)/locale\" \
- 			  -DSCIM_INPUT_PAD_DATADIR=\"@SCIM_INPUT_PAD_DATADIR@\" \
diff --git a/textproc/scim-input-pad/pkg-descr b/textproc/scim-input-pad/pkg-descr
index 6c96891d45cf..65e08e959ac1 100644
--- a/textproc/scim-input-pad/pkg-descr
+++ b/textproc/scim-input-pad/pkg-descr
@@ -1,5 +1,8 @@
-scim-input-pad is an on-screen input pad that can be used to input symbols
-and key events very easily. It works with the SCIM input method platform.
+SCIM Input-Pad is an on-screen input pad that can be used to input symbols
+and key events very easily. It works with the SCIM input method platform and
+comes with predefined files for common symbols, some special keyboard events
+(such as dead keys and composing keys), Japanese Katakana and Hiragana
+symbols, Chinese numbers and radicals, etc.
 
 Smart Common Input Method platform, in short SCIM, is a development platform to
 make Input Method developers live easier. It has very clear architecture and
diff --git a/textproc/scim-input-pad/pkg-plist b/textproc/scim-input-pad/pkg-plist
index fb99a8b103e7..046ecd36b7d6 100644
--- a/textproc/scim-input-pad/pkg-plist
+++ b/textproc/scim-input-pad/pkg-plist
@@ -6,6 +6,8 @@ lib/libscim-input-pad.a
 lib/libscim-input-pad.la
 lib/libscim-input-pad.so
 lib/libscim-input-pad.so.0
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%NLS%%share/locale/de/LC_MESSAGES/scim-input-pad.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/scim-input-pad.mo
 %%NLS%%share/locale/it/LC_MESSAGES/scim-input-pad.mo
@@ -18,4 +20,5 @@ share/scim/input-pad/base.pad
 share/scim/input-pad/chinese.pad
 share/scim/input-pad/japanese.pad
 share/scim/input-pad/keyboard.pad
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/scim/input-pad