Date: Thu, 28 Jul 2005 12:54:11 -0600 (MDT) From: Jie Gao <gaoj@cpsc.ucalgary.ca> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/84248: [Maintainer] Upgrade textproc/skim to 1.4.0 Message-ID: <200507281854.j6SIsBe6034767@localhost.cpsc.ucalgary.ca> Resent-Message-ID: <200507281900.j6SJ0YXm053485@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84248
>Category: ports
>Synopsis: [Maintainer] Upgrade textproc/skim to 1.4.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 28 19:00:33 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Jie Gao
>Release: FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD aibsd 5.4-STABLE FreeBSD 5.4-STABLE #2: Thu Jun 23 14:31:49 MDT 2005 gaoj@aibsd:/usr/src/sys/i386/compile/AIBSD i386
>Description:
Upgrade textproc/skim to 1.4.0
In this upgraded version, the build system of skim changes from make to scons.
However, skim does not depend on the scons in ports. The scons in ports does
not work here. Only the included scons with skim source can work.
This PR depends on PR ports/84247
>How-To-Repeat:
N/A
>Fix:
After commiting ports/84247, apply the following patch
--- patch-textproc-skim begins here ---
Index: textproc/skim/Makefile
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/skim/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- textproc/skim/Makefile 15 Jul 2005 21:03:06 -0000 1.14
+++ textproc/skim/Makefile 28 Jul 2005 18:16:33 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= skim
-PORTVERSION= 1.2.2
+PORTVERSION= 1.4.0
PORTREVISION= 0
CATEGORIES= textproc kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -15,9 +15,7 @@
MAINTAINER= gaoj@cpsc.ucalgary.ca
COMMENT= An input method platform based on SCIM library and KDE/QT
-LIB_DEPENDS= scim-1.0.7:${PORTSDIR}/textproc/scim
-
-EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
+LIB_DEPENDS= scim-1.0.8:${PORTSDIR}/textproc/scim
USE_KDELIBS_VER=3
USE_BZIP2= yes
@@ -26,10 +24,10 @@
USE_REINPLACE= yes
USE_INC_LIBTOOL_VER= 15
-USE_GNOME= gnomehack
-
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
+ PTHREAD_LIBS="${PTHREAD_LIBS}" \
+ PREFIX="${PREFIX}" \
+ QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
.include <bsd.port.pre.mk>
@@ -43,10 +41,18 @@
LDFLAGS="-L${LOCALBASE}/lib -lintl"
.endif
-pre-configure:
- ${REINPLACE_CMD} "s,-pedantic,,g; \
- s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
- ${REINPLACE_CMD} "s, | .*freebsd\*)$$,*),g" ${WRKSRC}/admin/ltmain.sh
+do-configure:
+ @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./configure
+
+post-configure:
+ ${REINPLACE_CMD} \
+ s,/usr/local/lib/pkgconfig,${PREFIX}/libdata/pkgconfig,g \
+ ${WRKSRC}/cache/pkg.cache.py
+do-build:
+ @cd ${WRKSRC} && ./scons
+
+do-install:
+ @cd ${WRKSRC} && ./scons install
post-install:
@${CAT} ${PKGMESSAGE}
Index: textproc/skim/distinfo
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/skim/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- textproc/skim/distinfo 15 Jul 2005 21:03:06 -0000 1.8
+++ textproc/skim/distinfo 28 Jul 2005 18:16:33 -0000
@@ -1,2 +1,2 @@
-MD5 (skim-1.2.2.tar.bz2) = 2ee02b5d18276637b7db1df0ec7cf1ae
-SIZE (skim-1.2.2.tar.bz2) = 1420215
+MD5 (skim-1.4.0.tar.bz2) = 6a261a5e15e641a021732b16542ca264
+SIZE (skim-1.4.0.tar.bz2) = 1058915
Index: textproc/skim/pkg-plist
===================================================================
RCS file: /home/grads/gaoj/repository/ports/textproc/skim/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- textproc/skim/pkg-plist 10 May 2005 01:21:17 -0000 1.5
+++ textproc/skim/pkg-plist 28 Jul 2005 18:16:33 -0000
@@ -1,8 +1,9 @@
bin/scim-panel-kde
bin/skim
+include/skim/extra_utils.h
include/skim/skimglobalactions.h
include/skim/skimkeygrabber.h
-include/skim/skimplugin.h
+include/skim/skimplugin.h
include/skim/skimpluginmanager.h
include/skim/socketserverthread.h
include/skim/utils/kautocmodule.h
@@ -11,6 +12,8 @@
include/skim/utils/scimmovehandle.h
include/skim/utils/scimtoolbar.h
include/skim/utils/scimxmlguibuilder.h
+lib/kde3/kcm_skimplugin_compmgrclient.la
+lib/kde3/kcm_skimplugin_compmgrclient.so
lib/kde3/kcm_skimplugin_configplugin.la
lib/kde3/kcm_skimplugin_configplugin.so
lib/kde3/kcm_skimplugin_inputwindow.la
@@ -19,18 +22,16 @@
lib/kde3/kcm_skimplugin_mainwindow.so
lib/kde3/kcm_skimplugin_scim_global.la
lib/kde3/kcm_skimplugin_scim_global.so
-lib/kde3/kcm_skimplugin_scim_hangul.la
-lib/kde3/kcm_skimplugin_scim_hangul.so
lib/kde3/kcm_skimplugin_scim_imengines.la
lib/kde3/kcm_skimplugin_scim_imengines.so
-lib/kde3/kcm_skimplugin_scim_smartpinyin.la
-lib/kde3/kcm_skimplugin_scim_smartpinyin.so
-lib/kde3/kcm_skimplugin_scim_tables.la
-lib/kde3/kcm_skimplugin_scim_tables.so
lib/kde3/kcm_skimplugin_scim_x.la
lib/kde3/kcm_skimplugin_scim_x.so
lib/kde3/kcm_skimplugin_systemtray.la
lib/kde3/kcm_skimplugin_systemtray.so
+lib/kde3/skim_panelapplet.la
+lib/kde3/skim_panelapplet.so
+lib/kde3/skimplugin_compmgrclient.la
+lib/kde3/skimplugin_compmgrclient.so
lib/kde3/skimplugin_inputwindow.la
lib/kde3/skimplugin_inputwindow.so
lib/kde3/skimplugin_mainwindow.la
@@ -44,22 +45,26 @@
lib/libscim-kdeutils.la
lib/libscim-kdeutils.so
lib/libscim-kdeutils.so.0
+lib/libscim-kdeutils.so.0.1.0
lib/libskim.la
lib/libskim.so
lib/libskim.so.0
+lib/libskim.so.0.1.0
libdata/pkgconfig/scim_kdeutils.pc
libdata/pkgconfig/skim.pc
share/applnk/Utilities/skim.desktop
+share/apps/kicker/applets/skimapplet.desktop
share/apps/skim/mainwindowui.rc
share/apps/skim/pics/pin_down.png
share/apps/skim/pics/pin_up.png
+share/apps/skim/pics/scim.png
share/apps/skim/pics/scim_help.png
+share/apps/skim/pics/scim_keyboard.png
+share/apps/skim/pics/scim_setup.png
+share/apps/skim/pics/skim_minimize.png
+share/apps/skim/pics/skim_restore.png
share/autostart/skim.desktop
-share/config.kcfg/generictable.kcfg
-share/config.kcfg/scim_hangul.kcfg
share/config.kcfg/scimkdeconfig.kcfg
-share/config.kcfg/smartpinyin.kcfg
-share/doc/HTML/de/skim/common
share/doc/HTML/de/skim/index.cache.bz2
share/doc/HTML/de/skim/index.docbook
share/doc/HTML/de/skim/skim01a.png
@@ -95,14 +100,12 @@
share/doc/HTML/de/skim/skim_toolbar4.png
share/doc/HTML/de/skim/skim_toolbar6.png
share/doc/HTML/de/skim/skim_toolbar8.png
-share/doc/HTML/en/skim/common
share/doc/HTML/en/skim/index.cache.bz2
share/doc/HTML/en/skim/index.docbook
share/doc/HTML/en/skim/inputwindow.png
share/doc/HTML/en/skim/kdesystray.png
share/doc/HTML/en/skim/mainwindow.png
share/doc/HTML/en/skim/setupwindow.png
-share/doc/HTML/skim/kdex.dtd
share/icons/crystalsvg/32x32/apps/skim.png
share/icons/crystalsvg/scalable/apps/skim.svgz
share/locale/de/LC_MESSAGES/skim.mo
@@ -113,32 +116,34 @@
share/locale/zh_CN/LC_MESSAGES/skim.mo
share/locale/zh_TW/LC_MESSAGES/skim.mo
share/services/skimconfiguredialog/kcm_skimplugin_configplugin_config.desktop
+share/services/skimconfiguredialog/skimplugin_compmgrclient_config.desktop
share/services/skimconfiguredialog/skimplugin_inputwindow_config.desktop
share/services/skimconfiguredialog/skimplugin_mainwindow_config.desktop
share/services/skimconfiguredialog/skimplugin_scim_global_config.desktop
-share/services/skimconfiguredialog/skimplugin_scim_hangul_config.desktop
share/services/skimconfiguredialog/skimplugin_scim_imengines_config.desktop
-share/services/skimconfiguredialog/skimplugin_scim_smartpinyin_config.desktop
-share/services/skimconfiguredialog/skimplugin_scim_table_config.desktop
share/services/skimconfiguredialog/skimplugin_scim_x_config.desktop
share/services/skimconfiguredialog/skimplugin_systemtray_config.desktop
+share/services/skimplugin_compmgrclient.desktop
share/services/skimplugin_inputwindow.desktop
share/services/skimplugin_mainwindow.desktop
share/services/skimplugin_scim.desktop
share/services/skimplugin_setupwindow.desktop
share/services/skimplugin_systemtray.desktop
+share/services/skimsetupdir_frontend.desktop
+share/services/skimsetupdir_imengines.desktop
+share/services/skimsetupdir_panel.desktop
share/servicetypes/skimkcmplugin.desktop
share/servicetypes/skimplugin.desktop
+share/servicetypes/skimsetupcategory.desktop
share/servicetypes/skimui.desktop
@cwd %%X11BASE%%
-lib/scim-1.0/1.2.0/Config/kconfig.la
-lib/scim-1.0/1.2.0/Config/kconfig.so
+lib/scim-1.0/1.4.0/Config/kconfig.la
+lib/scim-1.0/1.4.0/Config/kconfig.so
@cwd %%LOCALBASE%%
@dirrm include/skim/utils
@dirrm include/skim
@dirrm share/services/skimconfiguredialog
@dirrm share/doc/HTML/en/skim
@dirrm share/doc/HTML/de/skim
-@dirrm share/doc/HTML/skim
@dirrm share/apps/skim/pics
@dirrm share/apps/skim
--- patch-textproc-skim ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507281854.j6SIsBe6034767>