summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/cdlabelgen/Makefile4
-rw-r--r--graphics/cdlabelgen/files/md54
-rw-r--r--graphics/cdlabelgen/files/patch-sum7
-rw-r--r--graphics/cdlabelgen/patches/patch-aa20
-rw-r--r--graphics/cdlabelgen/patches/patch-ab48
-rw-r--r--graphics/cdlabelgen/patches/patch-ac13
-rw-r--r--graphics/cdlabelgen/pkg/PLIST4
7 files changed, 53 insertions, 47 deletions
diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile
index c72d1e6ad7b..ba88106cbba 100644
--- a/graphics/cdlabelgen/Makefile
+++ b/graphics/cdlabelgen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:43 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/08/08 01:09:49 mjl Exp $
#
-DISTNAME= cdlabelgen-1.1.3
+DISTNAME= cdlabelgen-1.5.0
CATEGORIES= graphics
MASTER_SITES= http://www.red-bean.com/~bwf/software/cdlabelgen/ \
ftp://ftp.red-bean.com/pub/bwf/ \
diff --git a/graphics/cdlabelgen/files/md5 b/graphics/cdlabelgen/files/md5
index e5585b8e5cb..a177fe010b0 100644
--- a/graphics/cdlabelgen/files/md5
+++ b/graphics/cdlabelgen/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/03/30 09:13:12 rh Exp $
+$NetBSD: md5,v 1.2 1999/08/08 01:09:50 mjl Exp $
-MD5 (cdlabelgen-1.1.3.tar.gz) = 2bf1e03d95d0c80ac86c4752289cac3c
+MD5 (cdlabelgen-1.5.0.tar.gz) = 3ed7968301825d658d470de5f00812aa
diff --git a/graphics/cdlabelgen/files/patch-sum b/graphics/cdlabelgen/files/patch-sum
index 12438e54b27..4955243724b 100644
--- a/graphics/cdlabelgen/files/patch-sum
+++ b/graphics/cdlabelgen/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:06 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/08 01:09:50 mjl Exp $
-MD5 (patch-aa) = 9cac85ec36392b977ba508f9673a902c
-MD5 (patch-ab) = 19ebf53324a27476806c57a061cc29cf
+MD5 (patch-aa) = 4cbaa77ec2eec70c6c6d862b84bded94
+MD5 (patch-ab) = 49013123d842431dca91446430702ffe
+MD5 (patch-ac) = 8fefe409303e0399a8b97ca9aa49fb13
diff --git a/graphics/cdlabelgen/patches/patch-aa b/graphics/cdlabelgen/patches/patch-aa
index ff347b8ef3b..c7eb990e748 100644
--- a/graphics/cdlabelgen/patches/patch-aa
+++ b/graphics/cdlabelgen/patches/patch-aa
@@ -1,28 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/03/30 09:13:12 rh Exp $
+$NetBSD: patch-aa,v 1.2 1999/08/08 01:09:51 mjl Exp $
---- cdlabelgen.orig Thu Mar 25 01:17:34 1999
-+++ cdlabelgen Tue Mar 30 10:28:48 1999
+--- cdlabelgen.orig Sun Aug 8 02:31:39 1999
++++ cdlabelgen Sun Aug 8 02:33:28 1999
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PREFIX@/bin/perl -w
#
# cdlabelgen - a program for making cd jewel box covers and traycards
#
-@@ -35,7 +35,7 @@
+@@ -35,7 +35,8 @@
# Modify this if you want to store your template somewhere else
# Perhaps we can make this part of a conf file in the future?
-my @where_is_the_template = ('/usr/share/cdlabelgen/',
-+my @where_is_the_template = ('@PREFIX@/share/cdlabelgen/',
++my @where_is_the_template = ('@PREFIX@/share/cdlabelgen',
++ '/usr/share/cdlabelgen/',
'/usr/local/share/cdlabelgen/',
'/usr/local/lib/cdlabelgen/',
'/etc/cdlabelgen/',
-@@ -373,7 +373,7 @@
-
- =head1 EXAMPLES
-
-- ./cdlabelgen -c "My Filesystem" -s "/usr/local/foo" -e postscript/recycle.epsi > foo.ps
-+ ./cdlabelgen -c "My Filesystem" -s "/@PREFIX@/foo" -e postscript/recycle.epsi > foo.ps
-
- ./cdlabelgen -c "title of cd" -s "subtitle" -i "Item 1%and Item 2%a third item here perhaps" -e postscript/recycle.epsi > bar.ps
-
diff --git a/graphics/cdlabelgen/patches/patch-ab b/graphics/cdlabelgen/patches/patch-ab
index f141ea0394a..f1ed8bf08d8 100644
--- a/graphics/cdlabelgen/patches/patch-ab
+++ b/graphics/cdlabelgen/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/03/30 09:13:12 rh Exp $
+$NetBSD: patch-ab,v 1.2 1999/08/08 01:09:51 mjl Exp $
---- Makefile.orig Thu Mar 25 01:17:34 1999
-+++ Makefile Tue Mar 30 10:49:43 1999
-@@ -4,23 +4,24 @@
+--- Makefile.orig Sun Aug 8 02:34:22 1999
++++ Makefile Sun Aug 8 02:37:09 1999
+@@ -4,31 +4,29 @@
# Where you want cdlabelgen and related files to be
@@ -10,13 +10,15 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/03/30 09:13:12 rh Exp $
+BASE_DIR = ${PREFIX}
TEMPLATE = ./postscript/template.ps
SOURCES = cdlabelgen ChangeLog COPYING INSTALL README Makefile
- POSTSCRIPT = template.ps recycle.ps recycle.epsi mp3.eps cdda.eps cd.eps penguin.eps
- DISTFILES = ${SOURCES} ${POSTSCRIPT}
-
- # just use 'cp -a' if you don't have install...
--INSTALL := install -m 0755 -p
--INSTALL_FILE := install -m 0644 -p
+ POSTSCRIPT = template.ps recycle.ps recycle.epsi mp3.eps cdda.eps \
+ cd.eps penguin.eps debian-color.eps debian-bw.eps
+ DISTFILES = $(SOURCES) $(POSTSCRIPT)
+-# just use 'cp -a' if you don't have install...
+-INSTALL := install -m 0755
+-INSTALL_DIR := install -d -m 0755
+-INSTALL_FILE := install -m 0644
+-
all: cdlabelgen
+ ${SED} s=@PREFIX@=${PREFIX}=g <cdlabelgen >cdlabelgen.new
+ ${MV} cdlabelgen.new cdlabelgen
@@ -24,25 +26,21 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/03/30 09:13:12 rh Exp $
###
install:
- @echo "Installing cdlabelgen under ${BASE_DIR}"
+- @echo "Installing cdlabelgen under $(BASE_DIR)"
++ @echo "Installing cdlabelgen under ${BASE_DIR}"
@echo ""
-- $(INSTALL) cdlabelgen ${BASE_DIR}/bin
-+ ${INSTALL_SCRIPT} cdlabelgen ${PREFIX}/bin
- @if [ ! -d ${BASE_DIR}/share/cdlabelgen ]; then \
- mkdir ${BASE_DIR}/share/cdlabelgen; \
- chmod 755 ${BASE_DIR}/share/cdlabelgen; \
-@@ -28,11 +29,12 @@
- echo "${BASE_DIR}/share/cdlabelgen already exists, not creating"; \
- echo ""; \
- fi
-- $(INSTALL_FILE) ${TEMPLATE} ${BASE_DIR}/share/cdlabelgen
-+ ${INSTALL_DATA} ${TEMPLATE} ${BASE_DIR}/share/cdlabelgen
+- $(INSTALL_DIR) $(BASE_DIR)/bin
+- $(INSTALL) cdlabelgen $(BASE_DIR)/bin
+- $(INSTALL_DIR) $(BASE_DIR)/share/cdlabelgen
+- $(INSTALL_FILE) $(TEMPLATE) $(BASE_DIR)/share/cdlabelgen
++ ${INSTALL_SCRIPT} cdlabelgen ${BASE_DIR}/bin/cdlabelgen
++ mkdir ${BASE_DIR}/share/cdlabelgen
++ ${INSTALL_DATA} $(TEMPLATE) ${BASE_DIR}/share/cdlabelgen/
++ ${INSTALL_MAN} cdlabelgen.0 ${BASE_DIR}/man/cat1/
set -e; \
for file in $(POSTSCRIPT); do \
-- $(INSTALL_FILE) postscript/$$file ${BASE_DIR}/share/cdlabelgen/; \
+- $(INSTALL_FILE) postscript/$$file $(BASE_DIR)/share/cdlabelgen/; \
+ ${INSTALL_DATA} postscript/$$file ${BASE_DIR}/share/cdlabelgen/; \
done
-+ ${INSTALL_MAN} cdlabelgen.0 ${PREFIX}/man/cat1
dist:
- rm -rf cdlabelgen-${VERSION}
diff --git a/graphics/cdlabelgen/patches/patch-ac b/graphics/cdlabelgen/patches/patch-ac
new file mode 100644
index 00000000000..aef4de6ed5f
--- /dev/null
+++ b/graphics/cdlabelgen/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 1999/08/08 01:09:51 mjl Exp $
+
+--- postscript/template.ps.orig Sun Aug 8 02:38:01 1999
++++ postscript/template.ps Sun Aug 8 02:38:21 1999
+@@ -533,7 +533,7 @@
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %% And off we go
+ %% Position ourselves in a reasonable place
+- .5 in .5 in translate
++ .5 in 1.5 in translate
+
+ first_endcap
+ tray_card
diff --git a/graphics/cdlabelgen/pkg/PLIST b/graphics/cdlabelgen/pkg/PLIST
index 7bc61969c1e..c4ce862b9b5 100644
--- a/graphics/cdlabelgen/pkg/PLIST
+++ b/graphics/cdlabelgen/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/03/30 09:13:12 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/08/08 01:09:51 mjl Exp $
bin/cdlabelgen
man/cat1/cdlabelgen.0
share/cdlabelgen/template.ps
@@ -8,4 +8,6 @@ share/cdlabelgen/mp3.eps
share/cdlabelgen/cdda.eps
share/cdlabelgen/cd.eps
share/cdlabelgen/penguin.eps
+share/cdlabelgen/debian-color.eps
+share/cdlabelgen/debian-bw.eps
@dirrm share/cdlabelgen