Attachment 50208 Details for Bug 76540 – file.diff

[patch] file.diff

file.diff (text/plain), 3.66 KB, created by tkato432 on 2005-01-21 18:10:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-01-21 18:10:19 UTC

Size: 3.66 KB

patch

obsolete

>diff -urN /usr/ports/audio/gkrellmss2/Makefile audio/gkrellmss2/Makefile
>--- /usr/ports/audio/gkrellmss2/Makefile	Wed Jan 19 02:21:25 2005
>+++ audio/gkrellmss2/Makefile	Fri Jan 21 00:53:09 2005
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	gkrellmss
>-PORTVERSION=	2.3
>-PORTREVISION=	3
>+PORTVERSION=	2.6
> CATEGORIES=	audio
> MASTER_SITES=	http://web.wt.net/~billw/gkrellmss/
> 
>@@ -15,31 +14,40 @@
> COMMENT=	A plugin for GKrellM with a VU meter showing left/right channel audio
> 
> BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
>-LIB_DEPENDS=	gdk_pixbuf_xlib.2:${PORTSDIR}/graphics/gdk-pixbuf
>-LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
>+LIB_DEPENDS=	fftw3.3:${PORTSDIR}/math/fftw3
> RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
> 
> LATEST_LINK=	gkrellmss2
>+
> USE_X_PREFIX=	yes
>+USE_GNOME=	esound gtk20
>+USE_GCC=	3.4
>+USE_REINPLACE=	yes
> USE_GMAKE=	yes
>-USE_GNOMENG=	yes
>-USE_GNOME=	esound imlib
>-USE_XPM=	yes
>+MAKE_ENV=	LOCALEDIR="${PREFIX}/share/locale"
> 
> PORTDOCS=	Changelog README Themes
>-PLIST_FILES=	libexec/gkrellm2/plugins/gkrellmss.so
>-
>-MAKE_ENV+=	PLUGIN_INSTALLDIR=${PREFIX}/libexec/gkrellm2/plugins \
>-		INSTALLDIR=${PREFIX}/libexec/gkrellm2/plugins \
>-		LOCALEDIR=${PREFIX}/share/locale \
>-		FFTW_LIB_DIR=-L${LOCALBASE}/lib \
>-		enable_nls=1
>+PLIST_FILES=	libexec/gkrellm2/plugins/gkrellmss.so \
>+		share/locale/ru/LC_MESSAGES/gkrellm-gkrellmss.mo
> 
>-post-install:
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|= -O2|=|g ; \
>+		 s|= gcc|+=|g' ${WRKSRC}/src/Makefile
>+
>+do-configure:
>+	@${ECHO_CMD} "" > ${WRKSRC}/src/configure.h
>+	@${ECHO_CMD} "#define HAVE_ESOUND 1" >> ${WRKSRC}/src/configure.h
>+	@${ECHO_CMD} "#define HAVE_FFTW3 1" >> ${WRKSRC}/src/configure.h
>+
>+do-install:
>+	${INSTALL_DATA} ${WRKSRC}/src/gkrellmss.so \
>+		${PREFIX}/libexec/gkrellm2/plugins/gkrellmss.so
>+	${INSTALL_DATA} ${WRKSRC}/po/ru.mo \
>+		${PREFIX}/share/locale/ru/LC_MESSAGES/gkrellm-gkrellmss.mo
> .ifndef(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
> .for doc in ${PORTDOCS}
>-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
> .endfor
> .endif
> 
>diff -urN /usr/ports/audio/gkrellmss2/distinfo audio/gkrellmss2/distinfo
>--- /usr/ports/audio/gkrellmss2/distinfo	Wed Mar 31 18:04:02 2004
>+++ audio/gkrellmss2/distinfo	Fri Jan 21 00:21:15 2005
>@@ -1,2 +1,2 @@
>-MD5 (gkrellmss-2.3.tar.gz) = 457a85c28f049ef0787c842b5494ece0
>-SIZE (gkrellmss-2.3.tar.gz) = 24398
>+MD5 (gkrellmss-2.6.tar.gz) = 67284260336bc5c4f313bd69c6c092f6
>+SIZE (gkrellmss-2.6.tar.gz) = 32082
>diff -urN /usr/ports/audio/gkrellmss2/files/patch-src::Makefile audio/gkrellmss2/files/patch-src::Makefile
>--- /usr/ports/audio/gkrellmss2/files/patch-src::Makefile	Mon Sep  1 11:57:08 2003
>+++ audio/gkrellmss2/files/patch-src::Makefile	Thu Jan  1 09:00:00 1970
>@@ -1,39 +0,0 @@
>---- src/Makefile.orig	Sat Oct 26 20:48:59 2002
>-+++ src/Makefile	Tue Feb  4 13:17:23 2003
>-@@ -10,15 +10,15 @@
>- SD_INCLUDE = 
>- SD_LIB = -lasound
>- else
>--SD_INCLUDE = `esd-config --cflags`
>--SD_LIB = `esd-config --libs`
>-+SD_INCLUDE = `${ESD_CONFIG} --cflags`
>-+SD_LIB = `${ESD_CONFIG} --libs`
>- endif
>- 
>- FFTW_LIB_DIR ?=
>- 
>- FFTW_LIB = $(FFTW_LIB_DIR) -lrfftw -lfftw
>- 
>--FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(SD_INCLUDE)
>-+FLAGS = -Wall -fPIC $(GTK_INCLUDE) $(SD_INCLUDE)
>- LIBS = $(GTK_LIB) $(SD_LIB) $(FFTW_LIB) -lm
>- 
>- ifeq ($(OS_NAME),Darwin)
>-@@ -42,7 +42,7 @@
>- 	FLAGS += -DGKRELLM_ALSA5
>- endif
>- 
>--CC = gcc $(FLAGS) $(CFLAGS)
>-+CC += $(FLAGS) $(CFLAGS)
>- 
>- OBJS = gkrellmss.o oscope.o spectrum.o sdlib.o
>- 
>-@@ -56,7 +56,7 @@
>- 
>- install: 
>- 	$(INSTALL) -d -m 755 $(INSTALLDIR)
>--	$(INSTALL) -c $(STRIP) -m 755 gkrellmss.so $(INSTALLDIR)
>-+	$(INSTALL) gkrellmss.so $(INSTALLDIR)
>- 
>- gkrellmss.o: gkrellmss.c gkrellmss.h
>- oscope.o: oscope.c gkrellmss.h

Actions: View | Diff

Attachments on bug 76540: 50208