svn commit: r540434 - in head/sysutils/debhelper: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Fri Jun 26 08:43:18 UTC 2020
Author: sunpoet
Date: Fri Jun 26 08:43:14 2020
New Revision: 540434
URL: https://svnweb.freebsd.org/changeset/ports/540434
Log:
Handle HIGHEST_STABLE_COMPAT_LEVEL correctly without dpkg-parsechangelog
- Bump PORTREVISION for package change
Modified:
head/sysutils/debhelper/Makefile
head/sysutils/debhelper/files/patch-Makefile
Modified: head/sysutils/debhelper/Makefile
==============================================================================
--- head/sysutils/debhelper/Makefile Fri Jun 26 08:43:09 2020 (r540433)
+++ head/sysutils/debhelper/Makefile Fri Jun 26 08:43:14 2020 (r540434)
@@ -3,6 +3,7 @@
PORTNAME= debhelper
PORTVERSION= 13.1
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/GPL
USES= gmake perl5 shebangfix tar:xz
-MAKE_ARGS= PREFIX=${PREFIX} SITE_PERL=${PREFIX}/${SITE_PERL_REL}
+MAKE_ARGS= PREFIX=${PREFIX} SITE_PERL=${PREFIX}/${SITE_PERL_REL} VERSION=${PORTVERSION}
NO_ARCH= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
Modified: head/sysutils/debhelper/files/patch-Makefile
==============================================================================
--- head/sysutils/debhelper/files/patch-Makefile Fri Jun 26 08:43:09 2020 (r540433)
+++ head/sysutils/debhelper/files/patch-Makefile Fri Jun 26 08:43:14 2020 (r540434)
@@ -9,7 +9,16 @@
MANPAGES=$(COMMANDS:=.1) dh.1
# Find deprecated commands by looking at their synopsis.
-@@ -118,23 +118,22 @@ endif
+@@ -16,7 +16,7 @@ else
+ endif
+
+ # Figure out the `current debhelper version.
+-VERSION=$(shell dpkg-parsechangelog -SVersion)
++#VERSION=$(shell dpkg-parsechangelog -SVersion)
+
+ # This generates a list of synopses of debhelper commands, and substitutes
+ # it in to the #LIST# line on the man page fed to it on stdin. Must be passed
+@@ -118,23 +118,21 @@ endif
done;
install:
@@ -31,8 +40,9 @@
- sed -i '/$$prefix=/s@/usr@$(PREFIX)@g' $(DESTDIR)$(PERLLIBDIR)/Dh_Lib.pm
+ sed -i '' '/$$prefix=/s@/usr@$(PREFIX)@g' $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Dh_Lib.pm
if [ "$(VERSION)" ]; then \
- MV=$$(echo "$(VERSION)" | $(PERL) -ne 'print $$1 if /^(\d+)[~.]/;') ; \
- sed -i "/constant HIGHEST_STABLE_COMPAT_LEVEL =>/s@=>.*;@=> $${MV};@g" $(DESTDIR)$(PERLLIBDIR)/Dh_Lib.pm ; \
+- MV=$$(echo "$(VERSION)" | $(PERL) -ne 'print $$1 if /^(\d+)[~.]/;') ; \
+- sed -i "/constant HIGHEST_STABLE_COMPAT_LEVEL =>/s@=>.*;@=> $${MV};@g" $(DESTDIR)$(PERLLIBDIR)/Dh_Lib.pm ; \
++ sed -i '' "/constant HIGHEST_STABLE_COMPAT_LEVEL =>/s@=>.*;@=> $${VERSION};@g" $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Dh_Lib.pm ; \
fi
- install -m 0644 lib/Debian/Debhelper/Sequence/*.pm $(DESTDIR)$(PERLLIBDIR)/Sequence
- install -m 0644 lib/Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)$(PERLLIBDIR)/Buildsystem
More information about the svn-ports-all
mailing list