diff options
author | wiz <wiz@pkgsrc.org> | 2006-02-18 16:09:59 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2006-02-18 16:09:59 +0000 |
commit | 021d8a92df98a3833b19c85b7e63e9b20a522085 (patch) | |
tree | 84425468a5e75b90caa7c6a46b579ac6da33281c /graphics/impress/patches | |
parent | a2c6d5669d5131eae4d5d27337312e8f3cf5c78e (diff) | |
download | pkgsrc-021d8a92df98a3833b19c85b7e63e9b20a522085.tar.gz |
Do not move ${PREFIX}/bin/pstoedit (unnecessarily). Found by CHECK_PLIST build.
Diffstat (limited to 'graphics/impress/patches')
-rw-r--r-- | graphics/impress/patches/patch-aa | 18 | ||||
-rw-r--r-- | graphics/impress/patches/patch-ab | 18 |
2 files changed, 19 insertions, 17 deletions
diff --git a/graphics/impress/patches/patch-aa b/graphics/impress/patches/patch-aa index e861b88a481..710c1a43258 100644 --- a/graphics/impress/patches/patch-aa +++ b/graphics/impress/patches/patch-aa @@ -1,8 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/07/13 14:38:05 manu Exp $ ---- src/Makefile.orig Fri Jul 13 14:40:10 2001 -+++ src/Makefile Fri Jul 13 14:40:44 2001 -@@ -1,8 +1,9 @@ - cmp=/usr/bin/cmp +$NetBSD: patch-aa,v 1.2 2006/02/18 16:09:59 wiz Exp $ +--- src/Makefile.orig 2001-06-19 03:33:08.000000000 +0000 ++++ src/Makefile +@@ -2,6 +2,7 @@ cmp=/usr/bin/cmp cp=/bin/cp mv=/bin/mv ln=/bin/ln @@ -10,9 +9,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/07/13 14:38:05 manu Exp $ all: impress transeps - impress: impress.tcl -@@ -26,9 +27,9 @@ - @-${cmp} drvbase.h ../pstoedit/src/drvbase.h 2>/dev/null || \ +@@ -27,7 +28,7 @@ installdrvtk: ../pstoedit/src/drvtk.cpp. echo "Updating drvbase.h" >&2 && ${cp} drvbase.h ../pstoedit/src install: impress impress.tcl transeps COPYING CHANGES OPTIONS README tkFont-patch.diff tkUnixWm-patch.diff installdrvtk @@ -21,9 +18,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/07/13 14:38:05 manu Exp $ @-${cmp} impress ../bin/impress 2>/dev/null || \ echo "Updating impress" >&2 && ${cp} impress ../bin @-${cmp} transeps ../bin/transeps 2>/dev/null || \ - echo "Updating transeps" >&2 && ${cp} transeps ../bin -@@ -43,9 +44,9 @@ - @-${cmp} tkFont-patch.diff ../tkFont-patch.diff 2>/dev/null || \ +@@ -44,7 +45,7 @@ install: impress impress.tcl transeps CO echo "Updating tkFont-patch.diff" >&2 && ${cp} tkFont-patch.diff .. @-${cmp} tkUnixWm-patch.diff ../tkUnixWm-patch.diff 2>/dev/null || \ echo "Updating tkUnixWm-patch.diff" >&2 && ${cp} tkUnixWm-patch.diff .. @@ -32,4 +27,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/07/13 14:38:05 manu Exp $ @-${cmp} doc/arrows.jpg ../doc/arrows.jpg 2>/dev/null || \ echo "Updating arrows.jpg" >&2 && ${cp} doc/arrows.jpg ../doc @-${cmp} doc/custcolor.jpg ../doc/custcolor.jpg 2>/dev/null || \ - echo "Updating custcolor.jpg" >&2 && ${cp} doc/custcolor.jpg ../doc diff --git a/graphics/impress/patches/patch-ab b/graphics/impress/patches/patch-ab index b2266e57d1b..46a05252bcd 100644 --- a/graphics/impress/patches/patch-ab +++ b/graphics/impress/patches/patch-ab @@ -1,16 +1,24 @@ -$NetBSD: patch-ab,v 1.2 2003/06/06 22:50:27 jmmv Exp $ +$NetBSD: patch-ab,v 1.3 2006/02/18 16:09:59 wiz Exp $ ---- Makefile.orig 2000-10-27 07:08:32.000000000 +0200 +--- Makefile.orig 2000-10-27 05:08:32.000000000 +0000 +++ Makefile -@@ -3,7 +3,6 @@ cp=/bin/cp +@@ -3,9 +3,8 @@ cp=/bin/cp mv=/bin/mv strip=/usr/bin/strip ln=/bin/ln -PREFIX=/usr - all: make_impress make_font3d make_pstoedit +-all: make_impress make_font3d make_pstoedit ++all: make_impress make_font3d -@@ -30,4 +29,4 @@ install: $(PREFIX)/bin/pstoedit.orig + make_font3d: + (cd font3d;make LDFLAGS=-static) +@@ -26,8 +25,8 @@ make_impress: + $(PREFIX)/bin/pstoedit.orig: + @-mv $(PREFIX)/bin/pstoedit $(PREFIX)/bin/pstoedit.orig + +-install: $(PREFIX)/bin/pstoedit.orig ++install: install -c bin/impress $(PREFIX)/bin && rm -f $(PREFIX)/bin/impress.tcl && ${ln} -s $(PREFIX)/bin/impress $(PREFIX)/bin/impress.tcl install -c bin/transeps $(PREFIX)/bin install -c bin/font3d $(PREFIX)/bin |