--- /usr/home/chinsan/project/gcin/Makefile Sun Oct 15 05:18:18 2006 +++ /usr/home/chinsan/project/gcin/Makefile Thu Oct 19 22:32:24 2006 @@ -6,8 +6,7 @@ # PORTNAME= gcin -PORTVERSION= 1.2.7 -PORTREVISION= 2 +PORTVERSION= 1.2.8 CATEGORIES= chinese textproc gnome MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main @@ -18,7 +17,7 @@ USE_BZIP2= YES GNU_CONFIGURE= YES -USE_GNOME= gtk20 gnomecontrolcenter2 gnomehier +USE_GNOME= gtk20 USE_GMAKE= YES USE_GCC= 3.4+ INSTALLS_ICONS= YES @@ -42,8 +41,6 @@ .endif pre-patch: - @${REINPLACE_CMD} -e 's,gcin.png,${PREFIX}/share/icons/gcin.png,' \ - ${WRKSRC}/menu/gcin-setup.desktop @${REINPLACE_CMD} -e 's/&//; s/bash/sh/; \ s/QT_IM_DIR=\/usr/QT_IM_DIR=$$prefix/; \ s/mandir=$$datadir/mandir=$$prefix/; \ @@ -52,12 +49,10 @@ s/gcc/$$CC/; s/gcin-$$GCIN_VERSION/gcin/' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's/qsort/mergesort/' ${WRKSRC}/gcin2tab.c @${REINPLACE_CMD} -e 's|/usr/local|/usr|g' \ - ${WRKSRC}/gtk-im/Makefile \ - ${WRKSRC}/menu/Makefile + ${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile @${REINPLACE_CMD} -e 's/modify-XIM //; 8,10 d' ${WRKSRC}/scripts/Makefile - @${REINPLACE_CMD} -e 's/bash/sh/; s/&//;' ${WRKSRC}/scripts/gcin-user-setup @${REINPLACE_CMD} -e 's/bash/sh/; s/&//; s/opt\/gnome/usr\/X11R6/;' \ - ${WRKSRC}/scripts/utf8-edit + ${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup @${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,' \ ${WRKSRC}/gtk-im/gtkimcontextgcin.c --- /usr/home/chinsan/project/gcin/distinfo Sun Oct 8 05:18:17 2006 +++ /usr/home/chinsan/project/gcin/distinfo Thu Oct 19 21:47:49 2006 @@ -1,6 +1,6 @@ -MD5 (gcin-1.2.7.tar.bz2) = ccd064960c5eba861020ed7efc640f7e -SHA256 (gcin-1.2.7.tar.bz2) = 45d7852a76d8b3aee64744013d0ae44e940e85033b79f00d8b0890db77150a13 -SIZE (gcin-1.2.7.tar.bz2) = 1541388 +MD5 (gcin-1.2.8.tar.bz2) = d4940efa38b3b3206f4d936104e2b37c +SHA256 (gcin-1.2.8.tar.bz2) = 9b6702084d125fbdbc68a8d2bbb17938242dd855c25b3163514fd5e9331149de +SIZE (gcin-1.2.8.tar.bz2) = 1542707 MD5 (noseeing-6.tar.gz) = c67e5c85b2805f12bb2f092dfa1814b7 SHA256 (noseeing-6.tar.gz) = 2f240c8dbb15c2249dff74102842bbccfe307a721cf2c092c75dc6234e470f9b SIZE (noseeing-6.tar.gz) = 400429 --- /usr/home/chinsan/project/gcin/files/patch-menu Sun Oct 15 05:18:18 2006 +++ /usr/home/chinsan/project/gcin/files/patch-menu Thu Oct 19 21:51:15 2006 @@ -1,6 +1,6 @@ ---- menu/Makefile.orig Sun Aug 28 21:40:32 2005 -+++ menu/Makefile Fri Oct 13 14:43:28 2006 -@@ -10,14 +10,14 @@ install: +--- menu/Makefile.orig Thu Oct 19 21:48:23 2006 ++++ menu/Makefile Thu Oct 19 21:50:13 2006 +@@ -10,14 +10,10 @@ install gcin-setup.desktop /usr/share/applications; \ install -d /usr/lib/menu; \ install -m 644 $(MENUS) /usr/lib/menu; \ @@ -15,10 +15,6 @@ - install -m 644 gcin-setup.desktop $(datadir)/applications; \ + install -d $(prefix)/share/applications; \ + install -m 644 $(MENUS) $(prefix)/share/applications; \ -+ echo "install Gnome's control center panel ..."; \ -+ install -d $(datadir)/gnome/control-center-2.0/capplets; \ -+ install -m 644 gcin-setup.desktop $(datadir)/gnome/control-center-2.0/capplets; \ -+ echo "installing Other common wm(ie:xfce4)'s menu panel ..."; \ fi clean: rm -f $(MENUS) *~ --- /usr/home/chinsan/project/gcin/pkg-plist Sun Oct 15 05:18:18 2006 +++ /usr/home/chinsan/project/gcin/pkg-plist Thu Oct 19 22:32:15 2006 @@ -14,8 +14,10 @@ bin/tslearn include/gcin-im-client.h lib/gtk-2.0/immodules/im-gcin.so -lib/libgcin-im-client.so +lib/gcin/gcin1.so +lib/gcin/libgcin-im-client.so %%DATADIR%%/script/gcin-user-setup +%%DATADIR%%/script/noseeing-inst %%DATADIR%%/script/utf8-edit %%DATADIR%%/table/ar30.gtab %%DATADIR%%/table/cj-punc.gtab @@ -52,7 +54,6 @@ %%PORTDOCS%%%%DOCSDIR%%/README share/applications/gcin share/applications/gcin-setup -share/gnome/control-center-2.0/capplets/gcin-setup.desktop share/icons/gcin/gcin-tray.png share/icons/gcin/greek.png share/icons/gcin/tsin.png @@ -60,6 +61,7 @@ share/icons/gcin/pin-fixed24.png share/icons/gcin/pin-float16.png %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrmtry lib/gcin @dirrmtry share/icons/gcin @dirrmtry share/icons @dirrmtry share/applications