get rid of libgnugetopt dependency for -CURRENT,

use USE_GETOPT_LONG instead.

10 files changed, 33 insertions, 60 deletions

diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index 5cd7ed93620c..63c5acf213f2 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cdparanoia
 PORTVERSION=	3.9.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio sysutils
 MASTER_SITES=	http://www.xiph.org/paranoia/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/^3\./III-alpha/}
@@ -16,12 +16,7 @@ EXTRACT_SUFX=	.src.tgz
 MAINTAINER=	corecode@corecode.ath.cx
 COMMENT=	A CDDA extraction tool (also known as ripper)
 
-.if !exists(/usr/include/getopt.h)
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lgnugetopt"
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-.endif
-
+USE_GETOPT_LONG=yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/audio/cdparanoia/files/patch-Makefile.in b/audio/cdparanoia/files/patch-Makefile.in
index 170737364d99..c7b253824ff2 100644
--- a/audio/cdparanoia/files/patch-Makefile.in
+++ b/audio/cdparanoia/files/patch-Makefile.in
@@ -1,17 +1,11 @@
-Index: Makefile.in
-===================================================================
-RCS file: /home/cvs/cdparanoia/Makefile.in,v
-retrieving revision 1.1.1.1
-retrieving revision 1.7
-diff -u -r1.1.1.1 -r1.7
---- Makefile.in	2003/01/05 09:46:26	1.1.1.1
-+++ Makefile.in	2003/02/13 02:41:38	1.7
+--- Makefile.in.orig	Wed Mar 28 07:46:58 2001
++++ Makefile.in	Mon Jul  7 06:24:17 2003
 @@ -8,7 +8,7 @@
  srcdir=@srcdir@
  
  @SET_MAKE@
 -FLAGS=@TYPESIZES@ @CFLAGS@
-+FLAGS=@TYPESIZES@ @CFLAGS@ -I./interface
++FLAGS=@TYPESIZES@ @CPPFLAGS@ @CFLAGS@ -I./interface
  OPT=@OPT@ $(FLAGS)
  DEBUG=@DEBUG@ $(FLAGS)
  CC=@CC@
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 93d0ed8a945c..1ef885658adf 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	denemo
 PORTVERSION=	0.5.9
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,10 +15,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Graphical score editor
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
-		intl.4:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
 		xml.5:${PORTSDIR}/textproc/libxml
 
+USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 PLIST=		${WRKDIR}/pkg-plist
 SHARED=		denemo.conf denemo.keymaprc english.keymaprc french.keymaprc
@@ -29,11 +30,10 @@ USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
+BROKEN=		"Does not compile"
 .endif
 
 post-configure:
-	${PERL} -pi -e "s:module12:module12 -lgnugetopt:g" ${WRKSRC}/Makefile
 	${PERL} -pi -e "s:<wait.h:<sys/wait.h:g" ${WRKSRC}/*.c
 
 pre-install:
diff --git a/audio/mp3_check/Makefile b/audio/mp3_check/Makefile
index 83ce30ad7989..6438aa7333c0 100644
--- a/audio/mp3_check/Makefile
+++ b/audio/mp3_check/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mp3_check
 PORTVERSION=	1.98
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mp3check
@@ -14,6 +15,8 @@ MASTER_SITE_SUBDIR=	mp3check
 MAINTAINER=	ericb@thedeepsky.com
 COMMENT=	Verifies the integrity of mp3 audio files
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+USE_GETOPT_LONG=yes
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/audio/mp3_check/files/patch-aa b/audio/mp3_check/files/patch-aa
index 25fe0e723dce..d75fed36f1db 100644
--- a/audio/mp3_check/files/patch-aa
+++ b/audio/mp3_check/files/patch-aa
@@ -6,8 +6,8 @@
  LOCALBASE ?= /usr/local
 -CFLAGS += -Wall -Werror
 -OPT_FLAGS = -L${LOCALBASE}/lib 
-+CFLAGS += -Wall -I${LOCALBASE}/include
-+OPT_FLAGS = -L${LOCALBASE}/lib -lgnugetopt 
++CFLAGS += -Wall ${CPPFLAGS}
++OPT_FLAGS = -L${LOCALBASE}/lib ${LDFLAGS}
  OBJS = 	mp3_check.o \
  	mp3_check_misc.o
  
diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile
index eb4a982f008c..ee651b0e4a49 100644
--- a/audio/osalp/Makefile
+++ b/audio/osalp/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	osalp
 PORTVERSION=	0.7.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,14 +18,15 @@ COMMENT=	Open Source Audio Library Project
 
 BUILD_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis \
-		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	vorbis.2:${PORTSDIR}/audio/libvorbis
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-all
 
 INSTALLS_SHLIB=	yes
diff --git a/audio/quelcom/Makefile b/audio/quelcom/Makefile
index 22e3146daeed..69e944926011 100644
--- a/audio/quelcom/Makefile
+++ b/audio/quelcom/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	quelcom
 PORTVERSION=	0.3.0
+PORTREVISION=   1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.etse.urv.es/~dmanye/quelcom/src/
 
 MAINTAINER=	greid@FreeBSD.org
 COMMENT=	A set of command-line utilities for MP3 and wave files
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 MAKEFILE=	makefile
 
@@ -25,7 +25,7 @@ MAN1=		qmp3check.1 qmp3cut.1 qmp3info.1 qmp3join.1 qmp3report.1 \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 500000
-BROKEN=         "does not build on FreeBSD 5.x; cout.form cannot be used with GCC 3.x"
+BROKEN=		"does not build on FreeBSD 5.x; cout.form cannot be used with GCC 3.x"
 .endif
 
 do-install:
diff --git a/audio/rawrec/Makefile b/audio/rawrec/Makefile
index b23e6ce4bd20..27c02312fe67 100644
--- a/audio/rawrec/Makefile
+++ b/audio/rawrec/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	rawrec
 PORTVERSION=	0.9.97
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		${MASTER_SITE_SOURCEFORGE}
@@ -18,15 +18,14 @@ MASTER_SITE_SUBDIR=	apps/sound/recorders \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A utility to record and playback raw audio data
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
+USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" \
-		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-lgnugetopt -lm ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+		CFLAGS="${CPPFLAGS} ${CFLAGS} ${PTHREAD_CFLAGS}" \
+		LDFLAGS="${LDFLAGS} -lm ${PTHREAD_LIBS}"
 
 MAN1=	rawrec.1
 MLINKS=	rawrec.1 rawplay.1
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index edd19a28416a..89bee16da7de 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -5,17 +5,17 @@
 # $FreeBSD$
 #
 
-PORTNAME=       rioutil
+PORTNAME=	rioutil
 PORTVERSION=	1.0.6
-CATEGORIES=     audio
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
+PORTREVISION=	1
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program to inferface with the Rio600, Rio800 and psa[play devices
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/rioutil/files/patch-aa b/audio/rioutil/files/patch-aa
deleted file mode 100644
index d4eb5985b4dc..000000000000
--- a/audio/rioutil/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Fri Dec 14 08:34:33 2001
-+++ configure	Sat Dec 15 01:42:47 2001
-@@ -1672,7 +1672,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgnugetopt  $LIBS"
-+LIBS="-L${prefix}/lib -lgnugetopt  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1678 "configure"
- #include "confdefs.h"
-@@ -1706,7 +1706,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lgnugetopt $LIBS"
-+  LIBS="-L${prefix}/lib -lgnugetopt $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6