From 711d5b4370617797a45c1b4aee668f7a64f5c2ce Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 10 Dec 2016 10:13:41 +0000 Subject: [PATCH] abcm2ps: cleanup --- srcpkgs/abcm2ps/patches/fix-makefile.patch | 17 ----------------- srcpkgs/abcm2ps/template | 13 +++++-------- 2 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/abcm2ps/patches/fix-makefile.patch diff --git a/srcpkgs/abcm2ps/patches/fix-makefile.patch b/srcpkgs/abcm2ps/patches/fix-makefile.patch deleted file mode 100644 index 9ec42fc2c43..00000000000 --- a/srcpkgs/abcm2ps/patches/fix-makefile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 ac41803b488..653a09a268e 100644 --- a/srcpkgs/abcm2ps/template +++ b/srcpkgs/abcm2ps/template @@ -1,7 +1,7 @@ # Template file for 'abcm2ps' pkgname=abcm2ps version=8.12.9 -revision=2 +revision=3 build_style=configure hostmakedepends="pkg-config" makedepends="pango-devel" @@ -13,11 +13,8 @@ distfiles="${homepage}/abcm2ps-${version}.tar.gz" checksum=72b8f40964234edf2043bdc83527c37989bbb5fb3b4c108c2ef3cd1883399af4 pre_configure() { - sed -i configure \ - -e 's/CFLAGS=.*/CFLAGS=\"${CFLAGS}\"/' \ - -e 's:prefix=/usr/local:prefix=/usr:' \ - -e 's/CC=.*/CC=${CC}/' - - sed -i Makefile.in \ - -e 's/ = $(DESTDIR)/ = /' + echo CC=${CC} >> custom + echo CFLAGS+=\" $CFLAGS\" >> custom + echo prefix=/usr >> custom + echo 'docdir=${prefix}/share/doc' >> custom }