diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-14 03:03:53 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-14 03:03:53 +0800 |
| commit | a0f7880821bc5baf255b5db751be89bf19552146 (patch) | |
| tree | 75a43f41bbfa4fdd8c1c2c609df9272cd5b72e35 /chinese | |
| parent | bb80e4d47c2241c14337350a9158f801b18006d3 (diff) | |
| download | marcuscom-ports-a0f7880821bc5baf255b5db751be89bf19552146.tar marcuscom-ports-a0f7880821bc5baf255b5db751be89bf19552146.tar.gz marcuscom-ports-a0f7880821bc5baf255b5db751be89bf19552146.tar.bz2 marcuscom-ports-a0f7880821bc5baf255b5db751be89bf19552146.tar.lz marcuscom-ports-a0f7880821bc5baf255b5db751be89bf19552146.tar.xz marcuscom-ports-a0f7880821bc5baf255b5db751be89bf19552146.tar.zst marcuscom-ports-a0f7880821bc5baf255b5db751be89bf19552146.zip | |
Fix installation and plist.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7783 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'chinese')
| -rw-r--r-- | chinese/gcin/Makefile | 9 | ||||
| -rw-r--r-- | chinese/gcin/files/patch-menu | 11 | ||||
| -rw-r--r-- | chinese/gcin/pkg-plist | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile index 0c2dcb14d..1ed2f6d78 100644 --- a/chinese/gcin/Makefile +++ b/chinese/gcin/Makefile @@ -7,7 +7,7 @@ PORTNAME= gcin PORTVERSION= 1.2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese textproc gnome MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main @@ -18,7 +18,7 @@ COMMENT= A traditional chinese input utility in X USE_BZIP2= YES GNU_CONFIGURE= YES -USE_GNOME= gtk20 gnomecontrolcenter2 +USE_GNOME= gtk20 gnomecontrolcenter2 gnomehier USE_GMAKE= YES USE_GCC= 3.4+ INSTALLS_ICONS= YES @@ -48,9 +48,12 @@ pre-patch: s/QT_IM_DIR=\/usr/QT_IM_DIR=$$prefix/; \ s/mandir=$$datadir/mandir=$$prefix/; \ s/\/usr\/share/$$prefix\/share/; \ - 109,110 s/control-center-2\.0/gnome\/control-center-2\.0/; \ + 123,124 s/control-center-2\.0/gnome\/control-center-2\.0/g; \ 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 @${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/;' \ diff --git a/chinese/gcin/files/patch-menu b/chinese/gcin/files/patch-menu index 2acd2a1f3..acda831cf 100644 --- a/chinese/gcin/files/patch-menu +++ b/chinese/gcin/files/patch-menu @@ -1,8 +1,11 @@ ---- menu/Makefile.orig Mon Aug 29 09:40:32 2005 -+++ menu/Makefile Thu Sep 15 11:53:49 2005 -@@ -12,12 +12,12 @@ +--- menu/Makefile.orig Sun Aug 28 21:40:32 2005 ++++ menu/Makefile Fri Oct 13 14:43:28 2006 +@@ -10,14 +10,14 @@ install: + install gcin-setup.desktop /usr/share/applications; \ + install -d /usr/lib/menu; \ install -m 644 $(MENUS) /usr/lib/menu; \ - which update-menus >& /dev/null && update-menus || exit 0; \ +- which update-menus >& /dev/null && update-menus || exit 0; \ ++ which update-menus > /dev/null 2>&1 && update-menus || exit 0; \ else \ - install -d $(libdir)/menu; \ - install -m 644 $(MENUS) $(libdir)/menu; \ diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist index 2a8fd9bea..048f1367b 100644 --- a/chinese/gcin/pkg-plist +++ b/chinese/gcin/pkg-plist @@ -62,13 +62,9 @@ share/icons/gcin/pin-float16.png %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry share/icons/gcin @dirrmtry share/icons -@dirrmtry share/gnome/control-center-2.0/capplets -@dirrmtry share/gnome/control-center-2.0 -@dirrmtry share/gnome @dirrmtry share/applications @dirrmtry %%DATADIR%%/table @dirrmtry %%DATADIR%%/script @dirrmtry %%DATADIR%% -@dirrmtry lib/gtk-2.0/immodules @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules |