Index: head/audio/gkrellmms/Makefile =================================================================== --- head/audio/gkrellmms/Makefile (revision 37968) +++ head/audio/gkrellmms/Makefile (revision 37969) @@ -1,24 +1,24 @@ # New ports collection makefile for: gkrellmms # Date Created: Jun 22 2000 # Whom: Hajimu UMEMOTO # # $FreeBSD$ # PORTNAME= gkrellmms -PORTVERSION= 0.5.4 +PORTVERSION= 0.5.5 CATEGORIES= audio MASTER_SITES= http://gkrellm.luon.net/files/ MAINTAINER= ume@FreeBSD.org LIB_DEPENDS= xmms.1:${PORTSDIR}/audio/xmms BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes USE_IMLIB= yes .include Property changes on: head/audio/gkrellmms/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/audio/gkrellmms/distinfo =================================================================== --- head/audio/gkrellmms/distinfo (revision 37968) +++ head/audio/gkrellmms/distinfo (revision 37969) @@ -1 +1 @@ -MD5 (gkrellmms-0.5.4.tar.gz) = a2cbe4fc0d5cfc667b35b44e8fd6d927 +MD5 (gkrellmms-0.5.5.tar.gz) = 51dcb7e48873ce56632e0f2148360178 Property changes on: head/audio/gkrellmms/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/audio/gkrellmms/files/patch-aa =================================================================== --- head/audio/gkrellmms/files/patch-aa (revision 37968) +++ head/audio/gkrellmms/files/patch-aa (revision 37969) @@ -1,40 +1,42 @@ Index: Makefile diff -u Makefile.orig Makefile ---- Makefile.orig Sun Jul 2 01:45:19 2000 -+++ Makefile Fri Sep 15 03:30:01 2000 -@@ -3,27 +3,27 @@ +--- Makefile.orig Sun Jan 21 05:28:38 2001 ++++ Makefile Mon Feb 5 19:01:26 2001 +@@ -3,29 +3,29 @@ # You may want to rename the binary-file. BIN_FILENAME = gkrellmms -GTK_INCLUDE = `gtk-config --cflags` -GTK_LIB = `gtk-config --libs` +GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread` +GTK_LIB = `$(GTK_CONFIG) --libs gthread` IMLIB_INCLUDE = `imlib-config --cflags-gdk` IMLIB_LIB = `imlib-config --libs-gdk` + XMMS_INCLUDE = `xmms-config --cflags` + XMMS_LIB = `xmms-config --libs` --FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) -+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) - LIBS = $(GTK_LIB) $(IMLIB_LIB) --LFLAGS = -shared -lpthread -lxmms +-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE) ++CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE) + LIBS = $(GTK_LIB) $(IMLIB_LIB) $(XMMS_LIB) +-LFLAGS = -shared -lpthread - -CC = gcc $(CFLAGS) $(FLAGS) -+LFLAGS = -shared -lxmms ++LFLAGS = -shared OBJS = gkrellmms.o options.o playlist.o +all: $(BIN_FILENAME).so + $(BIN_FILENAME).so: $(OBJS) - $(CC) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS) + $(CC) $(CFLAGS) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS) clean: rm -f *.o core *.so* *.bak *~ install: - install -c -s -m 755 $(BIN_FILENAME).so /usr/share/gkrellm/plugins + install -c -s -m 755 $(BIN_FILENAME).so $(PREFIX)/libexec/gkrellm/plugins gkrellmms.c.o: gkrellmms.c options.c.o: options.c Property changes on: head/audio/gkrellmms/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/audio/gkrellmms2/Makefile =================================================================== --- head/audio/gkrellmms2/Makefile (revision 37968) +++ head/audio/gkrellmms2/Makefile (revision 37969) @@ -1,24 +1,24 @@ # New ports collection makefile for: gkrellmms # Date Created: Jun 22 2000 # Whom: Hajimu UMEMOTO # # $FreeBSD$ # PORTNAME= gkrellmms -PORTVERSION= 0.5.4 +PORTVERSION= 0.5.5 CATEGORIES= audio MASTER_SITES= http://gkrellm.luon.net/files/ MAINTAINER= ume@FreeBSD.org LIB_DEPENDS= xmms.1:${PORTSDIR}/audio/xmms BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes USE_IMLIB= yes .include Property changes on: head/audio/gkrellmms2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/audio/gkrellmms2/distinfo =================================================================== --- head/audio/gkrellmms2/distinfo (revision 37968) +++ head/audio/gkrellmms2/distinfo (revision 37969) @@ -1 +1 @@ -MD5 (gkrellmms-0.5.4.tar.gz) = a2cbe4fc0d5cfc667b35b44e8fd6d927 +MD5 (gkrellmms-0.5.5.tar.gz) = 51dcb7e48873ce56632e0f2148360178 Property changes on: head/audio/gkrellmms2/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/audio/gkrellmms2/files/patch-aa =================================================================== --- head/audio/gkrellmms2/files/patch-aa (revision 37968) +++ head/audio/gkrellmms2/files/patch-aa (revision 37969) @@ -1,40 +1,42 @@ Index: Makefile diff -u Makefile.orig Makefile ---- Makefile.orig Sun Jul 2 01:45:19 2000 -+++ Makefile Fri Sep 15 03:30:01 2000 -@@ -3,27 +3,27 @@ +--- Makefile.orig Sun Jan 21 05:28:38 2001 ++++ Makefile Mon Feb 5 19:01:26 2001 +@@ -3,29 +3,29 @@ # You may want to rename the binary-file. BIN_FILENAME = gkrellmms -GTK_INCLUDE = `gtk-config --cflags` -GTK_LIB = `gtk-config --libs` +GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread` +GTK_LIB = `$(GTK_CONFIG) --libs gthread` IMLIB_INCLUDE = `imlib-config --cflags-gdk` IMLIB_LIB = `imlib-config --libs-gdk` + XMMS_INCLUDE = `xmms-config --cflags` + XMMS_LIB = `xmms-config --libs` --FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) -+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) - LIBS = $(GTK_LIB) $(IMLIB_LIB) --LFLAGS = -shared -lpthread -lxmms +-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE) ++CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE) + LIBS = $(GTK_LIB) $(IMLIB_LIB) $(XMMS_LIB) +-LFLAGS = -shared -lpthread - -CC = gcc $(CFLAGS) $(FLAGS) -+LFLAGS = -shared -lxmms ++LFLAGS = -shared OBJS = gkrellmms.o options.o playlist.o +all: $(BIN_FILENAME).so + $(BIN_FILENAME).so: $(OBJS) - $(CC) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS) + $(CC) $(CFLAGS) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS) clean: rm -f *.o core *.so* *.bak *~ install: - install -c -s -m 755 $(BIN_FILENAME).so /usr/share/gkrellm/plugins + install -c -s -m 755 $(BIN_FILENAME).so $(PREFIX)/libexec/gkrellm/plugins gkrellmms.c.o: gkrellmms.c options.c.o: options.c Property changes on: head/audio/gkrellmms2/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property