From nobody Sun Feb 25 00:24:38 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tj4J66BX5z5BvNK; Sun, 25 Feb 2024 00:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tj4J65b6Yz4qS9; Sun, 25 Feb 2024 00:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708820678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tXTPVo8mgs9c9XHxkPkjGWUTe9m+GpDots2UgDLf/Ec=; b=CBjVp9Wqpt2xr7B2fMPpjlSZduQokerVqD7Ycf8gTkgOyLYeHLoVr91qK/nug2NfZp9OEa JbXh0lhyO3p5kZwi5v9UFam2sitK5XbQTjt+2DO7xG9dcdULvaOlwgN8HifAgH0I7Upuy2 NlqiUPNBpjM4fhV1UU9v7U1rj6T8eiJA/H1RIyf9lCdgHFcJScHg10yLC0IcsB66CkOfMT fJ3X3/JTW/yKVFSlv6r/JD4Yi/bu1DPlQt3LMvDAaOXH1R7udpLXP6k1AtJBihH3cHd9QN 6/TUJ89wXpqKxVC8M/vofgEfz9UmM+V8x30hH9BSXD2SCldK1BmhD5cvWoUGgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708820678; a=rsa-sha256; cv=none; b=vDap9psSiiIYnaa/bOJNjLZvlKcw8NGvzYYN1qo6buXlTi6+bYrfhdqi+MDsi37HKV403N Phs0Viu5PXIhgz3WkkByZ/fOyGRGOhlFkcsCMVQAUGhOLcnf/SujejE8eOYxR0rc4tl96E ebsjlbAbozB1PFOQLBgWnEUW7xwdthJq5D7P62nnl87MUX/LRjD/nWQ1P/6ik/yHACpIlu Pa1pzGaP7KVPcqN0K9j7jxjZxBYCg1ieRaj2RRaii6a0+kLFIJoj7STegMW1tyfwMn5lpY WHcHvGt5+MTEMysbnYibHmoY8LIDQ8Q2BjHmk4QebyFyh9aIEYsMl64uGT6y7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708820678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tXTPVo8mgs9c9XHxkPkjGWUTe9m+GpDots2UgDLf/Ec=; b=cyyTuG+Iw0SygXk1/AiOTFto1X7tQGzBCHpJDKm5Z+NWD5sJ5eLk0rfJNyLG96XKvOQyCK L2vKMtLOqXj+Hpk6k5Mk7OV6T4qabwKKlA0U8hSrDFw8u0yBZ9UgSsYozFg2oR1xXa0fwv FSp0+LArG6lBrjV4WIvpKAQd0COCJ4NA5ci9sa3j73zylyW62L23zcKw6rEQObjZtfkugn kLz7g7AmTdwNuHoWk8eoiivG1yWuu4596KZmr9x2VoXMvUjqNouSKuih0XVP8ZTb7W0l8N FkGyzpfWf4YNj07CEJSxnDvXGGgQfw49WB/tO6QQ9G/+MVCBkOoE2OLawTDf1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tj4J64VwhzMTH; Sun, 25 Feb 2024 00:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41P0OcJg030810; Sun, 25 Feb 2024 00:24:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P0Oc93030807; Sun, 25 Feb 2024 00:24:38 GMT (envelope-from git) Date: Sun, 25 Feb 2024 00:24:38 GMT Message-Id: <202402250024.41P0Oc93030807@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Vanilla I. Shu" Subject: git: c117c9e159c5 - main - chinese/gcin: Moved man to share/man. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vanilla X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c117c9e159c57a5b011f4385e552017f8100c918 Auto-Submitted: auto-generated The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=c117c9e159c57a5b011f4385e552017f8100c918 commit c117c9e159c57a5b011f4385e552017f8100c918 Author: Vanilla I. Shu AuthorDate: 2024-02-25 00:24:00 +0000 Commit: Vanilla I. Shu CommitDate: 2024-02-25 00:24:27 +0000 chinese/gcin: Moved man to share/man. --- chinese/gcin/Makefile | 3 +-- chinese/gcin/files/patch-Makefile | 14 +++++++------- chinese/gcin/files/patch-configure | 23 +++++++---------------- chinese/gcin/pkg-plist | 30 +++++++++++++++--------------- 4 files changed, 30 insertions(+), 40 deletions(-) diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile index 881b29a6aa82..34ff78f478ec 100644 --- a/chinese/gcin/Makefile +++ b/chinese/gcin/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcin PORTVERSION= 2.9.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ EXTRACT_ONLY= gcin-${PORTVERSION}.tar.xz @@ -33,7 +33,6 @@ ANTHY_CONFIGURE_OFF= --use_anthy=N post-patch: @${REINPLACE_CMD} -e 's,&,,; 1 s,##!/bin/bash,#!/bin/sh,; \ s,-ldl,,; \ - s,mandir=$$datadir,mandir=$$prefix,; \ s,/usr/share,$$prefix/share,; \ 1, 300 s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,; \ /GCIN_DEBUG/ d' ${WRKSRC}/configure diff --git a/chinese/gcin/files/patch-Makefile b/chinese/gcin/files/patch-Makefile index b1d1ff523cb5..4dce45bb85e5 100644 --- a/chinese/gcin/files/patch-Makefile +++ b/chinese/gcin/files/patch-Makefile @@ -1,6 +1,6 @@ --- Makefile.orig 2020-05-15 23:04:33 UTC +++ Makefile -@@ -4,8 +4,11 @@ include config.mak +@@ -4,8 +4,11 @@ gcin_tsin_o = tsin.o tsin-util.o win0.o win1.o tsin-pa include suffixes-rule gcin_tsin_o = tsin.o tsin-util.o win0.o win1.o tsin-parse.o @@ -26,7 +26,7 @@ OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \ table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.o pho-dbg.o \ pho2pinyin.o pinyin.o lang.o gtab-list.o gtab-init.o fullchar.o \ -@@ -102,8 +109,7 @@ PROGS_CV=kbmcv pin-juyin +@@ -102,8 +109,7 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec $(MAKE) -C data @@ -36,18 +36,18 @@ if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po; fi if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im; fi if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi -@@ -113,18 +119,18 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) +@@ -113,18 +119,18 @@ gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) #gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path) gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) - $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L/usr/X11R6/$(LIB) -+ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L%%PREFIX%%/$(LIB) ++ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(GCIN_LDFLAGS) -L/usr/local/$(LIB) rm -f core.* vgcore.* ln -sf $@ $@.test gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) - $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB) -+ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L%%PREFIX%%/$(LIB) ++ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB) rm -f core.* -tslearn: $(OBJS_TSLEARN) @@ -59,7 +59,7 @@ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TS_EDIT) -L./im-client -lgcin-im-client -lcurl $(LDFLAGS) ts-contribute: ts-edit -@@ -171,16 +177,16 @@ gtab-merge: $(OBJS_gtab_merge) +@@ -171,16 +177,16 @@ kbmcv: $(OBJS_kbmcv) kbmcv: $(OBJS_kbmcv) $(CCLD) -o $@ $(OBJS_kbmcv) $(LDFLAGS) @@ -124,7 +124,7 @@ $(MAKE) -C modules clean if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im clean; fi $(MAKE) -C qt-im clean -@@ -286,5 +287,3 @@ gcin.spec: gcin.spec.in +@@ -286,5 +287,3 @@ gcin-fedora.spec: gcin-fedora.spec.in VERSION.gcin gcin-fedora.spec: gcin-fedora.spec.in VERSION.gcin rm -f $@ sed -e "s/__gcin_version__/$(GCIN_VERSION)/" < $< > $@ diff --git a/chinese/gcin/files/patch-configure b/chinese/gcin/files/patch-configure index 2b7a8dd4a7ee..7f53aeac8d32 100644 --- a/chinese/gcin/files/patch-configure +++ b/chinese/gcin/files/patch-configure @@ -15,7 +15,7 @@ exit fi -@@ -232,7 +232,7 @@ fi +@@ -232,7 +232,7 @@ QT4_IM='N' QT4_IM='N' @@ -24,16 +24,7 @@ echo "testing if you have qt4 support" pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null if [ $? = 0 ]; then -@@ -291,7 +291,7 @@ fi - - bindir=$prefix/bin - datadir=$prefix/share --mandir=$datadir/man -+mandir=$prefix/man - libdir=$prefix/$LIB - includedir=$prefix/include - optdir=/opt -@@ -306,9 +306,9 @@ if [ $QT_IM = 'N' ]; then +@@ -306,9 +306,9 @@ else mv gcin.spec gcin.spec.tmp grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec else @@ -45,7 +36,7 @@ QT_MOC=$i echo "QT_MOC=$QT_MOC" break; -@@ -322,9 +322,9 @@ if [ $QT4_IM = 'N' ]; then +@@ -322,9 +322,9 @@ else mv gcin.spec gcin.spec.tmp grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec else @@ -69,7 +60,7 @@ QT5_MOC=$i echo "QT5_MOC=$QT5_MOC" break -@@ -362,7 +362,7 @@ fi +@@ -362,7 +362,7 @@ BUILD_MODULE='Y' BUILD_MODULE='Y' @@ -78,7 +69,7 @@ BUILD_MODULE='Y' fi -@@ -388,7 +388,7 @@ echo "datadir_r=$datadir" >> config.mak +@@ -388,7 +388,7 @@ echo "includedir=\$(DESTDIR)$includedir" >> config.mak echo "libdir=\$(DESTDIR)$libdir" >> config.mak echo "gcinlibdir=\$(DESTDIR)$gcinlibdir" >> config.mak echo "includedir=\$(DESTDIR)$includedir" >> config.mak @@ -87,7 +78,7 @@ echo "GCIN_VERSION=$GCIN_VERSION" >> config.mak echo "GCIN_TABLE_DIR=\$(datadir_r)/gcin/table" >> config.mak echo "GCIN_OGG_DIR=\$(datadir_r)/gcin/ogg" >> config.mak -@@ -406,8 +406,8 @@ if [ "$doc_version_dir" = 'N' ]; then +@@ -406,8 +406,8 @@ else echo "DOC_DIR=\$(datadir_r)/doc/gcin" >> config.mak echo "DOC_DIR_i=\$(datadir)/doc/gcin" >> config.mak else @@ -98,7 +89,7 @@ fi echo "GCIN_ICON_DIR=\$(datadir_r)/icons/gcin" >> config.mak -@@ -435,11 +435,16 @@ echo "USE_INDICATOR=$USE_INDICATOR" >> config.mak +@@ -435,11 +435,16 @@ echo "GTK_QUERY_IM_64=$GTK_QUERY_IM_64" >> config.mak echo "USE_GCB=$use_gcb" >> config.mak echo "BUILD_MODULE=$BUILD_MODULE" >> config.mak echo "GTK_QUERY_IM_64=$GTK_QUERY_IM_64" >> config.mak diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist index 9def0033a0f7..e61d319dbfe3 100644 --- a/chinese/gcin/pkg-plist +++ b/chinese/gcin/pkg-plist @@ -28,21 +28,6 @@ lib/gcin/intcode-module.so lib/gcin/libgcin-im-client.so lib/gcin/libgcin-im-client.so.1 lib/gcin/libgcin-im-client.so.1.2.5 -man/man1/gcin-exit.1.gz -man/man1/gcin-gb-toggle.1.gz -man/man1/gcin-kbm-toggle.1.gz -man/man1/gcin-message.1.gz -man/man1/gcin-tools.1.gz -man/man1/gcin.1.gz -man/man1/gcin2tab.1.gz -man/man1/gtab-merge.1.gz -man/man1/juyin-learn.1.gz -man/man1/phoa2d.1.gz -man/man1/sim2trad.1.gz -man/man1/ts-contribute.1.gz -man/man1/ts-edit.1.gz -man/man1/tsa2d32.1.gz -man/man1/tslearn.1.gz share/applications/gcin-tools.desktop %%DATADIR%%/script/gcin-user-setup %%DATADIR%%/script/gtab.append_prepare @@ -166,3 +151,18 @@ share/icons/gcin/vocabulary.png share/icons/gcin/wm2.png share/icons/gcin/wubi.png share/icons/hicolor/64x64/apps/gcin.png +share/man/man1/gcin-exit.1.gz +share/man/man1/gcin-gb-toggle.1.gz +share/man/man1/gcin-kbm-toggle.1.gz +share/man/man1/gcin-message.1.gz +share/man/man1/gcin-tools.1.gz +share/man/man1/gcin.1.gz +share/man/man1/gcin2tab.1.gz +share/man/man1/gtab-merge.1.gz +share/man/man1/juyin-learn.1.gz +share/man/man1/phoa2d.1.gz +share/man/man1/sim2trad.1.gz +share/man/man1/ts-contribute.1.gz +share/man/man1/ts-edit.1.gz +share/man/man1/tsa2d32.1.gz +share/man/man1/tslearn.1.gz