From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 18 13:10:36 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4CBA16A40F for ; Wed, 18 Oct 2006 13:10:36 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D1AD43D78 for ; Wed, 18 Oct 2006 13:10:24 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k9IDAOCa006950 for ; Wed, 18 Oct 2006 13:10:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k9IDAOlu006949; Wed, 18 Oct 2006 13:10:24 GMT (envelope-from gnats) Resent-Date: Wed, 18 Oct 2006 13:10:24 GMT Resent-Message-Id: <200610181310.k9IDAOlu006949@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, chinsan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 088A916A416 for ; Wed, 18 Oct 2006 13:09:26 +0000 (UTC) (envelope-from chinsan@FreeBSD.org) Received: from smtp2.bc.hgc.com.tw (smtp2.bc.hgc.com.tw [203.133.1.156]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E57C43D46 for ; Wed, 18 Oct 2006 13:09:25 +0000 (GMT) (envelope-from chinsan@FreeBSD.org) Received: from smtp2.bc.hgc.com.tw (61-63-0-host123.kbtelecom.net.tw [61.63.0.123]) by smtp2.bc.hgc.com.tw (Postfix) with SMTP id B634D2E9DF for ; Wed, 18 Oct 2006 21:09:25 +0800 (CST) Received: by smtp2.bc.hgc.com.tw (sSMTP sendmail emulation); Wed, 18 Oct 2006 21:04:39 +0800 Message-Id: <20061018130925.B634D2E9DF@smtp2.bc.hgc.com.tw> Date: Wed, 18 Oct 2006 21:04:39 +0800 From: chinsan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/104531: [MAINTAINER] chinese/gcin: decrease the dependence X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Oct 2006 13:10:36 -0000 >Number: 104531 >Category: ports >Synopsis: [MAINTAINER] chinese/gcin: decrease the dependence >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: Wed Oct 18 13:10:23 GMT 2006 >Closed-Date: >Last-Modified: >Originator: chinsan >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: Taiwan >Environment: System: FreeBSD BSD6.giga.hgc.com.tw 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #6: Thu Sep 14 09:46:10 CST 2006 >Description: - decrease the dependence Suggested by: vanilla via irc Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- gcin-1.2.7_3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/chinese/gcin/Makefile /usr/home/chinsan/project/gcin/Makefile --- /usr/ports/chinese/gcin/Makefile Sun Oct 15 05:18:18 2006 +++ /usr/home/chinsan/project/gcin/Makefile Wed Oct 18 20:43:11 2006 @@ -7,7 +7,7 @@ PORTNAME= gcin PORTVERSION= 1.2.7 -PORTREVISION= 2 +PORTREVISION= 3 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 @@ 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 +42,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 +50,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 diff -ruN --exclude=CVS /usr/ports/chinese/gcin/files/patch-menu /usr/home/chinsan/project/gcin/files/patch-menu --- /usr/ports/chinese/gcin/files/patch-menu Sun Oct 15 05:18:18 2006 +++ /usr/home/chinsan/project/gcin/files/patch-menu Wed Oct 18 21:01:54 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: +--- Makefile.orig Wed Oct 18 20:43:15 2006 ++++ Makefile Wed Oct 18 21:00:16 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) *~ diff -ruN --exclude=CVS /usr/ports/chinese/gcin/pkg-plist /usr/home/chinsan/project/gcin/pkg-plist --- /usr/ports/chinese/gcin/pkg-plist Sun Oct 15 05:18:18 2006 +++ /usr/home/chinsan/project/gcin/pkg-plist Wed Oct 18 20:46:11 2006 @@ -52,7 +52,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 --- gcin-1.2.7_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: