From owner-freebsd-ports Wed Dec 20 8:30:26 2000 From owner-freebsd-ports@FreeBSD.ORG Wed Dec 20 08:30:12 2000 Return-Path: Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 22A5B37B400 for ; Wed, 20 Dec 2000 08:30:02 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id eBKGU2142459; Wed, 20 Dec 2000 08:30:02 -0800 (PST) (envelope-from gnats) Resent-Date: Wed, 20 Dec 2000 08:30:02 -0800 (PST) Resent-Message-Id: <200012201630.eBKGU2142459@freefall.freebsd.org> Resent-From: gnats-admin@FreeBSD.org (GNATS Management) Resent-To: freebsd-ports@FreeBSD.org Resent-Reply-To: gnats-admin@FreeBSD.org, k5@cheerful.com Received: from m08.alpha-net.ne.jp (m08.alpha-net.ne.jp [210.229.64.38]) by hub.freebsd.org (Postfix) with ESMTP id D9D4737B402 for ; Wed, 20 Dec 2000 08:26:21 -0800 (PST) Received: from kyoto-tc012-p49.alpha-net.ne.jp (kyoto-tc012-p49.alpha-net.ne.jp [210.237.119.177]) by m08.alpha-net.ne.jp (8.9.3/3.7W) with ESMTP id BAA05887 for ; Thu, 21 Dec 2000 01:26:14 +0900 (JST) Received: by kyoto-tc012-p49.alpha-net.ne.jp (Postfix, from userid 1001) id CBC7E5DD6; Thu, 21 Dec 2000 01:26:14 +0900 (JST) Message-Id: <20001220162614.CBC7E5DD6@kyoto-tc012-p49.alpha-net.ne.jp> Date: Thu, 21 Dec 2000 01:26:14 +0900 (JST) From: k5@cheerful.com Sender: k5@kyoto-tc012-p49.alpha-net.ne.jp Reply-To: k5@cheerful.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/23694: fix: audio/xmix X manpage error with XFree86-4 Resent-Sender: gnats@FreeBSD.org Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 23694 >Category: ports >Synopsis: fix: audio/xmix X manpage error with XFree86-4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Dec 20 08:30:02 PST 2000 >Closed-Date: >Last-Modified: >Originator: FUJISHIMA Satsuki >Release: FreeBSD 5.0-CURRENT i386 >Organization: N/A >Environment: ports-current with XFree86-4. >Description: fixing "X manpage" error with XFree86-4 on bento. MAINTAINER does not respond for 10 days. >How-To-Repeat: w3m -dump http://bento.freebsd.org/errorlogs/errorlogs/e.4.20001204/ \| grep 'X manpage' >Fix: files/patch-aa was splitted into patch-a[ab] new file: files/patch-ab diff -urN -xCVS /usr/ports/audio/xmix/Makefile audio/xmix/Makefile --- /usr/ports/audio/xmix/Makefile Sun Apr 9 06:24:54 2000 +++ audio/xmix/Makefile Wed Nov 1 10:26:21 2000 @@ -21,8 +21,10 @@ 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 diff -urN -xCVS /usr/ports/audio/xmix/files/patch-aa audio/xmix/files/patch-aa --- /usr/ports/audio/xmix/files/patch-aa Sat Jul 1 18:12:51 1995 +++ audio/xmix/files/patch-aa Wed Nov 1 10:26:46 2000 @@ -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 - - #define SOUND_FULL_SCALE 100.0 - #define MAX_SOUND_VOL 95 ---- 77,83 ---- - #include "square_empty.bit" - #include "square_with_x.bit" - -! #include - - #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 -urN -xCVS /usr/ports/audio/xmix/files/patch-ab audio/xmix/files/patch-ab --- /usr/ports/audio/xmix/files/patch-ab Thu Jan 1 09:00:00 1970 +++ audio/xmix/files/patch-ab Wed Nov 1 10:30:22 2000 @@ -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 ++#include + + #define SOUND_FULL_SCALE 100.0 + #define MAX_SOUND_VOL 95 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message