Upgrade to ascd-0.12.0

6 files changed, 137 insertions, 5 deletions

diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile
index 05c4a8a498f0..075d63b6da2c 100644
--- a/audio/ascd/Makefile
+++ b/audio/ascd/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	ascd
-# Version required:		0.10.1
+# Version required:		0.12.0
 # Date created:			29 November 1998
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id: Makefile,v 1.6 1999/03/08 20:06:04 fenner Exp $
+# $Id: Makefile,v 1.7 1999/03/31 15:27:13 steve Exp $
 #
 
-DISTNAME=	ascd-0.10.1+lib
-PKGNAME=	ascd-0.10.1
+DISTNAME=	ascd-0.12.0+lib-src
+PKGNAME=	ascd-0.12
 CATEGORIES=	audio afterstep windowmaker
 MASTER_SITES=	http://worldserver.oleane.com/rsn/Archives/
 EXTRACT_SUFX=	.tgz
@@ -17,6 +17,9 @@ MAINTAINER=	jim@phrantic.phear.net
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_SCRIPT=	default
+
 MAN1=		ascd.1
 
 .include <bsd.port.mk>
diff --git a/audio/ascd/distinfo b/audio/ascd/distinfo
index 990a67e21f07..5f8e3ec7824c 100644
--- a/audio/ascd/distinfo
+++ b/audio/ascd/distinfo
@@ -1 +1 @@
-MD5 (ascd-0.10.1+lib.tgz) = 3b1984002cb5c9a76b7ead45b8692fdd
+MD5 (ascd-0.12.0+lib-src.tgz) = 8651120eb4d9c0008f7b941fb3435043
diff --git a/audio/ascd/files/patch-aa b/audio/ascd/files/patch-aa
new file mode 100644
index 000000000000..cfbe02066ad6
--- /dev/null
+++ b/audio/ascd/files/patch-aa
@@ -0,0 +1,10 @@
+--- ascd/misc/config.h.default.orig	Thu Apr 22 20:21:56 1999
++++ ascd/misc/config.h.default	Thu Apr 22 20:22:21 1999
+@@ -1,5 +1,5 @@
+ #define PACKAGE "ascd"
+ #define DEFAULT_COLOR "#2FAFAF"
+ #define DEFAULT_BGCOLOR "#000000"
+-#define DEFAULTDEVICE "/dev/cdrom"
+-#define THDIR "/usr/local/share/AScd"
++#define DEFAULTDEVICE "/dev/wcd0c"
++#define THDIR "/usr/X11R6/share/ascd"
diff --git a/audio/ascd/files/patch-ab b/audio/ascd/files/patch-ab
new file mode 100644
index 000000000000..d86b23ab7386
--- /dev/null
+++ b/audio/ascd/files/patch-ab
@@ -0,0 +1,9 @@
+--- ascd/misc/dirs.h.default.orig	Thu Apr 22 20:22:02 1999
++++ ascd/misc/dirs.h.default	Thu Apr 22 20:22:47 1999
+@@ -1,3 +1,3 @@
+-#define CBINDIR /usr/local/bin
+-#define CMANDIR /usr/local/man/man1
+-#define CTHDIR /usr/local/share/AScd
++#define CBINDIR /usr/X11R6/bin
++#define CMANDIR /usr/X11R6/man/man1
++#define CTHDIR /usr/X11R6/share/ascd
diff --git a/audio/ascd/files/patch-ae b/audio/ascd/files/patch-ae
new file mode 100644
index 000000000000..f57df8b24cae
--- /dev/null
+++ b/audio/ascd/files/patch-ae
@@ -0,0 +1,20 @@
+--- ascd/Imakefile.orig	Thu Apr 22 20:53:46 1999
++++ ascd/Imakefile	Thu Apr 22 20:54:09 1999
+@@ -5,7 +5,7 @@
+ BINDIR		= CBINDIR
+ MANDIR		= CMANDIR
+ THEMESDIR	= CTHDIR
+-MOREFLAGS	= -I/usr/local/include -I.
++MOREFLAGS	= -I/usr/X11R6/include -I.
+ CCOPTIONS	= $(MOREFLAGS)
+ SYS_LIBRARIES	= $(XLIB) -lXpm
+ 	
+@@ -15,7 +15,7 @@
+ WM_LIB = 
+ #endif
+ 
+-LOCAL_LIBRARIES = -L../libworkman -lworkman -L/usr/local/lib
++LOCAL_LIBRARIES = -L../libworkman -lworkman -L/usr/X11R6/lib
+ 
+ SRCS = cdcontrol.c ascd.c
+ OBJS = cdcontrol.o ascd.o
diff --git a/audio/ascd/pkg-plist b/audio/ascd/pkg-plist
index 9386630db662..f0f7f8e0620a 100644
--- a/audio/ascd/pkg-plist
+++ b/audio/ascd/pkg-plist
@@ -14,4 +14,94 @@ include/workman/wm_struct.h
 include/workman/wm_version.h
 include/workman/workman.h
 include/workman/workman_defs.h
+share/ascd/clean/Theme
+share/ascd/clean/background.xpm
+share/ascd/clean/bar.xpm
+share/ascd/clean/digits.xpm
+share/ascd/clean/eject.xpm
+share/ascd/clean/fade.xpm
+share/ascd/clean/fwd.xpm
+share/ascd/clean/intro.xpm
+share/ascd/clean/intro_on.xpm
+share/ascd/clean/lend.xpm
+share/ascd/clean/lgo.xpm
+share/ascd/clean/lgo_on.xpm
+share/ascd/clean/lstart.xpm
+share/ascd/clean/pause.xpm
+share/ascd/clean/pause_on.xpm
+share/ascd/clean/play.xpm
+share/ascd/clean/play_on.xpm
+share/ascd/clean/quit.xpm
+share/ascd/clean/rdigits.xpm
+share/ascd/clean/rew.xpm
+share/ascd/clean/stop.xpm
+share/ascd/default/Theme
+share/ascd/default/background.xpm
+share/ascd/default/bar.xpm
+share/ascd/default/digits.xpm
+share/ascd/default/eject.xpm
+share/ascd/default/fade.xpm
+share/ascd/default/fwd.xpm
+share/ascd/default/intro.xpm
+share/ascd/default/intro_on.xpm
+share/ascd/default/lend.xpm
+share/ascd/default/lgo.xpm
+share/ascd/default/lgo_on.xpm
+share/ascd/default/lstart.xpm
+share/ascd/default/pause.xpm
+share/ascd/default/pause_on.xpm
+share/ascd/default/play.xpm
+share/ascd/default/play_on.xpm
+share/ascd/default/quit.xpm
+share/ascd/default/rdigits.xpm
+share/ascd/default/rew.xpm
+share/ascd/default/stop.xpm
+share/ascd/sands/Theme
+share/ascd/sands/background.xpm
+share/ascd/sands/bar.xpm
+share/ascd/sands/digits.xpm
+share/ascd/sands/eject.xpm
+share/ascd/sands/fade.xpm
+share/ascd/sands/fwd.xpm
+share/ascd/sands/intro.xpm
+share/ascd/sands/intro_on.xpm
+share/ascd/sands/lend.xpm
+share/ascd/sands/lgo.xpm
+share/ascd/sands/lgo_on.xpm
+share/ascd/sands/lstart.xpm
+share/ascd/sands/pause.xpm
+share/ascd/sands/pause_on.xpm
+share/ascd/sands/play.xpm
+share/ascd/sands/play_on.xpm
+share/ascd/sands/quit.xpm
+share/ascd/sands/rdigits.xpm
+share/ascd/sands/rew.xpm
+share/ascd/sands/stop.xpm
+share/ascd/vintage/Theme
+share/ascd/vintage/background.xpm
+share/ascd/vintage/bar.xpm
+share/ascd/vintage/digits.xpm
+share/ascd/vintage/eject.xpm
+share/ascd/vintage/fade.xpm
+share/ascd/vintage/fwd.xpm
+share/ascd/vintage/intro.xpm
+share/ascd/vintage/intro_on.xpm
+share/ascd/vintage/lend.xpm
+share/ascd/vintage/lgo.xpm
+share/ascd/vintage/lgo_on.xpm
+share/ascd/vintage/lstart.xpm
+share/ascd/vintage/pause.xpm
+share/ascd/vintage/pause_on.xpm
+share/ascd/vintage/play.xpm
+share/ascd/vintage/play_on.xpm
+share/ascd/vintage/quit.xpm
+share/ascd/vintage/rdigits.xpm
+share/ascd/vintage/rew.xpm
+share/ascd/vintage/stop.xpm
+share/ascd/.dir
 @dirrm include/workman
+@dirrm share/ascd/clean
+@dirrm share/ascd/default
+@dirrm share/ascd/sands
+@dirrm share/ascd/vintage
+@dirrm share/ascd