Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 May 2004 02:58:08 +0200 (CEST)
From:      Roman Neuhauser <neuhauser@chello.cz>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        yoshiaki@kt.rim.or.jp
Subject:   ports/67363: [PATCH] audio/dap doesn't fetch, update to 2.1.6
Message-ID:  <20040530005808.595DA2FDA01@isis.wad.cz>
Resent-Message-ID: <200405300100.i4U10hDN043507@freefall.freebsd.org>

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

>Number:         67363
>Category:       ports
>Synopsis:       [PATCH] audio/dap doesn't fetch, update to 2.1.6
>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:   Sat May 29 18:00:43 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Roman Neuhauser
>Release:        FreeBSD 4.9-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD isis.wad.cz 4.9-RELEASE-p2 FreeBSD 4.9-RELEASE-p2 #3: Sun Mar 7 02:11:16 CET 2004 root@isis.wad.cz:/usr/obj/usr/src/sys/FREEPUPPY2_6 i386


	
>Description:
unfetchable, see portsurvey

the thing seems to run but I'm not into DSP, so I only clicked
around for a while

maintainer cc'd

>How-To-Repeat:
	
>Fix:

	

--- audio::dap-2.1.5.patch begins here ---
Index: audio/dap/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/dap/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- audio/dap/Makefile	10 Jun 2003 10:54:59 -0000	1.17
+++ audio/dap/Makefile	30 May 2004 00:49:15 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dap
-PORTVERSION=	2.1.4
+PORTVERSION=	2.1.5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.cee.hw.ac.uk/~richardk/downloads/
 EXTRACT_SUFX=.tgz
@@ -19,6 +19,8 @@
 MAKEFILE=	Makefile.linux
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+
+MAKE_ENV+=	OTHER_INCLUDE_DIR=. OTHER_LIBRARY_DIR=.
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${PREFIX}/bin/
Index: audio/dap/distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/dap/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- audio/dap/distinfo	31 Mar 2004 03:06:03 -0000	1.7
+++ audio/dap/distinfo	20 May 2004 14:48:27 -0000
@@ -1,2 +1,2 @@
-MD5 (dap-2.1.4.tgz) = 1650ac217bcd45d036ca6c39067b0aa9
-SIZE (dap-2.1.4.tgz) = 291383
+MD5 (dap-2.1.5.tgz) = 205f54bc769ec548581fbdac3433068c
+SIZE (dap-2.1.5.tgz) = 290439
Index: audio/dap/files/patch-ac
===================================================================
RCS file: /home/ncvs/ports/audio/dap/files/patch-ac,v
retrieving revision 1.6
diff -u -r1.6 patch-ac
--- audio/dap/files/patch-ac	22 Jul 2001 03:30:11 -0000	1.6
+++ audio/dap/files/patch-ac	23 May 2004 15:32:04 -0000
@@ -7,7 +7,7 @@
 +CXX     ?= g++
  BACKDIR = ../bak/libaudio
  HOMEDIR = $(HOME)
- INCDIR  = -I.
+ INCDIR  = -I. -I$(OTHER_INCLUDE_DIR)
 -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 +CCFLAGS += $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
  DEBUG   = -g3
Index: audio/dap/files/patch-ad
===================================================================
RCS file: /home/ncvs/ports/audio/dap/files/patch-ad,v
retrieving revision 1.6
diff -u -r1.6 patch-ad
--- audio/dap/files/patch-ad	10 Jun 2003 10:54:59 -0000	1.6
+++ audio/dap/files/patch-ad	23 May 2004 15:38:39 -0000
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -1,15 +1,15 @@
 -CC      = gcc
 -CXX     = g++
 +CC      ?= gcc
@@ -11,13 +11,10 @@
  MAINDIR = ../../main
  HOMEDIR = $(HOME)
 -X11DIR  = /usr/X11R6
--INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(XFORMS)/FORMS -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include
+-INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR)
 -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$(XFORMS)/FORMS -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include ${XFORMSINC}
++INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR)
 +CCFLAGS += $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
  DEBUG   = -g3
 -OPTIM   = -O2
Index: audio/dap/files/patch-ae
===================================================================
RCS file: /home/ncvs/ports/audio/dap/files/patch-ae,v
retrieving revision 1.6
diff -u -r1.6 patch-ae
--- audio/dap/files/patch-ae	10 Jun 2003 10:54:59 -0000	1.6
+++ audio/dap/files/patch-ae	23 May 2004 15:44:12 -0000
@@ -1,5 +1,5 @@
---- main/Makefile.linux.orig	Fri Jul  5 06:06:15 2002
-+++ main/Makefile.linux	Sun Jan  5 22:23:45 2003
+--- main/Makefile.linux.orig	Wed Sep 10 02:06:24 2003
++++ main/Makefile.linux	Sun May 23 17:41:57 2004
 @@ -1,5 +1,5 @@
 -CC      = gcc
 -CXX     = g++
@@ -8,18 +8,14 @@
  SOUND   = ../sound
  SPKIT   = ../spkit
  TOOLTIP = ../tooltips
-@@ -7,12 +7,15 @@
+@@ -7,12 +7,12 @@
  AUDIOF  = ../libaudiofile
  BACKDIR = ../bak/main
  HOMEDIR = $(HOME)
 -X11DIR  = /usr/X11R6
--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$(XFORMS)/FORMS -I$(TOOLTIP) -I$(X11DIR)/include ${XFORMSINC}
- LIBDIR  = -L$(SPKIT)/spkit -L$(XFORMS)/FORMS -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib
+ INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11
+ LIBDIR  = -L$(SPKIT)/spkit -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
Index: audio/dap/files/patch-af
===================================================================
RCS file: /home/ncvs/ports/audio/dap/files/patch-af,v
retrieving revision 1.6
diff -u -r1.6 patch-af
--- audio/dap/files/patch-af	10 Jun 2003 10:54:59 -0000	1.6
+++ audio/dap/files/patch-af	23 May 2004 15:47:50 -0000
@@ -10,8 +10,8 @@
  AUDIOF  = ../libaudiofile
 @@ -8,9 +8,9 @@
  HOMEDIR = $(HOME)
- INCDIR  = -I. -I.. -I$(SPKIT) -I$(MAINDIR)
- LIBDIR  = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF)
+ INCDIR  = -I. -I.. -I$(SPKIT) -I$(MAINDIR) -I$(OTHER_INCLUDE_DIR)
+ LIBDIR  = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF) -L$(OTHER_LIBRARY_DIR)
 -CCFLAGS = $(DEBUG) $(OPTIM) -DNOFORMS -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 +CCFLAGS = $(OPTIM) -DNOFORMS -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
  DEBUG   = -g3
Index: audio/dap/files/patch-ag
===================================================================
RCS file: /home/ncvs/ports/audio/dap/files/patch-ag,v
retrieving revision 1.4
diff -u -r1.4 patch-ag
--- audio/dap/files/patch-ag	22 Jul 2001 03:30:11 -0000	1.4
+++ audio/dap/files/patch-ag	23 May 2004 15:48:27 -0000
@@ -7,7 +7,7 @@
 +CXX     ?= g++
  BACKDIR = ../bak/libaudiofile
  HOMEDIR = $(HOME)
- INCDIR  = -I.
+ INCDIR  = -I. -I$(OTHER_INCLUDE_DIR)
 -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 +CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
  DEBUG   = -g3
--- audio::dap-2.1.5.patch ends here ---


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



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