diff options
| author | marcus <marcus@FreeBSD.org> | 2006-10-14 16:54:54 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2006-10-14 16:54:54 +0800 |
| commit | 0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8 (patch) | |
| tree | 17937489af4c767844fc63b684ae3e7b31948812 /chinese/gcin | |
| parent | e959473966b963953d63d5f00fae8751f2decf0f (diff) | |
| download | freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.gz freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.zst freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.zip | |
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.
Submitted by: mezz, ahze, pav, and many others
Approved by: portmgr (implicit, kris)
Diffstat (limited to 'chinese/gcin')
| -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 0b33377cd9b7..1ed2f6d78bd1 100644 --- a/chinese/gcin/Makefile +++ b/chinese/gcin/Makefile @@ -7,6 +7,7 @@ PORTNAME= gcin PORTVERSION= 1.2.7 +PORTREVISION= 2 CATEGORIES= chinese textproc gnome MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/:main DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main @@ -15,10 +16,9 @@ EXTRACT_ONLY= gcin-${PORTVERSION}.tar.bz2 MAINTAINER= chinsan@FreeBSD.org COMMENT= A traditional chinese input utility in X -USE_X_PREFIX= YES USE_BZIP2= YES GNU_CONFIGURE= YES -USE_GNOME= gtk20 +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 2acd2a1f3036..acda831cfa80 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 2a8fd9beaf53..048f1367b678 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 |