- honor CFLAGS

- silence gcc 3.1 warnings
- prettify
This commit is contained in:
naddy 2002-06-14 12:11:17 +00:00
parent dc12c1bafe
commit b312a3e908
3 changed files with 50 additions and 17 deletions

View File

@ -1,24 +1,25 @@
# $OpenBSD: Makefile,v 1.7 2002/03/09 01:18:10 naddy Exp $ # $OpenBSD: Makefile,v 1.8 2002/06/14 12:11:17 naddy Exp $
# $NetBSD: Makefile,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
COMMENT= "CDDA reading utility with extra data verification features" COMMENT= "CDDA reading utility with extra data verification features"
DISTNAME= cdparanoia-III-alpha9.7 DISTNAME= cdparanoia-III-alpha9.7
PKGNAME= cdparanoia-3.a9.7p2 PKGNAME= cdparanoia-3.a9.7p2
CATEGORIES= audio CATEGORIES= audio
NEED_VERSION= 1.504 NEED_VERSION= 1.504
MASTER_SITES= http://www.xiph.org/paranoia/download/
EXTRACT_SUFX= .src.tgz
HOMEPAGE= http://www.xiph.org/paranoia/ HOMEPAGE= http://www.xiph.org/paranoia/
CONFIGURE_STYLE= autoconf
AUTOCONF_NEW= Yes
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
CONFIGURE_ENV=GCC=${CC}
MASTER_SITES= ${HOMEPAGE}download/
EXTRACT_SUFX= .src.tgz
CONFIGURE_STYLE= autoconf
AUTOCONF_NEW= Yes
CONFIGURE_ENV= GCC=${CC}
post-install: post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cdparanoia ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cdparanoia

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.4 2002/03/08 06:06:21 drahn Exp $ $OpenBSD: patch-configure_in,v 1.5 2002/06/14 12:11:18 naddy Exp $
--- configure.in.orig Sun Aug 15 17:29:43 1999 --- configure.in.orig Mon Aug 16 00:29:43 1999
+++ configure.in Thu Mar 7 23:31:11 2002 +++ configure.in Fri Jun 14 13:41:57 2002
@@ -1,28 +1,23 @@ @@ -1,28 +1,23 @@
AC_INIT(interface/interface.c) AC_INIT(interface/interface.c)
@ -20,18 +20,18 @@ $OpenBSD: patch-configure_in,v 1.4 2002/03/08 06:06:21 drahn Exp $
if test -z "$GCC"; then if test -z "$GCC"; then
DEBUG="-g" DEBUG="-g"
- OPT="-O" - OPT="-O"
+ OPT="-O ${COPTS}" + OPT="${CFLAGS}"
else else
case $host in case $host in
- i?86-*-linux*) - i?86-*-linux*)
+ i?86-*-*) + i?86-*-*)
DEBUG="-g -Wall -fsigned-char" DEBUG="-g -Wall -fsigned-char"
- OPT="-O20 -ffast-math -fsigned-char -finline-functions";; - OPT="-O20 -ffast-math -fsigned-char -finline-functions";;
+ OPT="-O20 -ffast-math -fsigned-char -finline-functions ${COPTS}";; + OPT="${CFLAGS} -ffast-math -fsigned-char -finline-functions";;
*) *)
DEBUG="-g -Wall -fsigned-char" DEBUG="-g -Wall -fsigned-char"
- OPT="-O20 -fsigned-char";; - OPT="-O20 -fsigned-char";;
+ OPT="-O20 -fsigned-char ${COPTS}";; + OPT="${CFLAGS} -fsigned-char";;
esac esac
fi fi

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-interface_utils_h,v 1.1.1.1 2000/09/21 16:07:21 espie Exp $ $OpenBSD: patch-interface_utils_h,v 1.2 2002/06/14 12:11:18 naddy Exp $
--- interface/utils.h.orig Tue Sep 19 16:20:29 2000 --- interface/utils.h.orig Mon Aug 16 00:13:44 1999
+++ interface/utils.h Tue Sep 19 16:16:36 2000 +++ interface/utils.h Fri Jun 14 13:51:02 2002
@@ -1,4 +1,16 @@ @@ -1,4 +1,16 @@
+#ifdef __linux__ +#ifdef __linux__
#include <endian.h> #include <endian.h>
@ -34,3 +34,35 @@ $OpenBSD: patch-interface_utils_h,v 1.1.1.1 2000/09/21 16:07:21 espie Exp $
#if BYTE_ORDER == LITTLE_ENDIAN #if BYTE_ORDER == LITTLE_ENDIAN
@@ -112,6 +126,7 @@ static void cderror(cdrom_drive *d,const
break;
case CDDA_MESSAGE_FORGETIT:
default:
+ break;
}
}
}
@@ -127,6 +142,7 @@ static void cdmessage(cdrom_drive *d,con
break;
case CDDA_MESSAGE_FORGETIT:
default:
+ break;
}
}
}
@@ -169,6 +185,7 @@ static void idperror(int messagedest,cha
break;
case CDDA_MESSAGE_FORGETIT:
default:
+ break;
}
}
if(malloced)free(buffer);
@@ -205,6 +222,7 @@ static void idmessage(int messagedest,ch
break;
case CDDA_MESSAGE_FORGETIT:
default:
+ break;
}
}
if(malloced)free(buffer);