Update to 2.1.12a.

3 files changed, 5 insertions, 58 deletions

diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 8ea0e64cac39..35addd7a3049 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	2.1.12
+PORTVERSION=	2.1.12a
 #PORTREVISION=	0
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
@@ -16,6 +16,8 @@ MASTER_SITE_SUBDIR=	ume
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	A GTK based system monitor
 
+WRKSRC=		${WRKDIR}/${DISTNAME:C/[a-z]$//}
+
 .if defined(GKRELLM_SERVER_ONLY)
 BUILD_WRKSRC=	${WRKSRC}/server
 INSTALL_WRKSRC=	${WRKSRC}/server
@@ -47,7 +49,7 @@ ALL_TARGET=	freebsd2
 .else
 ALL_TARGET=	freebsd
 .endif
-INSTALL_TARGET=	install_netbsd
+INSTALL_TARGET=	install_freebsd
 
 MAKE_ENV+=	INSTALLROOT=${X11BASE} SINSTALLDIR=${PREFIX}/sbin \
 		PKGCONFIGDIR=${X11BASE}/libdata/pkgconfig \
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index 5f4e2827af46..3b04a488966e 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-2.1.12.tar.bz2) = 8f4be50970c525d68451bb998a7845d9
+MD5 (gkrellm-2.1.12a.tar.bz2) = cb00609d4ee7e26594bfc54195e5210c
diff --git a/sysutils/gkrellm2/files/patch-Makefile b/sysutils/gkrellm2/files/patch-Makefile
deleted file mode 100644
index 4f631bdbeb67..000000000000
--- a/sysutils/gkrellm2/files/patch-Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: Makefile
-diff -u Makefile.orig Makefile
---- Makefile.orig	Tue Jun  3 12:48:29 2003
-+++ Makefile	Tue Jun  3 22:58:59 2003
-@@ -75,18 +75,18 @@
- #export GTOP_INCLUDE GTOP_LIBS GTOP_LIBS_D
- 
- VERSION = 2.1.12
--INSTALLROOT = /usr/local
-+INSTALLROOT ?= /usr/local
- INSTALLDIR = $(INSTALLROOT)/bin
--SINSTALLDIR = $(INSTALLDIR)
--MANDIR = $(INSTALLROOT)/share/man/man1
--SMANDIR = $(MANDIR)
-+SINSTALLDIR ?= $(INSTALLDIR)
-+MANDIR ?= $(INSTALLROOT)/share/man/man1
-+SMANDIR ?= $(MANDIR)
- MANMODE = 644
- MANDIRMODE = 755
- INCLUDEDIR = $(INSTALLROOT)/include
- INCLUDEMODE = 644
- INCLUDEDIRMODE = 755
- INSTALL ?= install
--PKGCONFIGDIR = $(INSTALLROOT)/lib/pkgconfig
-+PKGCONFIGDIR ?= $(INSTALLROOT)/lib/pkgconfig
- LOCALEDIR ?= $(INSTALLROOT)/share/locale
- 
- OS_NAME=$(shell uname -s)
-@@ -132,6 +132,9 @@
- 	(cd src && ${MAKE} install_netbsd)
- 	(cd server && ${MAKE} install_netbsd)
- 
-+	$(INSTALL) -d $(PKGCONFIGDIR)
-+	$(INSTALL) -m $(INCLUDEMODE) -c gkrellm.pc $(PKGCONFIGDIR)
-+
- install_openbsd:
- 	(cd po && ${MAKE} install)
- 	(cd src && ${MAKE} install_openbsd)
-@@ -147,14 +150,14 @@
- 	(cd src && ${MAKE} clean)
- 	(cd server && ${MAKE} clean)
- 
--freebsd2:
-+freebsd2:	gkrellm.pc
- 	(cd po && ${MAKE} all)
- 	(cd src && ${MAKE} \
- 		EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellm )
- 	(cd server && ${MAKE} \
- 		EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellmd )
- 
--freebsd3 freebsd4 freebsd5 freebsd:
-+freebsd3 freebsd4 freebsd5 freebsd:	gkrellm.pc
- 	(cd po && ${MAKE} all)
- 	(cd src && ${MAKE} \
- 		EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellm )