From owner-freebsd-ports Tue Jan 19 14:00:02 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id OAA13190 for freebsd-ports-outgoing; Tue, 19 Jan 1999 14:00:02 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id OAA13118 for ; Tue, 19 Jan 1999 14:00:00 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id OAA13981; Tue, 19 Jan 1999 14:00:01 -0800 (PST) Received: from mail6.svr.pol.co.uk (mail6.svr.pol.co.uk [195.92.193.212]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id NAA12846 for ; Tue, 19 Jan 1999 13:57:25 -0800 (PST) (envelope-from tom@eborcom.com) Received: from modem-113.amlodipine.dialup.pol.co.uk ([62.136.50.241]) by mail6.svr.pol.co.uk with esmtp (Exim 2.10 #1) id 102j99-0003hX-00 for FreeBSD-gnats-submit@freebsd.org; Tue, 19 Jan 1999 21:57:16 +0000 Received: (qmail 8746 invoked by uid 5000); 19 Jan 1999 19:31:39 -0000 Message-Id: <19990119193139.8745.qmail@eborcom.com> Date: 19 Jan 1999 19:31:39 -0000 From: Tom Hukins To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/9572: Update port: kmpg Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9572 >Category: ports >Synopsis: Update to kmpg (KDE MPEG audio player) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jan 19 14:00:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Tom Hukins >Release: FreeBSD 2.2.8-STABLE i386 >Organization: eBORcOM >Environment: >Description: The following patch upgrades kmpg from version 0.3.3 to 0.4.0. I have also changed the maintainer to myself, with the agreement of the previous maintainer. No files have been added. The "patches" directory and all its contents "patch-a[a-h]" have been removed. >How-To-Repeat: >Fix: diff -ruN kmpg.old/Makefile kmpg/Makefile --- kmpg.old/Makefile Sat Nov 21 12:55:16 1998 +++ kmpg/Makefile Tue Jan 19 18:53:51 1999 @@ -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.8 1998/11/21 07:27:30 steve Exp $ +# $Id$ # -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 @@ 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 -ruN kmpg.old/files/md5 kmpg/files/md5 --- kmpg.old/files/md5 Fri Jun 12 09:05:59 1998 +++ kmpg/files/md5 Fri Jan 15 14:20:28 1999 @@ -1 +1 @@ -MD5 (kmpg-0.3.3.tgz) = dbfd6987d506331f410fd5df62a6b3f5 +MD5 (kmpg-0.4.0.tar.gz) = c92b6b125fcdeffc5c988fc43b026813 diff -ruN kmpg.old/patches/patch-aa kmpg/patches/patch-aa --- kmpg.old/patches/patch-aa Fri Jun 12 09:06:00 1998 +++ kmpg/patches/patch-aa Thu Jan 1 01:00:00 1970 @@ -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 -ruN kmpg.old/patches/patch-ab kmpg/patches/patch-ab --- kmpg.old/patches/patch-ab Fri Jun 12 09:06:00 1998 +++ kmpg/patches/patch-ab Thu Jan 1 01:00:00 1970 @@ -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 -ruN kmpg.old/patches/patch-ac kmpg/patches/patch-ac --- kmpg.old/patches/patch-ac Fri Jun 12 09:06:01 1998 +++ kmpg/patches/patch-ac Thu Jan 1 01:00:00 1970 @@ -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 -ruN kmpg.old/patches/patch-af kmpg/patches/patch-af --- kmpg.old/patches/patch-af Fri Jun 12 09:06:02 1998 +++ kmpg/patches/patch-af Thu Jan 1 01:00:00 1970 @@ -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 -ruN kmpg.old/patches/patch-ag kmpg/patches/patch-ag --- kmpg.old/patches/patch-ag Fri Jun 12 09:06:02 1998 +++ kmpg/patches/patch-ag Thu Jan 1 01:00:00 1970 @@ -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 -ruN kmpg.old/patches/patch-ah kmpg/patches/patch-ah --- kmpg.old/patches/patch-ah Fri Jun 12 09:06:02 1998 +++ kmpg/patches/patch-ah Thu Jan 1 01:00:00 1970 @@ -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 -ruN kmpg.old/pkg/DESCR kmpg/pkg/DESCR --- kmpg.old/pkg/DESCR Fri Jun 12 09:06:00 1998 +++ kmpg/pkg/DESCR Fri Jan 15 17:20:13 1999 @@ -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 -ruN kmpg.old/pkg/PLIST kmpg/pkg/PLIST --- kmpg.old/pkg/PLIST Mon Jun 15 11:15:31 1998 +++ kmpg/pkg/PLIST Fri Jan 15 17:16:02 1999 @@ -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-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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message