diff options
author | wiz <wiz> | 2000-02-23 11:49:55 +0000 |
---|---|---|
committer | wiz <wiz> | 2000-02-23 11:49:55 +0000 |
commit | e58040a7a2b1a9e024eb2739907915a885037b55 (patch) | |
tree | 2a1f365b0a0ac44ce7bdce6db70f6ab28ad72141 | |
parent | 802298a011ffe561b8857434bdfc2c40f42b220a (diff) | |
download | pkgsrc-e58040a7a2b1a9e024eb2739907915a885037b55.tar.gz |
honor X11BASE during compile, install additional documentation
-rw-r--r-- | audio/dap/Makefile | 7 | ||||
-rw-r--r-- | audio/dap/files/patch-sum | 6 | ||||
-rw-r--r-- | audio/dap/patches/patch-aa | 13 | ||||
-rw-r--r-- | audio/dap/patches/patch-ap | 20 | ||||
-rw-r--r-- | audio/dap/pkg/PLIST | 5 |
5 files changed, 38 insertions, 13 deletions
diff --git a/audio/dap/Makefile b/audio/dap/Makefile index d446162af75..7368752f802 100644 --- a/audio/dap/Makefile +++ b/audio/dap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/02/22 14:26:50 scw Exp $ +# $NetBSD: Makefile,v 1.4 2000/02/23 11:49:55 wiz Exp $ DISTNAME= dap-2.1 CATEGORIES= audio @@ -14,7 +14,12 @@ DEPENDS+= xforms-0.88:../../x11/xforms MAKEFILE= Makefile.netbsd ONLY_FOR_PLATFORM= *-*-alpha *-*-arm32 *-*-i386 *-*-m68k *-*-sparc *-*-ns32k +USE_X11= YES + do-install: @${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${PREFIX}/bin/dap + @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dap + @${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/TODO \ + ${PREFIX}/share/doc/dap .include "../../mk/bsd.pkg.mk" diff --git a/audio/dap/files/patch-sum b/audio/dap/files/patch-sum index 2f197a5e954..4b829fcb537 100644 --- a/audio/dap/files/patch-sum +++ b/audio/dap/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.2 1999/12/22 09:19:56 scw Exp $ +$NetBSD: patch-sum,v 1.3 2000/02/23 11:49:57 wiz Exp $ -MD5 (patch-aa) = 81871289747b8f60d75c667b232cf547 +MD5 (patch-aa) = b1cd66af2b3285d0eb5da8bc89dd0168 MD5 (patch-ab) = db83062b634ed6bb0ca8033675482f02 MD5 (patch-ac) = ce79d1f0fd19906c17d7a4abbd7a5516 MD5 (patch-ad) = a21e26c0ed1a66141a218e69a1f1dba3 @@ -15,5 +15,5 @@ MD5 (patch-al) = 65f4da3f6af47d7c405f5f9de2b1520a MD5 (patch-am) = 02fa084ef2c7720de536a93785a6e20f MD5 (patch-an) = d79e543ea8ce46a5d7b93cc264f515ee MD5 (patch-ao) = 60be15c314e56997a6d3bf177b4fe37f -MD5 (patch-ap) = b705f96a4d5bfcd65c46ea3f3221c8c2 +MD5 (patch-ap) = 5ba6b365a518fbec269cd9a577dbaadf MD5 (patch-aq) = 5d70ee1680b30dc526b7ce60bb594fab diff --git a/audio/dap/patches/patch-aa b/audio/dap/patches/patch-aa index 5bb4b9642a9..7eba9e79f42 100644 --- a/audio/dap/patches/patch-aa +++ b/audio/dap/patches/patch-aa @@ -1,8 +1,13 @@ -$NetBSD: patch-aa,v 1.2 1999/12/22 09:19:57 scw Exp $ +$NetBSD: patch-aa,v 1.3 2000/02/23 11:49:57 wiz Exp $ ---- main/Makefile.netbsd.orig Thu Nov 11 01:17:08 1999 -+++ main/Makefile.netbsd Fri Dec 3 21:31:57 1999 -@@ -12,7 +12,7 @@ +--- ./main/Makefile.netbsd.orig Thu Nov 11 02:17:08 1999 ++++ ./main/Makefile.netbsd Wed Feb 23 12:12:58 2000 +@@ -8,11 +8,11 @@ + AUDIOF = ../libaudiofile + BACKDIR = ../bak/main + HOMEDIR = $(HOME) +-X11DIR = /usr/X11R6 ++X11DIR = ${X11BASE} INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -LIBDIR = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib +LIBDIR = -Wl,-R$(X11DIR)/lib -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib diff --git a/audio/dap/patches/patch-ap b/audio/dap/patches/patch-ap index 16ce30a23c7..2427829625c 100644 --- a/audio/dap/patches/patch-ap +++ b/audio/dap/patches/patch-ap @@ -1,8 +1,20 @@ -$NetBSD: patch-ap,v 1.1.1.1 1999/12/04 12:56:32 scw Exp $ +$NetBSD: patch-ap,v 1.2 2000/02/23 11:49:57 wiz Exp $ ---- tooltips/Makefile.netbsd.orig Fri Dec 3 22:07:56 1999 -+++ tooltips/Makefile.netbsd Fri Dec 3 22:07:24 1999 -@@ -39,7 +39,7 @@ +--- ./tooltips/Makefile.netbsd.orig Mon Nov 15 14:42:42 1999 ++++ ./tooltips/Makefile.netbsd Wed Feb 23 12:13:42 2000 +@@ -29,17 +29,17 @@ + XFORMS_INCLUDE_DIR = $(HOME)/xforms/FORMS + + # Define where the X11 include files are. +-X11_INCLUDE_DIR = /usr/X11R6/include/X11 ++X11_INCLUDE_DIR = ${X11BASE}/include/X11 + + # Define where the X11 include files are for Sun systems + SUN_INCLUDE_DIR = /usr/openwin/include + + # Define other include file directories. +-OTHER_INCLUDE_DIR = /usr/X11R6/include ++OTHER_INCLUDE_DIR = ${X11BASE}/include # Uncomment out this line if you do not want debug information included. # DEBUG = -g -Wall -ansi -pedantic diff --git a/audio/dap/pkg/PLIST b/audio/dap/pkg/PLIST index 936e7315c0b..1369ad29eac 100644 --- a/audio/dap/pkg/PLIST +++ b/audio/dap/pkg/PLIST @@ -1,2 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/12/04 12:56:29 scw Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/02/23 11:49:58 wiz Exp $ bin/dap +share/doc/dap/README +share/doc/dap/TODO +@dirrm share/doc/dap |