9 files changed, 75 insertions, 85 deletions
diff --git a/audio/quelcom/Makefile b/audio/quelcom/Makefile
index feb6834d5b4d..882d1c1caf72 100644
--- a/audio/quelcom/Makefile
+++ b/audio/quelcom/Makefile
@@ -6,16 +6,25 @@
 #
 
 PORTNAME=	quelcom
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.etse.urv.es/~dmanye/quelcom/src/
 
-MAINTAINER=	greid@ukug.uk.freebsd.org
+MAINTAINER=	greid@FreeBSD.org
+
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_GMAKE=	yes
 MAKEFILE=	makefile
 
-MAN1=	qmp3check.1 qmp3cut.1 qmp3info.1 qmp3join.1 \
-	qwavcut.1 qwavinfo.1 qwavjoin.1 qwavsilence.1
+MAN1=		qmp3check.1 qmp3cut.1 qmp3info.1 qmp3join.1 qmp3report.1 \
+		qwavcut.1 qwavfade.1 qwavheaderdump.1 qwavinfo.1 qwavjoin.1 \
+		qwavsilence.1
+
+do-install:
+.for F in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/man/${F} ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${F:S/.1//g} ${PREFIX}/bin
+.endfor
 
 .include <bsd.port.mk>
diff --git a/audio/quelcom/distinfo b/audio/quelcom/distinfo
index 761cee533257..6417227d2569 100644
--- a/audio/quelcom/distinfo
+++ b/audio/quelcom/distinfo
@@ -1 +1 @@
-MD5 (quelcom-0.2.0.tar.gz) = 83966517869837a509a6fd883803c49e
+MD5 (quelcom-0.3.0.tar.gz) = 0ff826e8280a98c87de1aa9d52c70746
diff --git a/audio/quelcom/files/patch-aa b/audio/quelcom/files/patch-aa
index b7201eeb8a37..55783615d869 100644
--- a/audio/quelcom/files/patch-aa
+++ b/audio/quelcom/files/patch-aa
@@ -1,38 +1,22 @@
---- makefile.orig	Tue Dec 26 18:55:29 2000
-+++ makefile	Wed Dec 27 13:55:29 2000
-@@ -3,17 +3,18 @@
+--- makefile.orig	Tue Jan 23 00:02:00 2001
++++ makefile	Tue Jan 23 12:57:32 2001
+@@ -3,16 +3,16 @@
  #
- 
+  
  # change these variables to fit your needs
 -MANDIR=/usr/local/man
-+MANDIR=${PREFIX}/man
++MANDIR=$(PREFIX)/man
+ PACKAGE=quelcom
+-LOCALEDIR=~/share/locale
++LOCALEDIR=$(PREFIX)/share/locale
  #BINDIR=/usr/local/bin
  # you should change BINDIR in src/makefile
  
- VERSION=0.2.0
-+INSTALL_P=/usr/bin/install
+ VERSION=0.3.0
  
  all:
 -	cd src; make
-+	cd src; ${MAKE}
++	cd src; $(MAKE)
  
  clean:
--	cd src; make clean
-+	cd src; ${MAKE} clean
- 
- html: man/*
- 	mkdir -p ./html
-@@ -24,11 +25,10 @@
- 	done
- 
- install: all
--	cd src; make install
-+	cd src; ${MAKE} install
- 	for i in man/*; \
- 	do \
--	  mkdir -p $(MANDIR)/man1; \
--	  cp $$i $(MANDIR)/man1; \
-+	$(INSTALL_P) -c -o root -g wheel -m 444 $$i ${PREFIX}/man/man1; \
- 	done
- 
- package: html
+ 	cd src; make clean
diff --git a/audio/quelcom/files/patch-ab b/audio/quelcom/files/patch-ab
index 3784ace199c5..2615c9f3edb7 100644
--- a/audio/quelcom/files/patch-ab
+++ b/audio/quelcom/files/patch-ab
@@ -1,27 +1,23 @@
---- src/makefile.orig	Tue Dec 26 18:55:30 2000
-+++ src/makefile	Wed Dec 27 13:54:07 2000
-@@ -1,9 +1,11 @@
- TARGETS=qmp3check qwavsilence qwavinfo qwavjoin qwavcut qmp3info qmp3join qmp3cut 
+--- src/makefile.orig	Tue Jan 23 00:02:01 2001
++++ src/makefile	Tue Jan 23 12:59:11 2001
+@@ -1,16 +1,16 @@
+ TARGETS=qwavheaderdump qwavfade qmp3report qmp3check qwavsilence qwavinfo qwavjoin qwavcut qmp3info qmp3join qmp3cut 
+ 
+ PACKAGE=\"quelcom\"
+-LOCALEDIR=\"/usr/local/share/locale\"
++LOCALEDIR=$(PREFIX)/share/locale
  
-+INSTALL_P=/usr/bin/install
-+
  all: $(TARGETS)
  	strip $(TARGETS)
  
 -BINDIR=/usr/local/bin
-+BINDIR=${PREFIX}/bin
- VERSION=\"0.2.0\"
++BINDIR=$(PREFIX)/bin
+ VERSION=\"0.3.0\"
  CXX=g++
- CXXFLAGS=-Wall -DQVERSION=$(VERSION) #-DQVERBOSE# -g -pg -fprofile-ar=cs -ftest-coverage 
-@@ -21,7 +23,10 @@
- 	$(CXX) $(CXXFLAGS) -c $< -o $*.o
- 
- install:
--	cp $(TARGETS) $(BINDIR)
-+	for i in $(TARGETS); \
-+	do \
-+	$(INSTALL_P) -c -o root -g wheel -m 555 $$i $(BINDIR); \
-+	done
+-CXXFLAGS=-Wall -DVERSION=$(VERSION) -DPACKAGE=$(PACKAGE) -DLOCALEDIR=$(LOCALEDIR)
+-LDFLAGS=
++CXXFLAGS+=-Wall -DVERSION=$(VERSION) -DPACKAGE=$(PACKAGE) -DLOCALEDIR=$(LOCALEDIR) -I$(PREFIX)/include
++LDFLAGS=-L$(PREFIX)/lib -lgnugetopt
  
- qwavinfo: qwavinfo.o $(OBJECTS)
- 	$(CXX) -o qwavinfo qwavinfo.o $(OBJECTS) $(LDFLAGS)
+ SOURCES=qwav.cc qwavheader.cc qexception.cc qvf.cc qcuthandler.cc qfile.cc qmisc.cc
+ HEADERS=qwav.hh qwavheader.hh qexception.hh qvf.hh qcuthandler.hh qfile.hh qmisc.hh
diff --git a/audio/quelcom/files/patch-ac b/audio/quelcom/files/patch-ac
index 52ee6a9d4c36..06654415c35a 100644
--- a/audio/quelcom/files/patch-ac
+++ b/audio/quelcom/files/patch-ac
@@ -1,5 +1,5 @@
---- src/qmisc.cc.orig	Tue Dec 26 18:55:29 2000
-+++ src/qmisc.cc	Wed Dec 27 13:21:23 2000
+--- src/qmisc.cc.orig	Tue Jan 23 13:01:16 2001
++++ src/qmisc.cc	Tue Jan 23 13:01:23 2001
 @@ -1,6 +1,6 @@
  # include <string>
  # include <stdio.h>
@@ -7,4 +7,3 @@
 +# include "qmisc.hh"
  
  string uint2string (uint ui) {
- 
diff --git a/audio/quelcom/files/patch-ad b/audio/quelcom/files/patch-ad
index e95b0f1a8095..dd38f4081d47 100644
--- a/audio/quelcom/files/patch-ad
+++ b/audio/quelcom/files/patch-ad
@@ -1,10 +1,9 @@
---- src/qmp3.cc.orig	Tue Dec 26 18:55:29 2000
-+++ src/qmp3.cc		Wed Dec 27 13:24:32 2000
-@@ -346,6 +346,7 @@
+--- src/qmp3frameheader.hh.orig	Tue Jan 23 13:03:03 2001
++++ src/qmp3frameheader.hh	Tue Jan 23 13:03:11 2001
+@@ -2,6 +2,7 @@
+ # define _qmp3frameheader_hh_
  
-   qfile::cut(offset_first,offset_last+length_last-1);
-  // remapejar
-+  return 0;
- }
+ # include <string>
++# include <sys/types.h>
  
- // provar donant l'@ de mem=F2ria...
+ typedef unsigned int uint;
diff --git a/audio/quelcom/files/patch-ae b/audio/quelcom/files/patch-ae
index 6e1f49d011b3..f82dfe16a678 100644
--- a/audio/quelcom/files/patch-ae
+++ b/audio/quelcom/files/patch-ae
@@ -1,10 +1,9 @@
---- src/qmp3info.cc.orig	Tue Dec 26 18:55:29 2000
-+++ src/qmp3info.cc		Wed Dec 27 13:23:36 2000
-@@ -2,6 +2,7 @@
- # include "qmp3.hh"
- # include "qexception.hh"
- 
+--- src/qwavinfo.cc.orig	Tue Jan 23 13:05:30 2001
++++ src/qwavinfo.cc	Tue Jan 23 13:05:42 2001
+@@ -1,6 +1,6 @@
+ # include <getopt.h>	// getopt
+ # include <sys/types.h>	// ulong, ...
+-
 +typedef unsigned long ulong;
- 
- void usage () {
- 
+ # include "qwav.hh"
+ # include "qexception.hh"
diff --git a/audio/quelcom/files/patch-af b/audio/quelcom/files/patch-af
index 7428612561df..02951031c30a 100644
--- a/audio/quelcom/files/patch-af
+++ b/audio/quelcom/files/patch-af
@@ -1,10 +1,11 @@
---- src/qwavinfo.cc.orig	Tue Dec 26 18:55:30 2000
-+++ src/qwavinfo.cc		Wed Dec 27 13:22:42 2000
-@@ -2,6 +2,7 @@
- # include "qwav.hh"
+--- src/qmp3info.cc.orig	Tue Jan 23 13:06:43 2001
++++ src/qmp3info.cc	Tue Jan 23 13:07:04 2001
+@@ -1,7 +1,7 @@
+ # include <getopt.h>	// getopt
+ # include "qmp3.hh"
  # include "qexception.hh"
- 
+-
 +typedef unsigned long ulong;
- 
- void usage () {
- 
+ #ifdef NLS
+   # include <locale.h>
+   # include <libintl.h>
diff --git a/audio/quelcom/pkg-plist b/audio/quelcom/pkg-plist
index 80ba8bdfeecf..b0d7bdff3618 100644
--- a/audio/quelcom/pkg-plist
+++ b/audio/quelcom/pkg-plist
@@ -1,8 +1,11 @@
 bin/qmp3check
-bin/qwavsilence
-bin/qwavinfo
-bin/qwavjoin
-bin/qwavcut
+bin/qmp3cut
 bin/qmp3info
 bin/qmp3join
-bin/qmp3cut
+bin/qmp3report
+bin/qwavcut
+bin/qwavfade
+bin/qwavheaderdump
+bin/qwavinfo
+bin/qwavjoin
+bin/qwavsilence