[prev in list] [next in list] [prev in thread] [next in thread]
List: freebsd-ports
Subject: ports/46784: ports/audio DAP update
From: Yoshiaki Uchikawa <yoshiaki () kt ! rim ! or ! jp>
Date: 2003-01-05 14:12:30
[Download RAW message or body]
> Number: 46784
> Category: ports
> Synopsis: ports/audio DAP update
> Confidential: no
> Severity: non-critical
> Priority: low
> Responsible: freebsd-ports
> State: open
> Quarter:
> Keywords:
> Date-Required:
> Class: update
> Submitter-Id: current-users
> Arrival-Date: Sun Jan 05 06:20:01 PST 2003
> Closed-Date:
> Last-Modified:
> Originator: Yoshiaki Uchikawa
> Release: FreeBSD 5.0-CURRENT i386
> Organization:
> Environment:
System: FreeBSD singer.tertio.atoll 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sun Jan 5 \
12:52:02 JST 2003 yoshiaki@singer.tertio.atoll:/usr/src/sys/i386/compile/CRUSE i386
> Description:
Edwin Groothuis <edwin@freebsd.org> suggest me, the distribution
files of audio/dap for version 2.1.2 weren't available.
I have compilation on if I use this patch.
However, I don't use DAP currently.
I want you to apply it after having tested it.
> How-To-Repeat:
> Fix:
diff -ruN dap.212/Makefile dap/Makefile
--- dap.212/Makefile Sat Dec 28 01:57:29 2002
+++ dap/Makefile Sun Jan 5 21:20:51 2003
@@ -6,7 +6,7 @@
#
PORTNAME= dap
-PORTVERSION= 2.1.2
+PORTVERSION= 2.1.4
CATEGORIES= audio
MASTER_SITES= http://www.cee.hw.ac.uk/~richardk/downloads/
EXTRACT_SUFX=.tgz
diff -ruN dap.212/distinfo dap/distinfo
--- dap.212/distinfo Thu Jul 26 01:43:31 2001
+++ dap/distinfo Sun Jan 5 21:20:23 2003
@@ -1 +1 @@
-MD5 (dap-2.1.2.tgz) = 1a291cd774660580213764c2b58109c2
+MD5 (dap-2.1.4.tgz) = 1650ac217bcd45d036ca6c39067b0aa9
diff -ruN dap.212/files/patch-ad dap/files/patch-ad
--- dap.212/files/patch-ad Sat Jul 13 08:27:13 2002
+++ dap/files/patch-ad Sun Jan 5 22:17:21 2003
@@ -1,25 +1,24 @@
---- spkit/spkit/Makefile.linux.orig Wed Aug 9 18:27:20 2000
-+++ spkit/spkit/Makefile.linux Tue Jul 2 02:11:41 2002
-@@ -1,16 +1,19 @@
+--- spkit/spkit/Makefile.linux.orig Fri Jul 5 06:10:23 2002
++++ spkit/spkit/Makefile.linux Sun Jan 5 22:15:45 2003
+@@ -1,15 +1,18 @@
-CC = gcc
-CXX = g++
+CC ?= gcc
+CXX ?= g++
- FORMS = ../../../xforms/FORMS
SOUND = ../../sound
TOOLTIP = ../../tooltips
BACKDIR = ../../bak/spkit/spkit
MAINDIR = ../../main
HOMEDIR = $(HOME)
-X11DIR = /usr/X11R6
--INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) \
-I$(X11DIR)/include +-INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(XFORMS)/FORMS \
-I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include
-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall \
-Wno-unused +X11DIR = ${X11BASE}
+.if exists(${X11BASE}/include/X11/forms.h)
+XFORMSINC = -I${X11BASE}/include/X11
+.endif
-+INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) \
-I$(X11DIR)/include ${XFORMSINC}
-+CCFLAGS += $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
++INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(XFORMS)/FORMS -I$(MAINDIR) -I$(TOOLTIP) \
-I$(X11DIR)/include ${XFORMSINC} ++CCFLAGS += $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX \
-DBIGENDIAN -DUSINGGCC -Wall -Wno-unused DEBUG = -g3
-OPTIM = -O2
+OPTIM = ${CXXFLAGS}
diff -ruN dap.212/files/patch-ae dap/files/patch-ae
--- dap.212/files/patch-ae Sat Jul 13 08:27:13 2002
+++ dap/files/patch-ae Sun Jan 5 22:24:22 2003
@@ -1,30 +1,30 @@
---- main/Makefile.linux.orig Tue Nov 7 18:16:54 2000
-+++ main/Makefile.linux Tue Jul 2 02:16:04 2002
+--- main/Makefile.linux.orig Fri Jul 5 06:06:15 2002
++++ main/Makefile.linux Sun Jan 5 22:23:45 2003
@@ -1,5 +1,5 @@
-CC = gcc
-CXX = g++
+CC ?= gcc
+CXX ?= g++
- FORMS = ../../xforms/FORMS
SOUND = ../sound
SPKIT = ../spkit
-@@ -8,12 +8,15 @@
+ TOOLTIP = ../tooltips
+@@ -7,12 +7,15 @@
AUDIOF = ../libaudiofile
BACKDIR = ../bak/main
HOMEDIR = $(HOME)
-X11DIR = /usr/X11R6
--INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) \
-I$(X11DIR)/include +-INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(XFORMS)/FORMS \
-I$(TOOLTIP) -I$(X11DIR)/include +X11DIR = ${X11BASE}
+.if exists(${X11BASE}/include/X11/forms.h)
+XFORMSINC = -I${X11BASE}/include/X11
+.endif
-+INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) \
-I$(X11DIR)/include ${XFORMSINC}
- LIBDIR = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) \
-L$(X11DIR)/lib ++INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(XFORMS)/FORMS \
-I$(TOOLTIP) -I$(X11DIR)/include ${XFORMSINC} + LIBDIR = -L$(SPKIT)/spkit \
-L$(XFORMS)/FORMS -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib
-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall \
-Wno-unused +CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall \
-Wno-unused DEBUG = -g3
-OPTIM = -O1
-+OPTIM = ${CXXFLAGS}
++OPTIM = ${CCXFLAGS}
LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm
PROGS = DAP
diff -ruN dap.212/files/patch-af dap/files/patch-af
--- dap.212/files/patch-af Thu Jul 26 01:43:31 2001
+++ dap/files/patch-af Sun Jan 5 22:28:25 2003
@@ -1,14 +1,14 @@
---- sound/Makefile.linux.orig Sun Jul 1 13:44:27 2001
-+++ sound/Makefile.linux Sun Jul 1 13:45:00 2001
+--- sound/Makefile.linux.orig Fri Jul 5 06:08:17 2002
++++ sound/Makefile.linux Sun Jan 5 22:27:56 2003
@@ -1,5 +1,5 @@
-CC = gcc
-CXX = g++
+CC ?= gcc
+CXX ?= g++
- FORMS = ../../xforms/FORMS
SPKIT = ../spkit
AUDIO = ../libaudio
-@@ -9,9 +9,9 @@
+ AUDIOF = ../libaudiofile
+@@ -8,9 +8,9 @@
HOMEDIR = $(HOME)
INCDIR = -I. -I.. -I$(SPKIT) -I$(MAINDIR)
LIBDIR = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF)
> Release-Note:
> Audit-Trail:
> Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic