From fcc5a7393e49421713a441174a08613a7db43a2b Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Sun, 27 Mar 2016 12:56:01 -0400 Subject: [PATCH] abcm2ps: update to 8.11.2. --- srcpkgs/abcm2ps/patches/fix-makefile.patch | 17 +++++++++++++ srcpkgs/abcm2ps/template | 28 +++++++--------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 srcpkgs/abcm2ps/patches/fix-makefile.patch diff --git a/srcpkgs/abcm2ps/patches/fix-makefile.patch b/srcpkgs/abcm2ps/patches/fix-makefile.patch new file mode 100644 index 0000000000..9ec42fc2c4 --- /dev/null +++ b/srcpkgs/abcm2ps/patches/fix-makefile.patch @@ -0,0 +1,17 @@ +--- Makefile.in.bck 2016-03-27 02:52:28.209509627 -0400 ++++ Makefile.in 2016-03-27 02:54:28.288878752 -0400 +@@ -17,10 +17,10 @@ + + srcdir = @srcdir@ + VPATH = @srcdir@ +-bindir = @bindir@ +-libdir = @libdir@ +-datadir = @datarootdir@ +-docdir = @docdir@ ++bindir = $(DESTDIR)@bindir@ ++libdir = $(DESTDIR)@libdir@ ++datadir = $(DESTDIR)@datarootdir@ ++docdir = $(DESTDIR)@docdir@ + + # unix + OBJECTS=abcm2ps.o \ diff --git a/srcpkgs/abcm2ps/template b/srcpkgs/abcm2ps/template index ea1ef9e07e..e805b70da5 100644 --- a/srcpkgs/abcm2ps/template +++ b/srcpkgs/abcm2ps/template @@ -1,30 +1,20 @@ # Template file for 'abcm2ps' pkgname=abcm2ps -version=7.8.14 +version=8.11.2 revision=1 -_commit=7de1ce8463b56cd26f74bbb9003ba1c742a98341 -wrksrc=abcm2ps-${_commit} -build_style=gnu-configure +build_style=configure hostmakedepends="pkg-config" makedepends="pango-devel" short_desc="ABC music notation software" maintainer="lemmi " license="GPL-2" homepage="http://moinejf.free.fr/" -distfiles="https://github.com/leesavide/abcm2ps/archive/${_commit}.tar.gz" -checksum=06cebb494bad177d15267435a419ce328717d1ac9d9fcb9141124244eb4ce15a +distfiles="${homepage}/abcm2ps-${version}.tar.gz" +checksum=fed49ac5d8047c8dda03809a63fb6358d62e6490f2b9163e37745f88671c4981 -# configure/make does not honor destdir -do_install() { - for d in /usr/bin /usr/share/abcm2ps /usr/share/doc/abcm2ps; do - vmkdir $d - done - - vinstall abcm2ps 755 /usr/bin - for f in *.fmt; do - vinstall $f 644 /usr/share/abcm2ps - done - for f in Changes License README.md *.abc *.eps *.txt; do - vinstall $f 644 /usr/share/doc/abcm2ps - done +pre_configure() { + sed -i configure \ + -e 's/CFLAGS=.*/CFLAGS=\"${CFLAGS}\"/' \ + -e 's:prefix=/usr/local:prefix=/usr:' \ + -e 's/CC=.*/CC=${CC}/' }