Date: Mon, 1 Jan 2001 23:16:29 +0100 (CET) From: Anders Nordby <anders@fix.no> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/24007: Fix of port: audio/fcplay Message-ID: <20010101221629.AE13F3C97@totem.fix.no> Resent-Message-ID: <200101012220.f01MK1T38575@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 24007
>Category: ports
>Synopsis: Fix of port: audio/fcplay
>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: Mon Jan 01 14:20:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Anders Nordby
>Release: FreeBSD 4.2-STABLE i386
>Organization:
Fluxpod Information eXchange
>Environment:
FreeBSD eggsilo.localnet 4.2-STABLE FreeBSD 4.2-STABLE #0: Sun Dec 17 19:09:13 CET 2000 root@eggsilo.localnet:/space/tmp/obj/usr/src/sys/EGGSILO i386
>Description:
- Fix compilation error under XFree86 4.x
- Add USE_GMAKE
- Strip binary
- Support NOPORTDOCS
- Exclude GPL doc from package
New patches: patch-ab and patch-ac.
Thanks to KATO Tsuguru for patches.
>How-To-Repeat:
>Fix:
diff -Nur fcplay.old/Makefile fcplay/Makefile
--- fcplay.old/Makefile Mon Sep 18 00:00:23 2000
+++ fcplay/Makefile Mon Jan 1 00:17:26 2001
@@ -16,14 +16,18 @@
BUILD_DEPENDS= ${LOCALBASE}/include/sidplay/compconf.h:${PORTSDIR}/audio/libsidplay
-CXXFLAGS+= -I${PREFIX}/include -DHAVE_FREEBSD -DHAVE_MACHINE_SOUNDCARD_H
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+USE_GMAKE= yes
GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/fcplay-${PORTVERSION}
+CXXFLAGS+= -I${LOCALBASE}/include
-post-install:
- ${INSTALL} -d -m 555 ${PREFIX}/share/doc/fcplay
- @${INSTALL_DATA} ${WRKSRC}/ABOUT ${PREFIX}/share/doc/fcplay/
- @${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/fcplay/
- @${INSTALL_DATA} ${WRKSRC}/POINTER ${PREFIX}/share/doc/fcplay/
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/fcplay ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${PREFIX}/share/doc/fcplay
+ ${INSTALL_DATA} ${WRKSRC}/ABOUT ${PREFIX}/share/doc/fcplay
+ ${INSTALL_DATA} ${WRKSRC}/POINTER ${PREFIX}/share/doc/fcplay
+.endif
.include <bsd.port.mk>
diff -Nur fcplay.old/files/patch-ab fcplay/files/patch-ab
--- fcplay.old/files/patch-ab Thu Jan 1 01:00:00 1970
+++ fcplay/files/patch-ab Mon Jan 1 00:17:28 2001
@@ -0,0 +1,10 @@
+--- AudioDriver.h.orig Tue Mar 4 06:47:00 1997
++++ AudioDriver.h Tue Dec 12 02:46:01 2000
+@@ -7,6 +7,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
++#include "Config.h"
+
+ // These next includes were not required if libsidplay would not
+ // provide related HAVE_* definitions.
diff -Nur fcplay.old/files/patch-ac fcplay/files/patch-ac
--- fcplay.old/files/patch-ac Thu Jan 1 01:00:00 1970
+++ fcplay/files/patch-ac Mon Jan 1 00:17:30 2001
@@ -0,0 +1,49 @@
+--- configure.orig Thu May 28 04:08:00 1998
++++ configure Tue Dec 12 02:51:01 2000
+@@ -1631,41 +1631,6 @@
+ fi;
+
+
+-# Extract the first word of "makedepend", so it can be a program name with args.
+-set dummy makedepend; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1638: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_MAKEDEP'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- if test -n "$MAKEDEP"; then
+- ac_cv_prog_MAKEDEP="$MAKEDEP" # Let the user override the test.
+-else
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+- ac_dummy="$PATH"
+- for ac_dir in $ac_dummy; do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/$ac_word; then
+- ac_cv_prog_MAKEDEP="makedepend"
+- break
+- fi
+- done
+- IFS="$ac_save_ifs"
+- test -z "$ac_cv_prog_MAKEDEP" && ac_cv_prog_MAKEDEP="nomakedep"
+-fi
+-fi
+-MAKEDEP="$ac_cv_prog_MAKEDEP"
+-if test -n "$MAKEDEP"; then
+- echo "$ac_t""$MAKEDEP" 1>&6
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-
+-if test "$MAKEDEP" = "nomakedep"; then
+- { echo "configure: error: No ``makedepend'' found." 1>&2; exit 1; }
+-fi;
+-
+-
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+@@ -2297,4 +2262,3 @@
+ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+
+
+-$MAKE depend
diff -Nur fcplay.old/pkg-plist fcplay/pkg-plist
--- fcplay.old/pkg-plist Mon Sep 18 00:00:27 2000
+++ fcplay/pkg-plist Mon Jan 1 00:17:31 2001
@@ -1,5 +1,4 @@
bin/fcplay
share/doc/fcplay/ABOUT
-share/doc/fcplay/COPYING
share/doc/fcplay/POINTER
@dirrm share/doc/fcplay
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010101221629.AE13F3C97>