cadubi-1.3

now with a better license (perl artistic)

graphics/cadubi/Makefile

@@ -1,19 +1,17 @@
-# $OpenBSD: Makefile,v 1.8 2004/02/02 18:02:22 sturm Exp $
+# $OpenBSD: Makefile,v 1.9 2004/02/27 05:31:46 jcs Exp $
 
-DISTNAME=	cadubi_1.2
-PKGNAME=	${DISTNAME:S/_/-/g}
+DISTNAME=	cadubi-1.3
 CATEGORIES=	graphics editors
 
-PERMIT_PACKAGE_CDROM=	"May not be used in a for-profit package"
+# perl artistic
+PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	"May not be used in a for-profit package"
+PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 COMMENT=	"ASCII drawing utility"
-HOMEPAGE=	http://www.logicallemon.com/cadubi/
-MASTER_SITES=	ftp://ftp.logicallemon.com/pub/cadubi/
-
-MAINTAINER=	Joshua Stein <jcs@rt.fm>
+HOMEPAGE=	http://langworth.com/CadubiProject
+MASTER_SITES=	http://langworth.com/downloads/
 
 RUN_DEPENDS=	::devel/p5-Term-ReadKey
 
@@ -23,8 +21,7 @@ PKG_ARCH=	*
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cadubi ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/CADUBI.pl ${PREFIX}/libexec
 	@mkdir ${PREFIX}/share/doc/cadubi
-	${INSTALL_DATA} ${WRKSRC}/CADUBI.help ${PREFIX}/share/doc/cadubi
+	${INSTALL_DATA} ${WRKSRC}/help.txt ${PREFIX}/share/doc/cadubi
 
 .include <bsd.port.mk>

graphics/cadubi/distinfo

@@ -1,3 +1,3 @@
-MD5 (cadubi_1.2.tar.gz) = 53315c148dffda233f04ad83bafd20aa
-RMD160 (cadubi_1.2.tar.gz) = 29be5c900df49a0db4898ffe08f3fd64182cfcfd
-SHA1 (cadubi_1.2.tar.gz) = c53d7cd2a26f33ce29f2c2510dabae5f7f19fce1
+MD5 (cadubi-1.3.tar.gz) = e4ba1f6995bfdae8639341446782b859
+RMD160 (cadubi-1.3.tar.gz) = c6b78566b510eb41511b9ff29b94818555f80c07
+SHA1 (cadubi-1.3.tar.gz) = 3071b6ce1fce911f37eae3e01bef932d3cfb11d8

graphics/cadubi/patches/patch-CADUBI_pl

@@ -1,24 +0,0 @@
---- CADUBI.pl~	Sat Dec 22 01:56:09 2001
-+++ CADUBI.pl	Sat Dec 22 01:57:31 2001
-@@ -716,10 +716,10 @@ sub HandleKeystroke {
- 	
- 	# help
- 	if (ord($key) == $keymap{'^h'}) { #Help
--		if (-e $Bin.'/CADUBI.help') {
-+		if (-e $Helpfile.'/CADUBI.help') {
- 			my @oldmap = @charmap;
- 			my @oldpos = @pos;
--			&readfile($Bin.'/CADUBI.help');
-+			&readfile($Helpfile.'/CADUBI.help');
- 			&status('Press a key to continue...', 1);
- 			my $temp = ReadKey(0);
- 			@charmap = @oldmap;
-@@ -729,7 +729,7 @@ sub HandleKeystroke {
- 			&status;
- 		} else {
- 			&beep;
--			&status("'".$Bin."/CADUBI.help' not available");
-+			&status("'".$Helpfile."/CADUBI.help' not available");
- 		}
- 		return 0;
- 	}

graphics/cadubi/patches/patch-cadubi

@@ -1,9 +1,12 @@
---- cadubi~	Sat Dec 22 01:58:06 2001
-+++ cadubi	Sat Dec 22 01:59:04 2001
-@@ -32,5 +32,5 @@ use FindBin qw($Bin); use lib "$Bin/../l
- my $CADUBI_Arguments = undef;
- $CADUBI_Arguments .= ' --mute' unless $AUDIBLE;
- $CADUBI_Arguments .= ' '.$ADD_OPS if $ADD_OPS;
--exec ('perl '.$Bin.'/CADUBI.pl'.$CADUBI_Arguments.' '.join(' ',@ARGV));
-+exec ('perl '.$Bin.'/../libexec/CADUBI.pl'.$CADUBI_Arguments.' '.join(' ',@ARGV));
+$OpenBSD: patch-cadubi,v 1.3 2004/02/27 05:31:46 jcs Exp $
+--- cadubi.orig	Thu Feb 26 23:27:56 2004
++++ cadubi	Thu Feb 26 23:28:27 2004
+@@ -18,7 +18,7 @@
+ # (sorry guys, i wrote this years before i had the remotest clue as to
+ #  what the hell i was doing)
+ use FindBin qw($Bin);
+-$HELPFILE = "$Bin/help.txt";
++$HELPFILE = "$Bin/../share/doc/cadubi/help.txt";
  
+ # other stuff
+ $DEBUG = 0;

graphics/cadubi/pkg/PLIST

@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/07/28 23:22:00 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/02/27 05:31:46 jcs Exp $
 bin/cadubi
-libexec/CADUBI.pl
-share/doc/cadubi/CADUBI.help
+share/doc/cadubi/help.txt
 @dirrm share/doc/cadubi