From 3cb2ede4dcbda9415d3faa628259f5d772e4a591 Mon Sep 17 00:00:00 2001 From: Emanuel Haupt Date: Mon, 11 May 2020 07:58:14 +0000 Subject: - Update to 1.1 - Update WWW to use the project space of the new upstream maintainer - Make portclippy/portfmt happy --- textproc/splitpatch/Makefile | 15 +++++----- textproc/splitpatch/distinfo | 6 ++-- textproc/splitpatch/files/patch-man_pod2man.mk | 38 ++++++-------------------- textproc/splitpatch/pkg-descr | 2 +- 4 files changed, 20 insertions(+), 41 deletions(-) (limited to 'textproc') diff --git a/textproc/splitpatch/Makefile b/textproc/splitpatch/Makefile index 2d1e509ad65c..84454c3e2cd8 100644 --- a/textproc/splitpatch/Makefile +++ b/textproc/splitpatch/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= splitpatch -PORTVERSION= 1.0.2016122801 +PORTVERSION= 1.1 +DISTVERSIONPREFIX= release/ CATEGORIES= textproc MAINTAINER= ehaupt@FreeBSD.org @@ -11,17 +12,17 @@ COMMENT= Utility to split a diff patch into separate sections LICENSE= GPLv2+ USES= gmake perl5 +USE_GITHUB= yes +GH_ACCOUNT= jaalto USE_PERL5= build USE_RUBY= yes -NO_ARCH= yes -USE_GITHUB= yes -GH_ACCOUNT= jaalto -GH_TAGNAME= 13c5941 +MAKE_JOBS_UNSAFE= yes -PLIST_FILES= bin/splitpatch man/man1/splitpatch.1.gz +NO_ARCH= yes -MAKE_JOBS_UNSAFE=yes +PLIST_FILES= bin/splitpatch \ + man/man1/splitpatch.1.gz do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${MANPREFIX}/man/man1 diff --git a/textproc/splitpatch/distinfo b/textproc/splitpatch/distinfo index 7333cf83ff00..dcac48b7bd26 100644 --- a/textproc/splitpatch/distinfo +++ b/textproc/splitpatch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1482940118 -SHA256 (jaalto-splitpatch-1.0.2016122801-13c5941_GH0.tar.gz) = d07e1c00794eefa2f3c2b7f204f4fbdfcbe1afcff595a88fbd3fce7b925584d9 -SIZE (jaalto-splitpatch-1.0.2016122801-13c5941_GH0.tar.gz) = 4798 +TIMESTAMP = 1589178880 +SHA256 (jaalto-splitpatch-release-1.1_GH0.tar.gz) = 221f693cf6e8cba91f7e3150b9c2394a170a678992907697c43a40db61332f0c +SIZE (jaalto-splitpatch-release-1.1_GH0.tar.gz) = 11675 diff --git a/textproc/splitpatch/files/patch-man_pod2man.mk b/textproc/splitpatch/files/patch-man_pod2man.mk index 4dabb2a0d3a6..564243173888 100644 --- a/textproc/splitpatch/files/patch-man_pod2man.mk +++ b/textproc/splitpatch/files/patch-man_pod2man.mk @@ -1,33 +1,11 @@ ---- man/pod2man.mk.orig 2016-08-15 17:36:10 UTC +--- man/pod2man.mk.orig 2020-05-09 06:49:29 UTC +++ man/pod2man.mk -@@ -36,7 +36,6 @@ RELEASE ?= $(PACKAGE) - - # Optional variables to set - MANSECT ?= 1 --PODCENTER ?= $$(date "+%Y-%m-%d") +@@ -41,7 +41,7 @@ DATE_FMT = %Y-%m-%d + ifdef SOURCE_DATE_EPOCH + PODCENTER ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u "+$(DATE_FMT)") + else +-PODCENTER ?= $(date "$(DATE_FMT)") ++PODCENTER ?= $(shell date "+$(DATE_FMT)") + endif # Directories - MANSRC = -@@ -46,7 +45,6 @@ MANPOD = $(MANSRC)$(PACKAGE).$(MANSECT) - MANPAGE = $(MANDEST)$(PACKAGE).$(MANSECT) - - POD2MAN = pod2man --POD2MAN_FLAGS = --utf8 - - makeman: $(MANPAGE) - -@@ -54,12 +52,9 @@ $(MANPAGE): $(MANPOD) - # make target - create manual page from a *.pod page - podchecker $(MANPOD) - LC_ALL=C $(POD2MAN) $(POD2MAN_FLAGS) \ -- --center="$(PODCENTER)" \ -+ --center=" " \ - --name="$(PACKAGE)" \ - --section="$(MANSECT)" \ - --release="$(RELEASE)" \ - $(MANPOD) \ -- > $(MANPAGE) && \ -- rm -f pod*.tmp -- --# End of of Makefile part -+ > $(MANPAGE) diff --git a/textproc/splitpatch/pkg-descr b/textproc/splitpatch/pkg-descr index c08dfcd91157..22abdf6f3a9f 100644 --- a/textproc/splitpatch/pkg-descr +++ b/textproc/splitpatch/pkg-descr @@ -2,4 +2,4 @@ A utility to split a diff patch into separate sections. It also features splitting a patch file by hunks instead of the default by file. This is very useful for merging patches that fail to apply by only some hunks. -WWW: https://github.com/benjsc/splitpatch +WWW: https://github.com/jaalto/splitpatch -- cgit v1.2.3