Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 May 2021 21:51:29 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ba0c4f8af8d6 - main - devel/global: Convert REINPLACE_CMD to patch files
Message-ID:  <202105112151.14BLpTTQ093502@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ba0c4f8af8d6da7532014a6e98c6c1baacfbcf87

commit ba0c4f8af8d6da7532014a6e98c6c1baacfbcf87
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2021-05-11 21:14:27 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2021-05-11 21:46:57 +0000

    devel/global: Convert REINPLACE_CMD to patch files
---
 devel/global/Makefile                                         |  9 ---------
 devel/global/files/patch-Makefile.in                          | 11 +++++++++++
 devel/global/files/patch-plugin-factory-pygments_parser.py.in |  7 +++++++
 devel/global/pkg-plist                                        |  8 ++++++++
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/devel/global/Makefile b/devel/global/Makefile
index d4d01748f110..721f020c70db 100644
--- a/devel/global/Makefile
+++ b/devel/global/Makefile
@@ -19,18 +19,9 @@ TEST_TARGET=	check
 USE_CSTD=	c99
 
 INFO=		global
-PORTDOCS=	AUTHORS ChangeLog FAQ INSTALL LICENSE NEWS README THANKS
 
 SHEBANG_GLOB=	*.pl
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^gtags_DATA = / s|AUTHOR.*THANKS||' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e '1d' ${WRKSRC}/plugin-factory/pygments_parser.py.in
-
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-
 .include <bsd.port.mk>
diff --git a/devel/global/files/patch-Makefile.in b/devel/global/files/patch-Makefile.in
new file mode 100644
index 000000000000..6cb6656297aa
--- /dev/null
+++ b/devel/global/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2021-05-02 07:39:08 UTC
++++ Makefile.in
+@@ -414,7 +414,7 @@ SUBDIRS = libglibc libutil libparser libltdl plugin-fa
+ 	$(am__append_1) global gozilla gtags htags htags-refkit \
+ 	htags-server globash doc script $(am__append_2)
+ gtagsdir = ${datadir}/gtags
+-gtags_DATA = AUTHORS COPYING COPYING.LIB ChangeLog FAQ INSTALL LICENSE NEWS README THANKS \
++gtags_DATA = AUTHORS ChangeLog FAQ INSTALL LICENSE NEWS README THANKS \
+ 	DONORS BUILD_TOOLS README.PATCHES \
+         gtags.conf gtags.el gtags.pl gtags.vim gtags-cscope.vim \
+ 	elvis.rc elvis-2.2_0.patch geco.rc \
diff --git a/devel/global/files/patch-plugin-factory-pygments_parser.py.in b/devel/global/files/patch-plugin-factory-pygments_parser.py.in
new file mode 100644
index 000000000000..35934de00fdd
--- /dev/null
+++ b/devel/global/files/patch-plugin-factory-pygments_parser.py.in
@@ -0,0 +1,7 @@
+--- plugin-factory/pygments_parser.py.in.orig	2021-05-02 07:38:53 UTC
++++ plugin-factory/pygments_parser.py.in
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ #
+ # Copyright (c) 2014
+ #	Yoshitaro Makise
diff --git a/devel/global/pkg-plist b/devel/global/pkg-plist
index b6fc1ab522bf..bb032c2c327c 100644
--- a/devel/global/pkg-plist
+++ b/devel/global/pkg-plist
@@ -21,12 +21,20 @@ man/man1/gtags.1.gz
 man/man1/htags-server.1.gz
 man/man1/htags.1.gz
 man/man5/gtags.conf.5.gz
+share/gtags/AUTHORS
 share/gtags/BUILD_TOOLS
+share/gtags/ChangeLog
 share/gtags/DONORS
+share/gtags/FAQ
+share/gtags/INSTALL
+share/gtags/LICENSE
+share/gtags/NEWS
 share/gtags/PLUGIN_HOWTO
 share/gtags/PLUGIN_HOWTO.pygments
+share/gtags/README
 share/gtags/README.PATCHES
 share/gtags/SERVERSIDE_HOWTO
+share/gtags/THANKS
 share/gtags/completion.cgi
 share/gtags/dot_htaccess
 share/gtags/elvis-2.2_0.patch



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105112151.14BLpTTQ093502>