Index: head/misc/gkrellshoot/Makefile =================================================================== --- head/misc/gkrellshoot/Makefile (revision 68568) +++ head/misc/gkrellshoot/Makefile (revision 68569) @@ -1,24 +1,25 @@ # New ports collection makefile for: gkrellshoot # Date Created: 7 Mar 2002 # Whom: Andrew Stuart # # $FreeBSD$ # PORTNAME= gkrellshoot -PORTVERSION= 0.2 +PORTVERSION= 0.3.2 CATEGORIES= misc -MASTER_SITES= http://www.geocities.com/m_muthukumar/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= elitetek@tekrealm.net BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm \ import:${PORTSDIR}/graphics/ImageMagick WRKSRC= ${WRKDIR}/gkrellShoot-${PORTVERSION} USE_X_PREFIX= yes USE_GNOMENG= yes USE_GNOME= imlib .include Property changes on: head/misc/gkrellshoot/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/misc/gkrellshoot/distinfo =================================================================== --- head/misc/gkrellshoot/distinfo (revision 68568) +++ head/misc/gkrellshoot/distinfo (revision 68569) @@ -1 +1 @@ -MD5 (gkrellshoot-0.2.tar.gz) = 17b132289647044e413255788c13642d +MD5 (gkrellshoot-0.3.2.tar.gz) = a1c37ccfe4b1d86d8f363720ef9a75f4 Property changes on: head/misc/gkrellshoot/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/misc/gkrellshoot/files/patch-Makefile =================================================================== --- head/misc/gkrellshoot/files/patch-Makefile (revision 68568) +++ head/misc/gkrellshoot/files/patch-Makefile (revision 68569) @@ -1,55 +1,61 @@ ---- Makefile.orig Thu Mar 7 00:44:28 2002 -+++ Makefile Thu Mar 7 00:52:39 2002 +--- Makefile.orig Mon Oct 21 17:31:33 2002 ++++ Makefile Mon Oct 21 17:37:34 2002 @@ -1,20 +1,20 @@ -GTK_INCLUDE = `gtk-config --cflags` -GTK_LIB = `gtk-config --libs` +GTK_INCLUDE = `$(GTK_CONFIG) --cflags` +GTK_LIB = `$(GTK_CONFIG) --libs` -IMLIB_INCLUDE = `imlib-config --cflags-gdk` -IMLIB_LIB = `imlib-config --libs-gdk` +IMLIB_INCLUDE = `${IMLIB_CONFIG} --cflags-gdk` +IMLIB_LIB = `${IMLIB_CONFIG} --libs-gdk` -FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) -+CFLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) ++CFLAGS+= -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) LIBS = $(GTK_LIB) $(IMLIB_LIB) LFLAGS = -shared -CC = gcc $(CFLAGS) $(FLAGS) -+CC ?= gcc $(CFLAGS) $(FLAGS) ++CC ?= gcc $(CFLAGS) OBJS = gkrellshoot.o gkrellshoot.so: $(OBJS) - $(CC) $(OBJS) -o gkrellshoot.so $(LFLAGS) $(LIBS) -lpthread + $(CC) $(OBJS) -o gkrellshoot.so $(LFLAGS) $(LIBS) clean: rm -f *.o core *.so* *.bak *~ -@@ -22,21 +22,9 @@ +@@ -22,17 +22,7 @@ gkrellshoot.o: gkrellshoot.c install: - if [ -d /usr/lib/gkrellm/plugins/ ] ; then \ - install -c -s -m 644 gkrellshoot.so /usr/lib/gkrellm/plugins/ ; \ - elif [ -d /usr/share/gkrellm/plugins/ ] ; then \ - install -c -s -m 644 gkrellshoot.so /usr/share/gkrellm/plugins/ ; \ - elif [ -d /usr/local/lib/gkrellm/plugins/ ] ; then \ - install -c -s -m 644 gkrellshoot.so /usr/local/lib/gkrellm/plugins/ ; \ - elif [ -d /usr/lib/gkrellm/plugins/ ] ; then \ -- install -c -s -m 644 gkrellshoot.so /usr/lib/gkrellm/plugins/ ; \ +- install -c -s -m 644 gkrellshoot.so /usr/lib/gkrellm/plugins/ ; \ - else \ - install -D -c -s -m 644 gkrellshoot.so /usr/lib/gkrellm/plugins/gkrellshoot.so ; \ - fi + install -c -s gkrellshoot.so ${PREFIX}/libexec/gkrellm/plugins + userinstall: + if [ -d $(HOME)/.gkrellm/plugins/ ] ; then \ + install -C -s -m 644 gkrellshoot.so $(HOME)/.gkrellm/plugins/ ; \ +@@ -41,9 +31,6 @@ + fi uninstall: - rm -f /usr/lib/gkrellm/plugins/gkrellshoot.so - rm -f /usr/share/gkrellm/plugins/gkrellshoot.so - rm -f /usr/local/lib/gkrellm/plugins/gkrellshoot.so - rm -f /usr/lib/gkrellm/plugins/gkrellshoot.so +- rm -f $(HOME)/.gkrellm/plugins/gkrellshoot.so + rm -f $(PLUGIN_DIR)/gkrellshoot.so -+all: gkrellshoot.so ++all: gkrellshoot.so Property changes on: head/misc/gkrellshoot/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property