Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Apr 1999 21:40:10 +1000 (EST)
From:      jim@phrantic.phear.net
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/11279: update port: ascd-0.10.1 to 0.12.0
Message-ID:  <199904221140.VAA77589@blues.ghis.net>

next in thread | raw e-mail | index | archive | help

>Number:         11279
>Category:       ports
>Synopsis:       update port: ascd-0.10.1 to 0.12.0
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 22 04:50:02 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Jim Mock
>Release:        FreeBSD 3.1-RELEASE i386
>Organization:
>Environment:

	

>Description:

Patch updates the ascd port from to 0.12.0.  This PR replaces ports/11140,
which should be closed (see my previous message).  Please review and
commit ASAP.. the current ascd port is unfetchable due to the new release.

>How-To-Repeat:

	

>Fix:

Apply the following patch..
	
diff -ruN /usr/ports/audio/ascd/Makefile ascd-0.12.0/Makefile
--- /usr/ports/audio/ascd/Makefile	Thu Apr  1 11:14:54 1999
+++ ascd-0.12.0/Makefile	Thu Apr 22 21:31:09 1999
@@ -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.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 @@
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_SCRIPT=	default
+
 MAN1=		ascd.1
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/audio/ascd/files/md5 ascd-0.12.0/files/md5
--- /usr/ports/audio/ascd/files/md5	Thu Apr  1 11:14:54 1999
+++ ascd-0.12.0/files/md5	Thu Apr 22 20:05:25 1999
@@ -1 +1 @@
-MD5 (ascd-0.10.1+lib.tgz) = 3b1984002cb5c9a76b7ead45b8692fdd
+MD5 (ascd-0.12.0+lib-src.tgz) = 8651120eb4d9c0008f7b941fb3435043
diff -ruN /usr/ports/audio/ascd/patches/patch-aa ascd-0.12.0/patches/patch-aa
--- /usr/ports/audio/ascd/patches/patch-aa	Thu Jan  1 10:00:00 1970
+++ ascd-0.12.0/patches/patch-aa	Thu Apr 22 20:23:21 1999
@@ -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 -ruN /usr/ports/audio/ascd/patches/patch-ab ascd-0.12.0/patches/patch-ab
--- /usr/ports/audio/ascd/patches/patch-ab	Thu Jan  1 10:00:00 1970
+++ ascd-0.12.0/patches/patch-ab	Thu Apr 22 20:23:39 1999
@@ -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 -ruN /usr/ports/audio/ascd/patches/patch-ac ascd-0.12.0/patches/patch-ac
--- /usr/ports/audio/ascd/patches/patch-ac	Thu Jan  1 10:00:00 1970
+++ ascd-0.12.0/patches/patch-ac	Thu Apr 22 20:35:49 1999
@@ -0,0 +1,11 @@
+--- libworkman/wm_helpers.c.orig	Thu Apr 15 08:51:52 1999
++++ libworkman/wm_helpers.c	Thu Apr 15 08:53:09 1999
+@@ -30,7 +30,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include <stdarg.h>
+ #include <sys/time.h>
diff -ruN /usr/ports/audio/ascd/patches/patch-ad ascd-0.12.0/patches/patch-ad
--- /usr/ports/audio/ascd/patches/patch-ad	Thu Jan  1 10:00:00 1970
+++ ascd-0.12.0/patches/patch-ad	Thu Apr 22 20:27:18 1999
@@ -0,0 +1,16 @@
+--- libworkman/Config.orig	Thu Apr 22 20:24:45 1999
++++ libworkman/Config	Thu Apr 22 20:26:34 1999
+@@ -38,11 +38,11 @@
+ XCOMM -------------------------------------------------------------------
+ XCOMM          LibWorkMan include file target relative to DSTDIR
+ XCOMM -------------------------------------------------------------------
+-WMINCDIR=/usr/local/include/workman
++WMINCDIR=/usr/X11R6/include/workman
+ 
+ 
+ 
+ XCOMM -------------------------------------------------------------------
+ #define SHARED_LIBWORKMAN
+-LIBDIR=/usr/local/lib
++LIBDIR=/usr/X11R6/lib
+ 
diff -ruN /usr/ports/audio/ascd/patches/patch-ae ascd-0.12.0/patches/patch-ae
--- /usr/ports/audio/ascd/patches/patch-ae	Thu Jan  1 10:00:00 1970
+++ ascd-0.12.0/patches/patch-ae	Thu Apr 22 20:54:39 1999
@@ -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 -ruN /usr/ports/audio/ascd/patches/patch-af ascd-0.12.0/patches/patch-af
--- /usr/ports/audio/ascd/patches/patch-af	Thu Jan  1 10:00:00 1970
+++ ascd-0.12.0/patches/patch-af	Thu Apr 22 20:56:01 1999
@@ -0,0 +1,11 @@
+--- libworkman/Imakefile.orig	Thu Apr 22 20:54:55 1999
++++ libworkman/Imakefile	Thu Apr 22 20:55:23 1999
+@@ -31,7 +31,7 @@
+ 
+ #include "include/wm_version.h"
+ 
+-WM_LIBVER=WM_LIBVER_MAJOR.WM_LIBVER_MINOR.WM_LIBVER_PL
++WM_LIBVER=WM_LIBVER_MAJOR.WM_LIBVER_MINOR
+ 
+ SRCS = cdrom.c cdinfo.c plat_freebsd.c plat_sun.c plat_hpux.c \
+        plat_ultrix.c plat_news.c plat_bsd386.c plat_osf1.c plat_linux.c \
diff -ruN /usr/ports/audio/ascd/pkg/PLIST ascd-0.12.0/pkg/PLIST
--- /usr/ports/audio/ascd/pkg/PLIST	Thu Apr  1 11:14:54 1999
+++ ascd-0.12.0/pkg/PLIST	Thu Apr 22 21:21:37 1999
@@ -14,4 +14,94 @@
 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

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199904221140.VAA77589>