diff options
| author | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2000-12-30 19:08:00 +0000 |
|---|---|---|
| committer | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2000-12-30 19:08:00 +0000 |
| commit | 676b2d1f905df4df5fe3ee9364e20ab2b76a8995 (patch) | |
| tree | 329fa041d816f3137def6bbf14666e266d74c6de /audio | |
| parent | use ComplexProgramTargetNoMan to avoid making html manpage with XFree86-4. (diff) | |
fix manpage handling with XFree86-4.
PR: 23694
Submitted by: myself
Non-responce from: maintainer
Notes
Notes:
svn path=/head/; revision=36476
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/xmix/Makefile | 4 | ||||
| -rw-r--r-- | audio/xmix/files/patch-aa | 47 | ||||
| -rw-r--r-- | audio/xmix/files/patch-ab | 11 |
3 files changed, 24 insertions, 38 deletions
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile index 8c4eb26c14a5..3e1cfad9a044 100644 --- a/audio/xmix/Makefile +++ b/audio/xmix/Makefile @@ -21,8 +21,10 @@ WRKSRC= $(WRKDIR)/xmix MAN1= xmix.1 -pre-install: +pre-build: ${CP} ${WRKSRC}/xmix.1 ${WRKSRC}/xmix.man + +pre-install: ${INSTALL_DATA} $(WRKSRC)/XMix ${PREFIX}/lib/X11/app-defaults .include <bsd.port.mk> diff --git a/audio/xmix/files/patch-aa b/audio/xmix/files/patch-aa index 97750e6f1557..4514e9b4fabe 100644 --- a/audio/xmix/files/patch-aa +++ b/audio/xmix/files/patch-aa @@ -1,37 +1,10 @@ -diff -rc ../../xmix.orig/Imakefile ./Imakefile -*** ../../xmix.orig/Imakefile Fri Jun 30 18:49:35 1995 ---- ./Imakefile Fri Jun 30 20:11:30 1995 -*************** -*** 14,17 **** - - LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) - -! NormalProgramTarget(xmix,$(OBJS1),,$(LOCAL_LIBRARIES),) ---- 14,19 ---- - - LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) - -! PROGRAM = $(PROGRAMS) -! -! ComplexProgramTarget_1($(PROGRAM),$(LOCAL_LIBRARIES),) -Only in ./: Imakefile.orig -diff -rc ../../xmix.orig/xmix.c ./xmix.c -*** ../../xmix.orig/xmix.c Fri Jun 30 20:09:41 1995 ---- ./xmix.c Fri Jun 30 20:11:49 1995 -*************** -*** 77,83 **** - #include "square_empty.bit" - #include "square_with_x.bit" - -! #include <linux/soundcard.h> - - #define SOUND_FULL_SCALE 100.0 - #define MAX_SOUND_VOL 95 ---- 77,83 ---- - #include "square_empty.bit" - #include "square_with_x.bit" - -! #include <machine/soundcard.h> - - #define SOUND_FULL_SCALE 100.0 - #define MAX_SOUND_VOL 95 +--- Imakefile.orig Wed Feb 2 13:54:35 1994 ++++ Imakefile Wed Nov 1 10:25:40 2000 +@@ -14,4 +14,6 @@ + + LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) + +-NormalProgramTarget(xmix,$(OBJS1),,$(LOCAL_LIBRARIES),) ++PROGRAM = $(PROGRAMS) ++ ++ComplexProgramTarget_1($(PROGRAM),$(LOCAL_LIBRARIES),) diff --git a/audio/xmix/files/patch-ab b/audio/xmix/files/patch-ab new file mode 100644 index 000000000000..4f014c950b70 --- /dev/null +++ b/audio/xmix/files/patch-ab @@ -0,0 +1,11 @@ +--- xmix.c.orig Wed Nov 1 10:29:04 2000 ++++ xmix.c Wed Nov 1 10:29:04 2000 +@@ -77,7 +77,7 @@ + #include "square_empty.bit" + #include "square_with_x.bit" + +-#include <linux/soundcard.h> ++#include <machine/soundcard.h> + + #define SOUND_FULL_SCALE 100.0 + #define MAX_SOUND_VOL 95 |