Attachment 36404 Details for Bug 58379 – file.diff

[patch] file.diff

file.diff (text/plain), 6.15 KB, created by tkato on 2003-10-22 15:50:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-10-22 15:50:17 UTC

Size: 6.15 KB

patch

obsolete

>diff -urN /usr/ports/audio/lplayer/Makefile audio/lplayer/Makefile
>--- /usr/ports/audio/lplayer/Makefile	Wed Jul  2 00:24:20 2003
>+++ audio/lplayer/Makefile	Wed Oct 22 01:40:22 2003
>@@ -8,11 +8,11 @@
> #
> 
> PORTNAME=	lplayer
>-PORTVERSION=	0.98.2
>+PORTVERSION=	0.99.0
> CATEGORIES=	audio
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>-DISTNAME=	${PORTNAME}_${PORTVERSION}_src
>+DISTNAME=	${PORTNAME}-${PORTVERSION}_src
> EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -20,43 +20,20 @@
> 
> BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> USE_QT_VER=	3
> USE_REINPLACE=	yes
> USE_GMAKE=	yes
>-HAS_CONFIGURE=	yes
>-MAKE_ENV+=	QTDIR=${QT_PREFIX}
>-CONFIGURE_ENV=	${MAKE_ENV}
>-
>-do-configure:
>-	cd ${WRKSRC}; \
>-	XMMSLIBS=$$(xmms-config --libs); \
>-	XMMSINCS=$$(xmms-config --cflags | sed 's|-I||g'); \
>-	${REINPLACE_CMD} -e "s|@X11BASE@|${X11BASE}|g" \
>-		-e "s|@LOCALBASE@|${LOCALBASE}|g" \
>-		-e "s|@XMMSLIBS@|$$XMMSLIBS|" \
>-		-e "s|@XMMSINCS@|$$XMMSINCS|" lp.pro; \
>-	${SETENV} ${CONFIGURE_ENV} qmake -makefile -o Makefile -unix lp.pro
>-
>-.include <bsd.port.pre.mk>
>-
>-DOCS_SUBDIR=		${DOCSDIR:S|^${PREFIX}/||}
>-EXAMPLES_SUBDIR=	${EXAMPLESDIR:S|^${PREFIX}/||}
>-
>-BINDIR=			${PREFIX}/bin
>-BIN_SUBDIR=		${BINDIR:S|^${PREFIX}/||}
>-LIBDIR=			${PREFIX}/lib
>-LIB_SUBDIR=		${LIBDIR:S|^${PREFIX}/||}
>-PKGLIBDIR=		${LIBDIR}/${PORTNAME}
>-PKGLIB_SUBDIR=		${PKGLIBDIR:S|^${PREFIX}/||}
>-
>-do-install:
>-	${MKDIR} ${BINDIR} ${PKGLIBDIR}
>-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-bin ${PKGLIBDIR}
>-	${INSTALL_DATA} ${WRKSRC}/../gnu/lplayerdir/*.png ${PKGLIBDIR}
>-	${INSTALL_SCRIPT} ${FILESDIR}/lplayer ${BINDIR}
>+USE_LIBTOOL=	yes
>+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>+CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
>+CONFIGURE_ARGS=	--with-xmms-prefix=${X11BASE} --with-xinerama
>+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
>+		AUTOHEADER="${TRUE}"
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|-pedantic||g ; \
>+		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
> 
>-.include <bsd.port.post.mk>
>-
>-#EOF
>+.include <bsd.port.mk>
>diff -urN /usr/ports/audio/lplayer/distinfo audio/lplayer/distinfo
>--- /usr/ports/audio/lplayer/distinfo	Wed Jul  2 00:24:20 2003
>+++ audio/lplayer/distinfo	Wed Oct 22 01:11:37 2003
>@@ -1 +1 @@
>-MD5 (lplayer_0.98.2_src.tgz) = 95e74e891696f68fdf2cb5202bf159d8
>+MD5 (lplayer-0.99.0_src.tgz) = 5d627e8cd36fd8f809935d94e655636a
>diff -urN /usr/ports/audio/lplayer/files/lplayer audio/lplayer/files/lplayer
>--- /usr/ports/audio/lplayer/files/lplayer	Thu Jan  2 00:04:51 2003
>+++ audio/lplayer/files/lplayer	Thu Jan  1 09:00:00 1970
>@@ -1,41 +0,0 @@
>-#!/bin/sh
>-# -*-mode: shell-script-*-
>-#
>-# lplayer
>-#
>-# 2002-12-16 Alan Eldridge <alane@freebsd.org>
>-#
>-
>-run_lplayer() {
>-    ./lplayer-bin ${1:+"$@"} &
>-    exit 0
>-}
>-
>-INFOPID=0
>-XDIALOG=/usr/X11R6/bin/Xdialog
>-if test -x $XDIALOG; then
>-    $XDIALOG --title LongPlayer --backtitle "Please wait ..." \
>-	--no-buttons --infobox "Backing up DB ..." 15 50 5000 &
>-    INFOPID=$!
>-fi # test -x $XDIALOG ...
>-
>-DBFILE=$HOME/.lptable.lp2
>-PLISTS=$HOME/.lpplaylists.xml
>-SETTINGS=$HOME/.lpsettings.xml
>-SUFFIX=.save
>-LPLAYERDIR=/usr/local/lib/lplayer
>-
>-for i in $DBFILE $PLISTS $SETTINGS; do
>-    if test -f $i; then
>-	test -f $i$SUFFIX && cmp -s $i $i$SUFFIX && continue
>-	rm -f $i$SUFFIX 2>/dev/null; cp -pf $i $i$SUFFIX
>-    fi
>-done
>-
>-test $INFOPID -gt 0 && wait $INFOPID
>-
>-cd $LPLAYERDIR
>-run_lplayer ${1:+"$@"} &
>-
>-exit 0
>-#EOF
>diff -urN /usr/ports/audio/lplayer/files/patch-configure audio/lplayer/files/patch-configure
>--- /usr/ports/audio/lplayer/files/patch-configure	Thu Jan  1 09:00:00 1970
>+++ audio/lplayer/files/patch-configure	Wed Oct 22 01:14:57 2003
>@@ -0,0 +1,10 @@
>+--- configure.orig	Mon Sep 22 04:09:00 2003
>++++ configure	Wed Oct 22 01:14:43 2003
>+@@ -16408,6 +16408,7 @@
>+ 
>+ # This can be used to rebuild libtool when needed
>+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
>+ 
>+ # Always use our own libtool.
>+ LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
>diff -urN /usr/ports/audio/lplayer/files/patch-lp.pro audio/lplayer/files/patch-lp.pro
>--- /usr/ports/audio/lplayer/files/patch-lp.pro	Wed Jul  2 00:24:20 2003
>+++ audio/lplayer/files/patch-lp.pro	Thu Jan  1 09:00:00 1970
>@@ -1,14 +0,0 @@
>---- lp.pro.orig	Tue Jan 21 01:57:13 2003
>-+++ lp.pro	Sat Jun 14 20:08:02 2003
>-@@ -88,9 +88,8 @@
>- #Qt only
>- #==============================================================================
>- #works most of the time
>--TMAKE_LIBS      = -lxmms -L/sw/lib -lglib
>--INCLUDEPATH     = /usr/include/xmms /usr/lib/glib/include /usr/include/glib-1.2\
>--				/sw/include/xmms /sw/lib/glib/include /sw/include/glib-1.2 /sw/include/qt
>-+TMAKE_LIBS      = -L@X11BASE@/lib -L@LOCALBASE@/lib @XMMSLIBS@
>-+INCLUDEPATH     = @X11BASE@/include @LOCALBASE@/include @XMMSINCS@
>- 
>- #mac os x using fink
>- #TMAKE_LIBS      = -lxmms -L/sw/lib -lglib
>diff -urN /usr/ports/audio/lplayer/pkg-plist audio/lplayer/pkg-plist
>--- /usr/ports/audio/lplayer/pkg-plist	Thu Jan  2 00:04:51 2003
>+++ audio/lplayer/pkg-plist	Wed Oct 22 01:36:33 2003
>@@ -1,17 +1,21 @@
>-bin/lplayer
>-lib/lplayer/go.png
>-lib/lplayer/go32.png
>-lib/lplayer/lplayer-bin
>-lib/lplayer/lplayericon.png
>-lib/lplayer/lplayerlogo.png
>-lib/lplayer/lplayerlogo2.png
>-lib/lplayer/lplayerlogo3.png
>-lib/lplayer/next.png
>-lib/lplayer/play.png
>-lib/lplayer/previous.png
>-lib/lplayer/ratedown.png
>-lib/lplayer/ratedown32.png
>-lib/lplayer/rateup.png
>-lib/lplayer/rateup32.png
>-lib/lplayer/stop.png
>-@dirrm lib/lplayer
>+bin/longplayer
>+bin/lplayer-bin
>+share/lplayer/images/genre.png
>+share/lplayer/images/go.png
>+share/lplayer/images/go32.png
>+share/lplayer/images/lplayericon.png
>+share/lplayer/images/lplayerlogo.png
>+share/lplayer/images/lplayerlogo2.png
>+share/lplayer/images/lplayerlogo3.png
>+share/lplayer/images/next.png
>+share/lplayer/images/play.png
>+share/lplayer/images/playnow.png
>+share/lplayer/images/previous.png
>+share/lplayer/images/queue.png
>+share/lplayer/images/ratedown.png
>+share/lplayer/images/ratedown32.png
>+share/lplayer/images/rateup.png
>+share/lplayer/images/rateup32.png
>+share/lplayer/images/stop.png
>+@dirrm share/lplayer/images
>+@dirrm share/lplayer

Actions: View | Diff

Attachments on bug 58379: 36404