Date: Mon, 26 Nov 2007 23:35:02 +0100 (CET) From: Nikola Lecic <nikola.lecic@anthesphoria.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/118272: [patch] textproc/scim-table-imengine: SCIM moduledir correction Message-ID: <200711262235.lAQMZ2sL080412@anthesphoria.net> Resent-Message-ID: <200711262250.lAQMo1Vv064674@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118272
>Category: ports
>Synopsis: [patch] textproc/scim-table-imengine: SCIM moduledir correction
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 26 22:50:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Nikola Lecic
>Release: FreeBSD 6.2-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD nyx 6.2-RELEASE-p8 FreeBSD 6.2-RELEASE-p8 #1: Sun Oct 7 06:28:18 CEST 2007 root@nyx:/usr/obj/usr/src/sys/NYX i386
>Description:
textproc/scim-table-imengine duplicates SCIM moduledir subdirectories
(IMEnging and SetupUI) and installs there table.so etc. SCIM's pkgconfig
path(s) are used instead (as in other imengine ports):
# pkg-config --variable=moduledir scim
/usr/local/lib/scim-1.0/1.4.0
Note: the patch leaves files/patch-configure empty.
Resume of changes (if needed):
* we delete files/patch-configure since these pkg-config commands return
correct paths
* we subsequently don't need SCIM_* dirs in Makefile's CONFIGURE_ENV
>How-To-Repeat:
>Fix:
--- scim-table-imengine-0.5.7_2.patch begins here ---
diff -ruN scim-table-imengine.orig/Makefile scim-table-imengine/Makefile
--- scim-table-imengine.orig/Makefile Mon Nov 26 17:15:20 2007
+++ scim-table-imengine/Makefile Mon Nov 26 18:48:05 2007
@@ -7,7 +7,7 @@
PORTNAME= scim-table-imengine
PORTVERSION= 0.5.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -31,9 +31,7 @@
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
LDFLAGS="-L${LOCALBASE}/lib -lintl" \
- PREFIX="${PREFIX}" \
- SCIM_DATADIR=${PREFIX}/share/scim \
- SCIM_ICONDIR=${PREFIX}/share/scim/icons
+ PREFIX="${PREFIX}"
PLIST_SUB= SKIM="@comment "
diff -ruN scim-table-imengine.orig/files/patch-configure scim-table-imengine/files/patch-configure
--- scim-table-imengine.orig/files/patch-configure Mon Nov 26 17:15:20 2007
+++ scim-table-imengine/files/patch-configure Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
---- configure.orig Mon Apr 30 13:30:12 2007
-+++ configure Mon Apr 30 13:30:25 2007
-@@ -30244,10 +30244,6 @@
- CXXFLAGS="$CXXFLAGS -g"
- fi
-
--SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim`
--SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim`
--SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim`
--
- if test "x$SCIM_ICONDIR" = "x"; then
- SCIM_ICONDIR=${datadir}/scim/icons
- fi
diff -ruN scim-table-imengine.orig/pkg-plist scim-table-imengine/pkg-plist
--- scim-table-imengine.orig/pkg-plist Mon Nov 26 17:15:20 2007
+++ scim-table-imengine/pkg-plist Mon Nov 26 17:16:42 2007
@@ -1,10 +1,10 @@
bin/scim-make-table
-lib/scim-1.0/IMEngine/table.a
-lib/scim-1.0/IMEngine/table.la
-lib/scim-1.0/IMEngine/table.so
-lib/scim-1.0/SetupUI/table-imengine-setup.a
-lib/scim-1.0/SetupUI/table-imengine-setup.la
-lib/scim-1.0/SetupUI/table-imengine-setup.so
+lib/scim-1.0/1.4.0/IMEngine/table.a
+lib/scim-1.0/1.4.0/IMEngine/table.la
+lib/scim-1.0/1.4.0/IMEngine/table.so
+lib/scim-1.0/1.4.0/SetupUI/table-imengine-setup.a
+lib/scim-1.0/1.4.0/SetupUI/table-imengine-setup.la
+lib/scim-1.0/1.4.0/SetupUI/table-imengine-setup.so
share/scim/icons/table.png
share/locale/zh_CN/LC_MESSAGES/scim-tables.mo
share/locale/zh_TW/LC_MESSAGES/scim-tables.mo
@@ -33,6 +33,6 @@
%%SKIM%%@dirrmtry share/apps/skim
%%SKIM%%@dirrmtry share/config.kcfg
%%SKIM%%@dirrmtry share/services/skimconfiguredialog
-@dirrmtry lib/scim-1.0/SetupUI
-@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/1.4.0/SetupUI
+@dirrmtry lib/scim-1.0/1.4.0/IMEngine
@dirrmtry lib/scim-1.0
--- scim-table-imengine-0.5.7_2.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?200711262235.lAQMZ2sL080412>