Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Mar 2006 12:49:48 +1100 (EST)
From:      Edwin Groothuis <edwin@mavetju.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/94398: audio/xmcd - use SUB_FILES, adjust config.sh
Message-ID:  <20060313014948.5E128243@k7.mavetju>
Resent-Message-ID: <200603130150.k2D1oaA5056849@freefall.freebsd.org>

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

>Number:         94398
>Category:       ports
>Synopsis:       audio/xmcd - use SUB_FILES, adjust config.sh
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 13 01:50:36 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Edwin Groothuis
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 09:36:13 UTC 2005 root@x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386


>Description:

- Move pkg-message to files to automatically replace %%PREFIX%%
- Patch config.sh to default to FreeBSD ioctl method instead of
  Linux ioctl method

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/xmcd/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile	16 Mar 2005 14:50:12 -0000	1.50
+++ Makefile	13 Mar 2006 01:48:25 -0000
@@ -22,6 +22,8 @@
 USE_MOTIF=	yes
 USE_IMAKE=	yes
 PLIST_SUB+=	RELEASE=${OSREL:R:R} ARCH=${ARCH}
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 MAN1=		cda.1 xmcd.1
 MANCOMPRESSED=	no
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	18 Jul 2001 15:01:23 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-*******************************************************
-You will need to run the configuration script for xmcd
-to accurately recognize your cd-rom.  The configure
-script is: ${PREFIX}/lib/X11/xmcd/config/config.sh
-
-If you would like to submit data to CDDB you will need
-to install mail/mailx or add something similar to
-the following line in your Xdefaults:
-XMcd.cddbMailCmd:  mail -s '%S' %A <%F >/dev/null 2>&1
-*******************************************************
Index: files/patch-libdi_d__config.sh
===================================================================
RCS file: files/patch-libdi_d__config.sh
diff -N files/patch-libdi_d__config.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-libdi_d__config.sh	13 Mar 2006 01:48:25 -0000
@@ -0,0 +1,11 @@
+--- libdi_d/config.sh.orig	Mon Mar 13 12:42:31 2006
++++ libdi_d/config.sh	Mon Mar 13 12:45:42 2006
+@@ -744,7 +744,7 @@
+ 
+ 	if [ -z "$IOCDEF" -o "$IOCDEF" = 0 ]
+ 	then
+-		IOCDEF=1
++		IOCDEF=2
+ 	fi
+ 
+ 	while :
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	13 Mar 2006 01:48:25 -0000
@@ -0,0 +1,10 @@
+*******************************************************
+You will need to run the configuration script for xmcd
+to accurately recognize your cd-rom.  The configure
+script is: %%PREFIX%%/lib/X11/xmcd/config/config.sh
+
+If you would like to submit data to CDDB you will need
+to install mail/mailx or add something similar to
+the following line in your Xdefaults:
+XMcd.cddbMailCmd:  mail -s '%S' %A <%F >/dev/null 2>&1
+*******************************************************
>Release-Note:
>Audit-Trail:
>Unformatted:



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