From owner-freebsd-ports Wed Apr 14 17:22:34 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 2CF38152E8 for ; Wed, 14 Apr 1999 17:22:21 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id RAA20470; Wed, 14 Apr 1999 17:20:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from corp.au.triax.com (slwag2p04.ozemail.com.au [203.108.157.52]) by hub.freebsd.org (Postfix) with ESMTP id A645115283 for ; Wed, 14 Apr 1999 17:19:02 -0700 (PDT) (envelope-from jim@corp.au.triax.com) Received: (from jim@localhost) by corp.au.triax.com (8.9.3/8.9.3) id KAA62958; Thu, 15 Apr 1999 10:16:44 +1000 (EST) Message-Id: <199904150016.KAA62958@corp.au.triax.com> Date: Thu, 15 Apr 1999 10:16:44 +1000 (EST) From: jim@phrantic.phear.net Reply-To: jim@corp.au.triax.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/11140: update port: ascd-0.10.1 to 0.11 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 11140 >Category: ports >Synopsis: update port: ascd-0.10.1 to 0.11 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Apr 14 17:20:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Jim Mock >Release: FreeBSD 3.1-RELEASE i386 >Organization: >Environment: >Description: Patch updates the ascd port from 0.10.1 to 0.11. The new version is a major update with a new interface and more. The update also uses 'USE_INTERACTIVE' because the configure script asks questions. >How-To-Repeat: >Fix: Apply the following patch.. diff -ruN /usr/ports/audio/ascd/Makefile ascd-0.11/Makefile --- /usr/ports/audio/ascd/Makefile Thu Apr 1 11:14:54 1999 +++ ascd-0.11/Makefile Thu Apr 15 09:11:05 1999 @@ -1,13 +1,13 @@ # New ports collection makefile for: ascd -# Version required: 0.10.1 +# Version required: 0.11 # Date created: 29 November 1998 # Whom: Jim Mock # # $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.11+lib +PKGNAME= ascd-0.11 CATEGORIES= audio afterstep windowmaker MASTER_SITES= http://worldserver.oleane.com/rsn/Archives/ EXTRACT_SUFX= .tgz @@ -16,7 +16,11 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm +IS_INTERACTIVE= yes #configure asks questions + USE_IMAKE= yes +HAS_CONFIGURE= yes + MAN1= ascd.1 .include diff -ruN /usr/ports/audio/ascd/files/md5 ascd-0.11/files/md5 --- /usr/ports/audio/ascd/files/md5 Thu Apr 1 11:14:54 1999 +++ ascd-0.11/files/md5 Wed Apr 14 09:53:33 1999 @@ -1 +1 @@ -MD5 (ascd-0.10.1+lib.tgz) = 3b1984002cb5c9a76b7ead45b8692fdd +MD5 (ascd-0.11+lib.tgz) = 05f27f2217616d4b0efc959dab2dd7a3 diff -ruN /usr/ports/audio/ascd/patches/patch-aa ascd-0.11/patches/patch-aa --- /usr/ports/audio/ascd/patches/patch-aa Thu Jan 1 10:00:00 1970 +++ ascd-0.11/patches/patch-aa Thu Apr 15 08:19:40 1999 @@ -0,0 +1,11 @@ +--- ascd-0.11/misc/config.h.default.orig Thu Apr 15 08:17:14 1999 ++++ ascd-0.11/misc/config.h.default Thu Apr 15 08:18:41 1999 +@@ -10,7 +10,7 @@ + * Manager + */ + +-#define DEFAULTDEVICE "/dev/cdrom" ++#define DEFAULTDEVICE "/dev/wcd0c" + + /*#define NO_D_DEVICE*/ + diff -ruN /usr/ports/audio/ascd/patches/patch-ab ascd-0.11/patches/patch-ab --- /usr/ports/audio/ascd/patches/patch-ab Thu Jan 1 10:00:00 1970 +++ ascd-0.11/patches/patch-ab Thu Apr 15 08:53:42 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 + #include +-#include ++#include + #include + #include + #include diff -ruN /usr/ports/audio/ascd/patches/patch-ac ascd-0.11/patches/patch-ac --- /usr/ports/audio/ascd/patches/patch-ac Thu Jan 1 10:00:00 1970 +++ ascd-0.11/patches/patch-ac Thu Apr 15 09:06:19 1999 @@ -0,0 +1,15 @@ +--- ascd-0.11/Imakefile.orig Thu Apr 15 09:05:26 1999 ++++ ascd-0.11/Imakefile Thu Apr 15 09:05:57 1999 +@@ -1,9 +1,9 @@ + #include "config.h" + + NAME = ascd +-BINDIR = /usr/local/bin +-LIBDIR = /usr/local/lib +-MANDIR = /usr/local/man/man1 ++BINDIR = /usr/X11R6/bin ++LIBDIR = /usr/X11R6/lib ++MANDIR = /usr/X11R6/man/man1 + MOREFLAGS = -I/usr/local/include -I. + CCOPTIONS = $(MOREFLAGS) + SYS_LIBRARIES = $(XLIB) -lXpm diff -ruN /usr/ports/audio/ascd/patches/patch-ad ascd-0.11/patches/patch-ad --- /usr/ports/audio/ascd/patches/patch-ad Thu Jan 1 10:00:00 1970 +++ ascd-0.11/patches/patch-ad Thu Apr 15 09:29:22 1999 @@ -0,0 +1,22 @@ +--- config.lib.orig Thu Apr 15 09:28:41 1999 ++++ config.lib Thu Apr 15 09:29:03 1999 +@@ -33,16 +33,16 @@ + XCOMM ------------------------------------------------------------------- + XCOMM Directory Prefix + XCOMM ------------------------------------------------------------------- +-DESTDIR=/usr/local/ ++DESTDIR=/usr/X11R6/ + + 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.11/patches/patch-ae --- /usr/ports/audio/ascd/patches/patch-ae Thu Jan 1 10:00:00 1970 +++ ascd-0.11/patches/patch-ae Thu Apr 15 09:43:10 1999 @@ -0,0 +1,11 @@ +--- libworkman/Imakefile.orig Thu Apr 15 09:41:29 1999 ++++ libworkman/Imakefile Thu Apr 15 09:41:46 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 \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message