Update to 0.9.9.

8 files changed, 110 insertions, 12 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 0b38fe21a62c..8a0c7062d2f0 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	0.9.8
+PORTVERSION=	0.9.9
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		http://people.FreeBSD.org/~ume/gkrellm/
@@ -19,6 +19,7 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
+USE_GMAKE=	yes
 MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 INCLUDES=	gkrellm.h gkrellm_public_proto.h gkrellm_private_proto.h
@@ -45,17 +46,17 @@ BINMODE=	2111
 .endif
 
 post-patch:
-	@${MV} ${WRKSRC}/gkrellm.h ${WRKSRC}/gkrellm.h.orig
+	@${MV} ${WRKSRC}/src/gkrellm.h ${WRKSRC}/src/gkrellm.h.orig
 	@${SED} \
 	-e "s^/usr/share/gkrellm/themes^${PREFIX}/share/gkrellm/themes^" \
 	-e "s^/usr/share/gkrellm/plugins^${PREFIX}/libexec/gkrellm/plugins^" \
-		${WRKSRC}/gkrellm.h.orig > ${WRKSRC}/gkrellm.h
+		${WRKSRC}/src/gkrellm.h.orig > ${WRKSRC}/src/gkrellm.h
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gkrellm ${PREFIX}/bin/gkrellm
+	${INSTALL_PROGRAM} ${WRKSRC}/src/gkrellm ${PREFIX}/bin/gkrellm
 	@${MKDIR} ${PREFIX}/include/gkrellm
 .for file in ${INCLUDES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/include/gkrellm
+	${INSTALL_DATA} ${WRKSRC}/src/${file} ${PREFIX}/include/gkrellm
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/gkrellm
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 45be6175fd9d..bda8ec30cc3d 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-0.9.8.tar.gz) = 868cbc6fc3f2d46529e03720f78d73b8
+MD5 (gkrellm-0.9.9.tar.gz) = a2c5b6de850933b1763cec0fe77c8ba6
diff --git a/sysutils/gkrellm/files/patch-ad b/sysutils/gkrellm/files/patch-ad
new file mode 100644
index 000000000000..c287e04f4007
--- /dev/null
+++ b/sysutils/gkrellm/files/patch-ad
@@ -0,0 +1,27 @@
+Index: Makefile.top
+diff -u Makefile.top.orig Makefile.top
+--- Makefile.top.orig	Wed May 17 14:33:59 2000
++++ Makefile.top	Fri May 19 04:52:52 2000
+@@ -24,7 +24,7 @@
+ #
+ # Default
+ #--------
+-GTK_CONFIG = gtk-config
++#GTK_CONFIG = gtk-config
+ BINMODE = 755
+ 
+ # FreeBSD 2.X
+@@ -65,11 +65,11 @@
+ 	(cd src && ${MAKE} clean)
+ 
+ freebsd2:
+-	(cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
++	(cd src && ${MAKE} GTK_CONFIG=$(GTK_CONFIG) GTOP_LIBS= GTOP_INCLUDE= \
+ 		SYS_LIBS="-lkvm" gkrellm )
+ 
+ freebsd3 freebsd:
+-	(cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
++	(cd src && ${MAKE} GTK_CONFIG=$(GTK_CONFIG) GTOP_LIBS= GTOP_INCLUDE= \
+ 		SYS_LIBS="-lkvm -ldevstat" gkrellm )
+ 
+ gtop:
diff --git a/sysutils/gkrellm/files/patch-ae b/sysutils/gkrellm/files/patch-ae
new file mode 100644
index 000000000000..3bcc8e42cb6d
--- /dev/null
+++ b/sysutils/gkrellm/files/patch-ae
@@ -0,0 +1,21 @@
+Index: src/Makefile.src
+diff -u src/Makefile.src.orig src/Makefile.src
+--- src/Makefile.src.orig	Thu May 11 01:58:22 2000
++++ src/Makefile.src	Fri May 19 04:53:27 2000
+@@ -13,14 +13,9 @@
+ GTK_LIB = `$(GTK_CONFIG) --libs`
+ IMLIB_LIB = `imlib-config --libs-gdk`
+ 
+-FLAGS = -O2 -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
++CFLAGS += -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE) \
++	-DPREFIX=\"$(PREFIX)\"
+ LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS)
+-
+-ifeq ($(debug),1)
+-    FLAGS += -g
+-endif
+-
+-CC = gcc -Wall $(FLAGS)
+ 
+ GNOME_PREFIX = `gnome-config --prefix`
+ 
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 0b38fe21a62c..8a0c7062d2f0 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	0.9.8
+PORTVERSION=	0.9.9
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		http://people.FreeBSD.org/~ume/gkrellm/
@@ -19,6 +19,7 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
+USE_GMAKE=	yes
 MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 INCLUDES=	gkrellm.h gkrellm_public_proto.h gkrellm_private_proto.h
@@ -45,17 +46,17 @@ BINMODE=	2111
 .endif
 
 post-patch:
-	@${MV} ${WRKSRC}/gkrellm.h ${WRKSRC}/gkrellm.h.orig
+	@${MV} ${WRKSRC}/src/gkrellm.h ${WRKSRC}/src/gkrellm.h.orig
 	@${SED} \
 	-e "s^/usr/share/gkrellm/themes^${PREFIX}/share/gkrellm/themes^" \
 	-e "s^/usr/share/gkrellm/plugins^${PREFIX}/libexec/gkrellm/plugins^" \
-		${WRKSRC}/gkrellm.h.orig > ${WRKSRC}/gkrellm.h
+		${WRKSRC}/src/gkrellm.h.orig > ${WRKSRC}/src/gkrellm.h
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gkrellm ${PREFIX}/bin/gkrellm
+	${INSTALL_PROGRAM} ${WRKSRC}/src/gkrellm ${PREFIX}/bin/gkrellm
 	@${MKDIR} ${PREFIX}/include/gkrellm
 .for file in ${INCLUDES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/include/gkrellm
+	${INSTALL_DATA} ${WRKSRC}/src/${file} ${PREFIX}/include/gkrellm
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/gkrellm
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index 45be6175fd9d..bda8ec30cc3d 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-0.9.8.tar.gz) = 868cbc6fc3f2d46529e03720f78d73b8
+MD5 (gkrellm-0.9.9.tar.gz) = a2c5b6de850933b1763cec0fe77c8ba6
diff --git a/sysutils/gkrellm2/files/patch-ad b/sysutils/gkrellm2/files/patch-ad
new file mode 100644
index 000000000000..c287e04f4007
--- /dev/null
+++ b/sysutils/gkrellm2/files/patch-ad
@@ -0,0 +1,27 @@
+Index: Makefile.top
+diff -u Makefile.top.orig Makefile.top
+--- Makefile.top.orig	Wed May 17 14:33:59 2000
++++ Makefile.top	Fri May 19 04:52:52 2000
+@@ -24,7 +24,7 @@
+ #
+ # Default
+ #--------
+-GTK_CONFIG = gtk-config
++#GTK_CONFIG = gtk-config
+ BINMODE = 755
+ 
+ # FreeBSD 2.X
+@@ -65,11 +65,11 @@
+ 	(cd src && ${MAKE} clean)
+ 
+ freebsd2:
+-	(cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
++	(cd src && ${MAKE} GTK_CONFIG=$(GTK_CONFIG) GTOP_LIBS= GTOP_INCLUDE= \
+ 		SYS_LIBS="-lkvm" gkrellm )
+ 
+ freebsd3 freebsd:
+-	(cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
++	(cd src && ${MAKE} GTK_CONFIG=$(GTK_CONFIG) GTOP_LIBS= GTOP_INCLUDE= \
+ 		SYS_LIBS="-lkvm -ldevstat" gkrellm )
+ 
+ gtop:
diff --git a/sysutils/gkrellm2/files/patch-ae b/sysutils/gkrellm2/files/patch-ae
new file mode 100644
index 000000000000..3bcc8e42cb6d
--- /dev/null
+++ b/sysutils/gkrellm2/files/patch-ae
@@ -0,0 +1,21 @@
+Index: src/Makefile.src
+diff -u src/Makefile.src.orig src/Makefile.src
+--- src/Makefile.src.orig	Thu May 11 01:58:22 2000
++++ src/Makefile.src	Fri May 19 04:53:27 2000
+@@ -13,14 +13,9 @@
+ GTK_LIB = `$(GTK_CONFIG) --libs`
+ IMLIB_LIB = `imlib-config --libs-gdk`
+ 
+-FLAGS = -O2 -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
++CFLAGS += -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE) \
++	-DPREFIX=\"$(PREFIX)\"
+ LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS)
+-
+-ifeq ($(debug),1)
+-    FLAGS += -g
+-endif
+-
+-CC = gcc -Wall $(FLAGS)
+ 
+ GNOME_PREFIX = `gnome-config --prefix`
+