diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /audio/dap | |
parent | Update to version 2.2.6 (diff) |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Diffstat (limited to 'audio/dap')
-rw-r--r-- | audio/dap/Makefile | 3 | ||||
-rw-r--r-- | audio/dap/files/patch-ad | 2 | ||||
-rw-r--r-- | audio/dap/files/patch-ae | 2 | ||||
-rw-r--r-- | audio/dap/files/patch-tooltips-Makefile.linux | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/audio/dap/Makefile b/audio/dap/Makefile index 2abffff7d8e3..55473bd5a9ab 100644 --- a/audio/dap/Makefile +++ b/audio/dap/Makefile @@ -18,8 +18,7 @@ COMMENT= Audio sample editing and processing suite LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms MAKEFILE= Makefile.linux -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm MAKE_ENV+= OTHER_INCLUDE_DIR=. OTHER_LIBRARY_DIR=. diff --git a/audio/dap/files/patch-ad b/audio/dap/files/patch-ad index a003d6b5fcba..0ebf7a04fc8f 100644 --- a/audio/dap/files/patch-ad +++ b/audio/dap/files/patch-ad @@ -13,7 +13,7 @@ -X11DIR = /usr/X11R6 -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} ++X11DIR = ${LOCALBASE} +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 diff --git a/audio/dap/files/patch-ae b/audio/dap/files/patch-ae index 437f29228377..1d8ee1ef56f9 100644 --- a/audio/dap/files/patch-ae +++ b/audio/dap/files/patch-ae @@ -13,7 +13,7 @@ BACKDIR = ../bak/main HOMEDIR = $(HOME) -X11DIR = /usr/X11R6 -+X11DIR = ${X11BASE} ++X11DIR = ${LOCALBASE} 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 diff --git a/audio/dap/files/patch-tooltips-Makefile.linux b/audio/dap/files/patch-tooltips-Makefile.linux index 74f1bfa46635..9ae0900e24a2 100644 --- a/audio/dap/files/patch-tooltips-Makefile.linux +++ b/audio/dap/files/patch-tooltips-Makefile.linux @@ -5,7 +5,7 @@ # Define where the X11 include files are. -X11_INCLUDE_DIR = /usr/X11R6/include -+X11_INCLUDE_DIR = ${X11BASE}/include ++X11_INCLUDE_DIR = ${LOCALBASE}/include # Uncomment out this line if you do not want debug information included. # DEBUG = -g -Wall -ansi -pedantic |