Date: Tue, 3 Nov 2009 09:07:40 +0100 (CET) From: Nikola Lecic <nikola.lecic@anthesphoria.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/140239: [Patch] textproc/scim-input-pad: Unbreak startup, add docs, icon, cleanup, take maintainership Message-ID: <200911030807.nA387els099713@anthesphoria.net> Resent-Message-ID: <200911030810.nA38A7T8062452@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140239
>Category: ports
>Synopsis: [Patch] textproc/scim-input-pad: Unbreak startup, add docs, icon, cleanup, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 03 08:10:07 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Nikola Lecic
>Release: FreeBSD 8.0-RC2 i386
>Organization:
>Environment:
System: FreeBSD xxx 8.0-RC2 FreeBSD 8.0-RC2 #0: Fri Oct 30 09:13:38 CET 2009 nikola@xxx:/usr/obj/usr/src/sys/GENERIC i386
>Description:
This patch:
* unbreaks startup from the command-line/menu due to wrong SCIM_LIBEXECDIR;
* simplifies Makefile (removes many unnecessary directives and the patch);
* adds documentation (README explains the syntax how to create custom tables);
* adds DESKTOP_ENTRIES;
* improves pkg-descr;
* passes maintainership to the submitter.
The patch leaves files/patch-src-Makefile.in (and eo ipso files/) empty.
>How-To-Repeat:
>Fix:
--- scim-input-pad-0.1.2_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/scim-input-pad/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 2 Nov 2009 19:11:15 -0000 1.23
+++ Makefile 3 Nov 2009 07:52:25 -0000
@@ -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>
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/textproc/scim-input-pad/pkg-descr,v
retrieving revision 1.2
diff -u -r1.2 pkg-descr
--- pkg-descr 17 Jul 2006 12:46:42 -0000 1.2
+++ pkg-descr 3 Nov 2009 07:46:04 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/scim-input-pad/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- pkg-plist 31 Mar 2007 11:01:39 -0000 1.7
+++ pkg-plist 3 Nov 2009 07:46:04 -0000
@@ -6,6 +6,8 @@
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/chinese.pad
share/scim/input-pad/japanese.pad
share/scim/input-pad/keyboard.pad
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/scim/input-pad
Index: files/patch-src-Makefile.in
===================================================================
RCS file: files/patch-src-Makefile.in
diff -N files/patch-src-Makefile.in
--- files/patch-src-Makefile.in 8 May 2005 22:59:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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@\" \
--- scim-input-pad-0.1.2_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911030807.nA387els099713>