From 6488d745017c1224c1c609e7e0d10e0ce621595f Mon Sep 17 00:00:00 2001 From: fenner Date: Mon, 8 Mar 1999 20:11:51 +0000 Subject: Upgrade kmpg to 0.4.0, and change MAINTAINER. PR: ports/9572 Submitted by: Tom Hukins tom@eborcom.com --- audio/kmpg/Makefile | 13 ++++++----- audio/kmpg/distinfo | 2 +- audio/kmpg/files/patch-aa | 38 -------------------------------- audio/kmpg/files/patch-ab | 22 ------------------- audio/kmpg/files/patch-ac | 11 ---------- audio/kmpg/files/patch-af | 12 ---------- audio/kmpg/files/patch-ag | 15 ------------- audio/kmpg/files/patch-ah | 15 ------------- audio/kmpg/pkg-descr | 21 ++++++------------ audio/kmpg/pkg-plist | 56 +++++++++++++++-------------------------------- 10 files changed, 33 insertions(+), 172 deletions(-) delete mode 100644 audio/kmpg/files/patch-aa delete mode 100644 audio/kmpg/files/patch-ab delete mode 100644 audio/kmpg/files/patch-ac delete mode 100644 audio/kmpg/files/patch-af delete mode 100644 audio/kmpg/files/patch-ag delete mode 100644 audio/kmpg/files/patch-ah (limited to 'audio') diff --git a/audio/kmpg/Makefile b/audio/kmpg/Makefile index c5d2866b5d07..bba5882d7ff2 100644 --- a/audio/kmpg/Makefile +++ b/audio/kmpg/Makefile @@ -1,18 +1,17 @@ # New ports collection makefile for: kmpg -# Version required: Beta4 +# Version required: 0.4.0 # Date created: 23 May 1998 # Whom: Hans Petter Bieker # -# $Id: Makefile,v 1.7 1998/10/09 10:05:45 asami Exp $ +# $Id: Makefile,v 1.8 1998/11/21 07:27:30 steve Exp $ # -DISTNAME= kmpg-0.3.3 +DISTNAME= kmpg-0.4.0 CATEGORIES= audio kde MASTER_SITES= $(MASTER_SITE_KDE) MASTER_SITE_SUBDIR= unstable/apps/multimedia/sound -EXTRACT_SUFX= .tgz -MAINTAINER= hanspb@persbraten.vgs.no +MAINTAINER= tom@eborcom.com LIB_DEPENDS= kdecore.1:${PORTSDIR}/x11/kdelibs \ kdeui.1:${PORTSDIR}/x11/kdelibs @@ -20,7 +19,9 @@ LIB_DEPENDS= kdecore.1:${PORTSDIR}/x11/kdelibs \ BROKEN_ELF= depends on kdelibs USE_QT= yes +GNU_CONFIGURE= yes USE_GMAKE= yes -MAKE_ENV= KDEDIR=${PREFIX} +CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" .include diff --git a/audio/kmpg/distinfo b/audio/kmpg/distinfo index 2c49d7690219..a93834e6e16b 100644 --- a/audio/kmpg/distinfo +++ b/audio/kmpg/distinfo @@ -1 +1 @@ -MD5 (kmpg-0.3.3.tgz) = dbfd6987d506331f410fd5df62a6b3f5 +MD5 (kmpg-0.4.0.tar.gz) = c92b6b125fcdeffc5c988fc43b026813 diff --git a/audio/kmpg/files/patch-aa b/audio/kmpg/files/patch-aa deleted file mode 100644 index c6d808bd41bb..000000000000 --- a/audio/kmpg/files/patch-aa +++ /dev/null @@ -1,38 +0,0 @@ ---- Makefile.orig Wed May 6 23:35:22 1998 -+++ Makefile Sat May 23 17:02:25 1998 -@@ -1,18 +1,18 @@ - ####### Kmpg Makefile - --INCDIR = -I$(QTDIR)/include -I$(KDEDIR)/include -+INCDIR = -I$(X11BASE)/include/X11/qt -I$(X11BASE)/include -I$(LOCALBASE)/include - CFLAGS = -O6 --LFLAGS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -L$(KDEDIR)/lib -lXext -lX11 -lkdecore -lkdeui -lm -lg++ -+LFLAGS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lqt -lXext -lX11 -lkdecore -lkdeui -lm -lg++ -lcompat - CC = g++ --MOC = $(QTDIR)/bin/moc -+MOC = $(X11BASE)/bin/moc - - ############# Install ############## - --INSTALL = install -m 0755 -s --INSTALL_SHELL = install -m 0755 --INSTALL_DATA = install -m 0644 --INSTALL_DIR = install -d -m 0755 --INSTALL_DIR_PRIVATE = install -d -m 0700 -+INSTALL = install -c -m 0555 -s -o bin -g bin -+INSTALL_SHELL = install -c -m 0555 -o bin -g bin -+INSTALL_DATA = install -c -m 0444 -o bin -g bin -+INSTALL_DIR = install -c -d -m 0755 -o root -g wheel -+INSTALL_DIR_PRIVATE = install -c -d -m 0700 -o root -g wheel - - prefix = $(KDEDIR) - BINDIR = $(prefix)/bin -@@ -52,7 +52,7 @@ - $(CC) $(OBJECTS) $(OBJMETA) -o $(TARGET) $(LFLAGS) - - library: -- cd lib; make linux; cd .. -+ cd lib; make freebsd; cd .. - - depend: - @makedepend $(INCDIR) $(SOURCES) 2> /dev/null diff --git a/audio/kmpg/files/patch-ab b/audio/kmpg/files/patch-ab deleted file mode 100644 index e9ddd1c86c23..000000000000 --- a/audio/kmpg/files/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ ---- lib/mpg123.c.orig Thu May 14 18:26:41 1998 -+++ lib/mpg123.c Thu May 14 18:27:28 1998 -@@ -1176,7 +1176,7 @@ - /* return 1; */ - } - -- while (frameNum < frame) // seek forward -+ while (frameNum < frame) /* seek forward */ - { - if(fr.lay == 3) - set_pointer(512); -@@ -1263,8 +1263,8 @@ - - MPEGclose(); - usebuffer = _prefs->buffersize; -- MPEGplayfile(name); // this calls MPEGinit(); -- MPEGseek( pos );// find old frame and keep on playing -+ MPEGplayfile(name); /* this calls MPEGinit(); */ -+ MPEGseek( pos );/* find old frame and keep on playing */ - } - } - diff --git a/audio/kmpg/files/patch-ac b/audio/kmpg/files/patch-ac deleted file mode 100644 index f2207f6355e4..000000000000 --- a/audio/kmpg/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Makefile.orig Thu May 14 18:29:32 1998 -+++ lib/Makefile Thu May 14 18:29:48 1998 -@@ -208,7 +208,7 @@ - mpg123.a: player.o mpg123_2.o common.o $(OBJECTS) decode_2to1.o decode_4to1.o \ - tabinit.o audio.o layer1.o layer2.o layer3.o buffer.o \ - getlopt.o httpget.o xfermem.o equalizer.o Makefile -- ar -rs mpg123.a player.o mpg123_2.o tabinit.o common.o layer1.o \ -+ ar -r mpg123.a player.o mpg123_2.o tabinit.o common.o layer1.o \ - layer2.o layer3.o audio.o buffer.o decode_2to1.o equalizer.o \ - decode_4to1.o getlopt.o httpget.o xfermem.o $(OBJECTS) - diff --git a/audio/kmpg/files/patch-af b/audio/kmpg/files/patch-af deleted file mode 100644 index 457f0dc690a7..000000000000 --- a/audio/kmpg/files/patch-af +++ /dev/null @@ -1,12 +0,0 @@ ---- khelp.h.orig Thu May 14 19:18:49 1998 -+++ khelp.h Thu May 14 19:19:35 1998 -@@ -11,7 +11,9 @@ - #include - #include - #include -+#include - -+long mtype; - - class KHelpMsg : protected msgbuf - { diff --git a/audio/kmpg/files/patch-ag b/audio/kmpg/files/patch-ag deleted file mode 100644 index bbfde2a7a915..000000000000 --- a/audio/kmpg/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ ---- kmpg.h.orig Thu May 14 19:20:37 1998 -+++ kmpg.h Thu May 14 19:20:55 1998 -@@ -24,10 +24,10 @@ - #include - #include - #include --#if defined(_FreeBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) - #else - #include --#include -+#include - #endif - #include - #include diff --git a/audio/kmpg/files/patch-ah b/audio/kmpg/files/patch-ah deleted file mode 100644 index 2a9fce07f480..000000000000 --- a/audio/kmpg/files/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ ---- playlist.h.orig Thu May 14 19:22:14 1998 -+++ playlist.h Thu May 14 19:22:24 1998 -@@ -10,10 +10,10 @@ - #include - #include - #include --#if defined(_FreeBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) - #else - #include --#include -+#include - #endif - #include - #include diff --git a/audio/kmpg/pkg-descr b/audio/kmpg/pkg-descr index c38149f3b224..237451ede86b 100644 --- a/audio/kmpg/pkg-descr +++ b/audio/kmpg/pkg-descr @@ -1,15 +1,8 @@ -Kmpg is an MPEG audio player for the KDE project. The player uses mpg123 by -Michael Hipp as a decoding engine (note: do not contact him about bugs/ -features in kmpg, rather contact Martin Muller). +Kmpg is an MPEG audio player for the KDE project. The player uses +splay by Woo-jae Jung as a decoding engine. Kmpg has the following +advanced features: -Kmpg has the following advanced features: -* Supports MPEG 1.0/2.0, layers 1,2 and 3. -* Simple to use interface. -* Drag and drop support using the KDE dnd standard. -* Support for multiple platforms: Linux, FreeBSD, Solaris 2.x, SunOS 4.x - (tested 4.1.4), HP/UX 7xx, SGI IRIX, DEC Unix (tested 3.2 and 4.0), OSF/1, - DEC Ultrix (tested 4.4) and IBM AIX (tested 4.1). -* Playlist editor. -* Advanced configuration dialog allowing the user to tune the behaviour of - the decoder. -* All configuration changes can be applied while playing a stream. +* Supports MPEG 1.0/2.0, layers 1,2 and 3 +* Simple to use interface +* Drag and drop support using the KDE dnd standard +* Playlist editor diff --git a/audio/kmpg/pkg-plist b/audio/kmpg/pkg-plist index a5e873fa8f58..5b0df7b92129 100644 --- a/audio/kmpg/pkg-plist +++ b/audio/kmpg/pkg-plist @@ -1,4 +1,14 @@ bin/kmpg +bin/kmpgMixer +bin/splay-yaf +share/applnk/Multimedia/kmpg.kdelnk +share/applnk/Multimedia/kmpgMixer.kdelnk +share/apps/kmpg/pics/kmpg_next.xpm +share/apps/kmpg/pics/kmpg_pause_off.xpm +share/apps/kmpg/pics/kmpg_play_off.xpm +share/apps/kmpg/pics/kmpg_prev.xpm +share/apps/kmpg/pics/kmpg_stop_off.xpm +share/doc/HTML/en/kmpg/index.html share/doc/HTML/en/kmpg/interface.gif share/doc/HTML/en/kmpg/kmpg-1.html share/doc/HTML/en/kmpg/kmpg-2.html @@ -6,49 +16,19 @@ share/doc/HTML/en/kmpg/kmpg-3.html share/doc/HTML/en/kmpg/kmpg-4.html share/doc/HTML/en/kmpg/kmpg-5.html share/doc/HTML/en/kmpg/kmpg-6.html -share/doc/HTML/en/kmpg/kmpg.html +share/doc/HTML/en/kmpg/kmpg-7.html +share/doc/HTML/en/kmpg/kmpg.gif share/doc/HTML/en/kmpg/playlist.gif share/doc/HTML/en/kmpg/prefs-1.gif share/doc/HTML/en/kmpg/prefs-2.gif share/doc/HTML/en/kmpg/prefs-3.gif -share/apps/kmpg/pics/digit_0.xpm -share/apps/kmpg/pics/digit_1.xpm -share/apps/kmpg/pics/digit_2.xpm -share/apps/kmpg/pics/digit_3.xpm -share/apps/kmpg/pics/digit_4.xpm -share/apps/kmpg/pics/digit_5.xpm -share/apps/kmpg/pics/digit_6.xpm -share/apps/kmpg/pics/digit_7.xpm -share/apps/kmpg/pics/digit_8.xpm -share/apps/kmpg/pics/digit_9.xpm -share/apps/kmpg/pics/digit_blank.xpm -share/apps/kmpg/pics/digit_pause.xpm -share/apps/kmpg/pics/digit_play.xpm -share/apps/kmpg/pics/down.xpm -share/apps/kmpg/pics/ff.xpm -share/apps/kmpg/pics/next.xpm -share/apps/kmpg/pics/next_disabled.xpm -share/apps/kmpg/pics/panel.xpm -share/apps/kmpg/pics/pause_off.xpm -share/apps/kmpg/pics/pause_on.xpm -share/apps/kmpg/pics/play_off.xpm -share/apps/kmpg/pics/play_on.xpm -share/apps/kmpg/pics/prev.xpm -share/apps/kmpg/pics/prev_disabled.xpm -share/apps/kmpg/pics/rew.xpm -share/apps/kmpg/pics/stop_off.xpm -share/apps/kmpg/pics/stop_on.xpm -share/apps/kmpg/pics/up.xpm -share/icons/mini/kmpg.xpm share/icons/kmpg.xpm -share/icons/mpeg_layer1.xpm -share/icons/mpeg_layer2.xpm -share/icons/mpeg_layer3.xpm -share/mimelnk/audio/x-mp3.kdelnk +share/icons/kmpgMixer.xpm +share/icons/mini/kmpg.xpm +share/icons/mini/kmpgMixer.xpm share/mimelnk/audio/x-mp1.kdelnk share/mimelnk/audio/x-mp2.kdelnk -share/mimelnk/audio/x-playlist.kdelnk -share/applnk/Multimedia/kmpg.kdelnk -@dirrm share/doc/HTML/en/kmpg -@dirrm share/apps/kmpg/pics +share/mimelnk/audio/x-mp3.kdelnk @dirrm share/apps/kmpg +@dirrm share/apps/kmpg/pics +@dirrm share/doc/HTML/en/kmpg -- cgit