mirror of
https://github.com/netbirdio/FreeBSD-ports.git
synced 2026-05-22 18:42:42 -07:00
Daniel Engberg
9df302ae69
* Switch from PORTVERSION to DISTVERSION as recommended by Porters Handbook * Import patches from Debian for various fixes [1] * Import patch from Gentoo to fix build with new versions of libxml2 and libxslt [2] * Remove GNU_CONFIGURE_MANPREFIX * Rework Makefile for better readability and to follow Porters Handbook more closely * Unbreak with libxml2 2.14 [3] References: [1] https://sources.debian.org/patches/xmlstarlet/1.6.1-4/50-fix-format-security.patch/ https://sources.debian.org/patches/xmlstarlet/1.6.1-4/60-avoid-silent-rules.patch/ https://sources.debian.org/patches/xmlstarlet/1.6.1-4/70-remove-link-usr-lib.patch/ https://sources.debian.org/patches/xmlstarlet/1.6.1-4/80-fix-unesc-dquot.patch/ https://sources.debian.org/patches/xmlstarlet/1.6.1-4/90-fix-upstream-version.patch/ https://sources.debian.org/patches/xmlstarlet/1.6.1-4/pkg-config.patch/ [2] https://gitweb.gentoo.org/repo/gentoo.git/tree/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang17.patch [3] https://gitlab.archlinux.org/archlinux/packaging/packages/xmlstarlet/-/blob/34eb3ee24a6088a13d5de01af7a2f4e784cff0fc/PKGBUILD#L22 PR: 279976 Tested by: George Mitchell <george@m5p.com> Approved by: maintainer timeout, 3 weeks
48 lines
1.6 KiB
Plaintext
48 lines
1.6 KiB
Plaintext
Description: Do not get version from git repository, get upstream version from
|
|
Debian environment variable.
|
|
Author: Mònica Ramírez Arceda <monica@debian.org>
|
|
Bug: https://bugs.debian.org/850842
|
|
Last-Update: 2017-01-24
|
|
|
|
--- Makefile.am
|
|
+++ Makefile.am
|
|
@@ -7,18 +7,11 @@
|
|
AM_CFLAGS = -Wall -pedantic
|
|
endif
|
|
|
|
-GIT_DESCRIBE = git describe --tags --dirty
|
|
-
|
|
# TODO: figure out why log removal is needed and/or make it completely automatic
|
|
dist-hook:
|
|
@for log in $(srcdir)/examples/*.log ; do if [ -f "$$log" ] ; then \
|
|
rm $(srcdir)/examples/*.log ; \
|
|
echo 'ERROR: log files need to cleaned BEFORE making tarball, try again'; exit 1 ; fi ; done
|
|
- @ if [ -d .git ] ; then \
|
|
- if [ $(VERSION) != `$(GIT_DESCRIBE)` ] ; then \
|
|
- echo 'ERROR: version mismatch, rerun autoconf -f' ; exit 1 ; fi ; \
|
|
- $(SED) 's/\[m4_esyscmd_s(\[$(GIT_DESCRIBE)\])\]/[$(VERSION)]/' \
|
|
- $(srcdir)/configure.ac > $(distdir)/configure.ac ; fi
|
|
|
|
cleantar:
|
|
@(rm -f xmlstarlet*.tar.gz)
|
|
@@ -40,9 +33,7 @@
|
|
dist-win32: $(distdir)-win32.zip
|
|
|
|
version.h: VERSION
|
|
- @if [ -d .git ] ; then \
|
|
- VERSION=`$(GIT_DESCRIBE)`; \
|
|
- else VERSION=$(VERSION) ; fi; \
|
|
+ VERSION=$(VERSION) ; \
|
|
NEW_VERSION="#define VERSION \"$$VERSION\""; \
|
|
OLD_VERSION=`cat version.h 2>/dev/null` ; \
|
|
if [ "$$NEW_VERSION" != "$$OLD_VERSION" ] ; then \
|
|
--- configure.ac
|
|
+++ configure.ac
|
|
@@ -1,5 +1,5 @@
|
|
AC_PREREQ([2.62])
|
|
-AC_INIT([XMLStarlet], [m4_esyscmd_s([git describe --tags --dirty])],
|
|
+AC_INIT([XMLStarlet], [%%DISTVERSION%%],
|
|
[http://sourceforge.net/projects/xmlstar/support],
|
|
[],
|
|
[http://xmlstar.sourceforge.net/])
|