From owner-freebsd-ports  Fri Aug  4 16:40:24 2000
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 28DD537B992
	for <freebsd-ports@FreeBSD.org>; Fri,  4 Aug 2000 16:40:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id QAA42824;
	Fri, 4 Aug 2000 16:40:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A013A37B8E8; Fri,  4 Aug 2000 16:37:57 -0700 (PDT)
Message-Id: <20000804233757.A013A37B8E8@hub.freebsd.org>
Date: Fri,  4 Aug 2000 16:37:57 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/20413: Update port: audio/ascd
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         20413
>Category:       ports
>Synopsis:       Update port: audio/ascd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 04 16:40:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CFLAGS/PREFIX properly

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/audio/ascd/Makefile audio/ascd/Makefile
--- /usr/ports/audio/ascd/Makefile	Thu Aug  3 21:05:07 2000
+++ audio/ascd/Makefile	Thu Aug  3 21:47:28 2000
@@ -16,17 +16,21 @@
 LIB_DEPENDS=	workman.1:${PORTSDIR}/audio/libworkman
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
+
 USE_IMAKE=	yes
 USE_XPM=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_SCRIPT=	default
+
 DATAFILES=	ascd-0.13pr6-themes.tgz
 THEMESDIR=	ascd-0.13pr6-themes
 
 MAN1=		ascd.1
 
 post-patch:
-	@${LN} -fs ${WRKSRC}/misc/default ${WRKSRC}/default
+	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
+		${WRKSRC}/misc/config.h.default > ${WRKSRC}/config.h
+	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
+		${WRKSRC}/misc/dirs.h.default > ${WRKSRC}/dirs.h
+	@${CAT} ${WRKSRC}/version.h >> ${WRKSRC}/config.h
 
 post-install:
 	@${CP} ${FILESDIR}/install ${WRKDIR}/${THEMESDIR}
diff -urN /usr/ports/audio/ascd/patches/patch-aa audio/ascd/patches/patch-aa
--- /usr/ports/audio/ascd/patches/patch-aa	Fri Aug 13 15:46:21 1999
+++ audio/ascd/patches/patch-aa	Wed Aug  2 04:31:34 2000
@@ -6,5 +6,5 @@
  #define DEFAULT_BGCOLOR "#000000"
 -#define DEFAULTDEVICE "/dev/cdrom"
 -#define THDIR "/usr/local/share/AScd"
-+#define DEFAULTDEVICE "/dev/wcd0c"
-+#define THDIR "/usr/X11R6/share/ascd"
++#define DEFAULTDEVICE "/dev/acd0c"
++#define THDIR "%%PREFIX%%/share/ascd"
diff -urN /usr/ports/audio/ascd/patches/patch-ab audio/ascd/patches/patch-ab
--- /usr/ports/audio/ascd/patches/patch-ab	Fri Aug 13 15:46:21 1999
+++ audio/ascd/patches/patch-ab	Wed Aug  2 04:22:22 2000
@@ -4,6 +4,6 @@
 -#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
++#define CBINDIR %%PREFIX%%/bin
++#define CMANDIR %%PREFIX%%/man/man1
++#define CTHDIR %%PREFIX%%/share/ascd
diff -urN /usr/ports/audio/ascd/patches/patch-ae audio/ascd/patches/patch-ae
--- /usr/ports/audio/ascd/patches/patch-ae	Sat Sep 25 23:11:38 1999
+++ audio/ascd/patches/patch-ae	Wed Aug  2 04:41:24 2000
@@ -1,15 +1,16 @@
---- Imakefile.orig	Sun Sep  5 09:24:23 1999
-+++ Imakefile	Sat Sep 25 23:52:18 1999
-@@ -6,10 +6,10 @@
+--- Imakefile.orig	Sun Sep  5 08:24:23 1999
++++ Imakefile	Wed Aug  2 04:41:16 2000
+@@ -5,11 +5,10 @@
+ BINDIR		= CBINDIR
  MANDIR		= CMANDIR
  THEMESDIR	= CTHDIR
- MOREFLAGS	= -I/usr/local/include -I/usr/X11R6/include -I.
+-MOREFLAGS	= -I/usr/local/include -I/usr/X11R6/include -I.
 -CCOPTIONS	= $(MOREFLAGS)
-+CCOPTIONS	= -O0 $(MOREFLAGS)
++EXTRA_INCLUDES	= -I.
  SYS_LIBRARIES	= $(XLIB) -lXpm
  
 -LOCAL_LIBRARIES = -L../libworkman -lworkman -L/usr/local/lib
-+LOCAL_LIBRARIES = -L../libworkman -lworkman -L/usr/X11R6/lib
++LOCAL_LIBRARIES = -lworkman
  
  SRCS_OPT1 =
  SRCS_OPT2 =


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


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