Attachment 13493 Details for Bug 25660 – file.diff

[patch] file.diff

file.diff (text/plain), 6.71 KB, created by George Reid on 2001-03-10 22:30:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George Reid

Created: 2001-03-10 22:30:09 UTC

Size: 6.71 KB

patch

obsolete

>diff -urN quelcom.old/Makefile quelcom/Makefile
>--- quelcom.old/Makefile=09Wed Mar  7 14:43:44 2001
>+++ quelcom/Makefile=09Sat Mar 10 21:59:14 2001
>@@ -6,16 +6,19 @@
> #
>=20
> PORTNAME=3D=09quelcom
>-PORTVERSION=3D=090.2.0
>+PORTVERSION=3D=090.3.0
> CATEGORIES=3D=09audio
> MASTER_SITES=3D=09http://www.etse.urv.es/~dmanye/quelcom/src/
>=20
> MAINTAINER=3D=09greid@ukug.uk.freebsd.org
>=20
>+LIB_DEPENDS=3D=09gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
>+
> USE_GMAKE=3D=09yes
> MAKEFILE=3D=09makefile
>=20
>-MAN1=3D=09qmp3check.1 qmp3cut.1 qmp3info.1 qmp3join.1 \
>-=09qwavcut.1 qwavinfo.1 qwavjoin.1 qwavsilence.1
>+MAN1=3D=09=09qmp3check.1 qmp3cut.1 qmp3info.1 qmp3join.1 qmp3report.1 \
>+=09=09qwavcut.1 qwavfade.1 qwavheaderdump.1 qwavinfo.1 qwavjoin.1 \
>+=09=09qwavsilence.1
>=20
> .include <bsd.port.mk>
>diff -urN quelcom.old/distinfo quelcom/distinfo
>--- quelcom.old/distinfo=09Wed Mar  7 14:43:44 2001
>+++ quelcom/distinfo=09Sat Mar 10 21:34:25 2001
>@@ -1 +1 @@
>-MD5 (quelcom-0.2.0.tar.gz) =3D 83966517869837a509a6fd883803c49e
>+MD5 (quelcom-0.3.0.tar.gz) =3D 0ff826e8280a98c87de1aa9d52c70746
>diff -urN quelcom.old/files/patch-aa quelcom/files/patch-aa
>--- quelcom.old/files/patch-aa=09Wed Mar  7 14:43:47 2001
>+++ quelcom/files/patch-aa=09Sat Mar 10 21:56:44 2001
>@@ -1,28 +1,26 @@
>---- makefile.orig=09Tue Dec 26 18:55:29 2000
>-+++ makefile=09Wed Dec 27 13:55:29 2000
>-@@ -3,17 +3,18 @@
>+--- makefile.orig=09Tue Jan 23 00:02:00 2001
>++++ makefile=09Sat Mar 10 21:56:37 2001
>+@@ -3,16 +3,17 @@
>  #
>-=20
>+ =20
>  # change these variables to fit your needs
> -MANDIR=3D/usr/local/man
>-+MANDIR=3D${PREFIX}/man
>++MANDIR=3D$(PREFIX)/man
>+ PACKAGE=3Dquelcom
>+ LOCALEDIR=3D~/share/locale
>++INSTALL_P=3D/usr/bin/install
>  #BINDIR=3D/usr/local/bin
>  # you should change BINDIR in src/makefile
> =20
>- VERSION=3D0.2.0
>-+INSTALL_P=3D/usr/bin/install
>+ VERSION=3D0.3.0
> =20
>  all:
> -=09cd src; make
> +=09cd src; ${MAKE}
> =20
>  clean:
>--=09cd src; make clean
>-+=09cd src; ${MAKE} clean
>-=20
>- html: man/*
>- =09mkdir -p ./html
>-@@ -24,11 +25,10 @@
>+ =09cd src; make clean
>+@@ -26,11 +27,10 @@
>  =09done
> =20
>  install: all
>diff -urN quelcom.old/files/patch-ab quelcom/files/patch-ab
>--- quelcom.old/files/patch-ab=09Wed Mar  7 14:43:47 2001
>+++ quelcom/files/patch-ab=09Sat Mar 10 21:48:41 2001
>@@ -1,27 +1,38 @@
>---- src/makefile.orig=09Tue Dec 26 18:55:30 2000
>-+++ src/makefile=09Wed Dec 27 13:54:07 2000
>-@@ -1,9 +1,11 @@
>- TARGETS=3Dqmp3check qwavsilence qwavinfo qwavjoin qwavcut qmp3info qmp3jo=
>in qmp3cut=20
>+--- src/makefile.orig=09Tue Jan 23 00:02:01 2001
>++++ src/makefile=09Sat Mar 10 21:48:33 2001
>+@@ -1,16 +1,20 @@
>+ TARGETS=3Dqwavheaderdump qwavfade qmp3report qmp3check qwavsilence qwavin=
>fo qwavjoin qwavcut qmp3info qmp3join qmp3cut=20
> =20
>-+INSTALL_P=3D/usr/bin/install
>+ PACKAGE=3D\"quelcom\"
>+-LOCALEDIR=3D\"/usr/local/share/locale\"
>++LOCALEDIR=3D\"$(LOCALBASE)/share/locale\"
> +
>++INSTALL_P=3D/usr/bin/install
>+=20
>  all: $(TARGETS)
>  =09strip $(TARGETS)
> =20
>--BINDIR=3D/usr/local/bin
> +BINDIR=3D${PREFIX}/bin
>- VERSION=3D\"0.2.0\"
>++
>+ BINDIR=3D/usr/local/bin
>+ VERSION=3D\"0.3.0\"
>  CXX=3Dg++
>- CXXFLAGS=3D-Wall -DQVERSION=3D$(VERSION) #-DQVERBOSE# -g -pg -fprofile-ar=
>=3Dcs -ftest-coverage=20
>-@@ -21,7 +23,10 @@
>+-CXXFLAGS=3D-Wall -DVERSION=3D$(VERSION) -DPACKAGE=3D$(PACKAGE) -DLOCALEDI=
>R=3D$(LOCALEDIR)
>+-LDFLAGS=3D
>++CXXFLAGS+=3D-Wall -DVERSION=3D$(VERSION) -DPACKAGE=3D$(PACKAGE) -DLOCALED=
>IR=3D$(LOCALEDIR) -I$(LOCALBASE)/include
>++LDFLAGS=3D-L$(LOCALBASE)/lib -lgnugetopt
>+=20
>+ SOURCES=3Dqwav.cc qwavheader.cc qexception.cc qvf.cc qcuthandler.cc qfile=
>=2Ecc qmisc.cc
>+ HEADERS=3Dqwav.hh qwavheader.hh qexception.hh qvf.hh qcuthandler.hh qfile=
>=2Ehh qmisc.hh
>+@@ -24,7 +28,10 @@
>  =09$(CXX) $(CXXFLAGS) -c $< -o $*.o
> =20
>  install:
>--=09cp $(TARGETS) $(BINDIR)
>+-=09cp -f $(TARGETS) $(BINDIR)
> +=09for i in $(TARGETS); \
> +=09do \
> +=09$(INSTALL_P) -c -o root -g wheel -m 555 $$i $(BINDIR); \
> +=09done
> =20
>- qwavinfo: qwavinfo.o $(OBJECTS)
>- =09$(CXX) -o qwavinfo qwavinfo.o $(OBJECTS) $(LDFLAGS)
>+ qmp3headerdump: qmp3headerdump.o $(MP3OBJECTS)
>+ =09$(CXX) -o qmp3headerdump qmp3headerdump.o $(MP3OBJECTS) $(LDFLAGS)
>diff -urN quelcom.old/files/patch-ad quelcom/files/patch-ad
>--- quelcom.old/files/patch-ad=09Wed Mar  7 14:43:47 2001
>+++ quelcom/files/patch-ad=09Sat Mar 10 21:38:55 2001
>@@ -1,10 +1,10 @@
>---- src/qmp3.cc.orig=09Tue Dec 26 18:55:29 2000
>-+++ src/qmp3.cc=09=09Wed Dec 27 13:24:32 2000
>-@@ -346,6 +346,7 @@
>+--- src/qmp3.cc.orig=09Tue Jan 23 00:02:01 2001
>++++ src/qmp3.cc=09Sat Mar 10 21:38:03 2001
>+@@ -373,6 +373,7 @@
> =20
>    qfile::cut(offset_first,offset_last+length_last-1);
>   // remapejar
> +  return 0;
>  }
> =20
>- // provar donant l'@ de mem=3DF2ria...
>+ // provar donant l'@ de mem=F2ria...
>diff -urN quelcom.old/files/patch-ae quelcom/files/patch-ae
>--- quelcom.old/files/patch-ae=09Wed Mar  7 14:43:47 2001
>+++ quelcom/files/patch-ae=09Sat Mar 10 21:38:55 2001
>@@ -1,10 +1,10 @@
>---- src/qmp3info.cc.orig=09Tue Dec 26 18:55:29 2000
>-+++ src/qmp3info.cc=09=09Wed Dec 27 13:23:36 2000
>-@@ -2,6 +2,7 @@
>- # include "qmp3.hh"
>- # include "qexception.hh"
>+--- src/qmp3info.cc.orig=09Tue Jan 23 00:02:01 2001
>++++ src/qmp3info.cc=09Sat Mar 10 21:38:20 2001
>+@@ -22,6 +22,7 @@
>+   cerr << _("   -V, --version: show version and exit\n");
>+ }
> =20
> +typedef unsigned long ulong;
> =20
>- void usage () {
>+ int main (int argc, char **argv) {
> =20
>diff -urN quelcom.old/files/patch-af quelcom/files/patch-af
>--- quelcom.old/files/patch-af=09Wed Mar  7 14:43:47 2001
>+++ quelcom/files/patch-af=09Sat Mar 10 21:38:55 2001
>@@ -1,10 +1,10 @@
>---- src/qwavinfo.cc.orig=09Tue Dec 26 18:55:30 2000
>-+++ src/qwavinfo.cc=09=09Wed Dec 27 13:22:42 2000
>-@@ -2,6 +2,7 @@
>- # include "qwav.hh"
>- # include "qexception.hh"
>+--- src/qwavinfo.cc.orig=09Tue Jan 23 00:02:01 2001
>++++ src/qwavinfo.cc=09Sat Mar 10 21:38:37 2001
>+@@ -24,6 +24,7 @@
>+   cerr << _("   -V, --version: show version and exit\n");
>+ }
> =20
> +typedef unsigned long ulong;
> =20
>- void usage () {
>+ int main (int argc, char **argv) {
> =20
>diff -urN quelcom.old/files/patch-ag quelcom/files/patch-ag
>--- quelcom.old/files/patch-ag=09Thu Jan  1 01:00:00 1970
>+++ quelcom/files/patch-ag=09Sat Mar 10 21:48:08 2001
>@@ -0,0 +1,10 @@
>+--- src/qmp3frameheader.hh.orig=09Sat Mar 10 21:46:23 2001
>++++ src/qmp3frameheader.hh=09Sat Mar 10 21:46:33 2001
>+@@ -2,6 +2,7 @@
>+ # define _qmp3frameheader_hh_
>+=20
>+ # include <string>
>++# include <sys/types.h>
>+=20
>+ typedef unsigned int uint;
>+=20
>diff -urN quelcom.old/pkg-plist quelcom/pkg-plist
>--- quelcom.old/pkg-plist=09Wed Mar  7 14:43:44 2001
>+++ quelcom/pkg-plist=09Sat Mar 10 21:58:22 2001
>@@ -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

Actions: View | Diff

Attachments on bug 25660: 13493