diff options
| author | mikeh <mikeh@FreeBSD.org> | 2002-07-04 16:09:05 +0800 |
|---|---|---|
| committer | mikeh <mikeh@FreeBSD.org> | 2002-07-04 16:09:05 +0800 |
| commit | 1769999c1b9856a50c9c7ef15c809cd95839f0a6 (patch) | |
| tree | 21f169218f64ee0c7190422ae8f5272676793ebe /audio/dap | |
| parent | 125fbd3d930383147612d03261f896c3f643880b (diff) | |
| download | freebsd-ports-gnome-1769999c1b9856a50c9c7ef15c809cd95839f0a6.tar.gz freebsd-ports-gnome-1769999c1b9856a50c9c7ef15c809cd95839f0a6.tar.zst freebsd-ports-gnome-1769999c1b9856a50c9c7ef15c809cd95839f0a6.zip | |
Prepare for xforms update.
Diffstat (limited to 'audio/dap')
| -rw-r--r-- | audio/dap/Makefile | 2 | ||||
| -rw-r--r-- | audio/dap/files/patch-ad | 14 | ||||
| -rw-r--r-- | audio/dap/files/patch-ae | 16 |
3 files changed, 19 insertions, 13 deletions
diff --git a/audio/dap/Makefile b/audio/dap/Makefile index c9bade39e979..4cc9ee0527e0 100644 --- a/audio/dap/Makefile +++ b/audio/dap/Makefile @@ -13,7 +13,7 @@ EXTRACT_SUFX=.tgz MAINTAINER= yoshiaki@kt.rim.or.jp -LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms +LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms MAKEFILE= Makefile.linux USE_X_PREFIX= yes diff --git a/audio/dap/files/patch-ad b/audio/dap/files/patch-ad index d7d50441956a..8822b938ff1e 100644 --- a/audio/dap/files/patch-ad +++ b/audio/dap/files/patch-ad @@ -1,6 +1,6 @@ ---- spkit/spkit/Makefile.linux.orig Sun Jul 1 13:36:58 2001 -+++ spkit/spkit/Makefile.linux Sun Jul 1 13:38:17 2001 -@@ -1,16 +1,16 @@ +--- 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 @@ -CC = gcc -CXX = g++ +CC ?= gcc @@ -12,9 +12,13 @@ MAINDIR = ../../main HOMEDIR = $(HOME) -X11DIR = /usr/X11R6 -+X11DIR = ${X11BASE} - INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include +-INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(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 DEBUG = -g3 -OPTIM = -O2 diff --git a/audio/dap/files/patch-ae b/audio/dap/files/patch-ae index f18dd87302dc..c50786623061 100644 --- a/audio/dap/files/patch-ae +++ b/audio/dap/files/patch-ae @@ -1,5 +1,5 @@ ---- main/Makefile.linux.orig Sun Jul 1 13:42:55 2001 -+++ main/Makefile.linux Sun Jul 1 13:42:31 2001 +--- main/Makefile.linux.orig Tue Nov 7 18:16:54 2000 ++++ main/Makefile.linux Tue Jul 2 02:16:04 2002 @@ -1,5 +1,5 @@ -CC = gcc -CXX = g++ @@ -8,21 +8,23 @@ FORMS = ../../xforms/FORMS SOUND = ../sound SPKIT = ../spkit -@@ -8,13 +8,13 @@ +@@ -8,12 +8,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 +X11DIR = ${X11BASE} - INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include ++.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 -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused +CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused DEBUG = -g3 -OPTIM = -O1 --LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm +OPTIM = ${CXXFLAGS} -+LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lxforms -lXpm -lX11 -lm + LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm PROGS = DAP - OBJS = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \ |