- Update to 1.0.7.

- Enable language catalog.
- Master site is being down.  So, temporary master site is added.

8 files changed, 182 insertions, 6 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 9420815f857e..6138fcfabd22 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
+		http://newweb.wt.net/~billw/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ume
 
@@ -19,11 +20,13 @@ USE_IMLIB=	yes
 USE_GMAKE=	yes
 
 INCLUDES=	gkrellm.h gkrellm_public_proto.h
+MAN1=		gkrellm.1
 DOCS=		COPYRIGHT README Themes.html
 
 # You should aware that GKrellM must be setuid root to obtain
 # temperatures.  If your motherboard doesn't support LM78/79 feature,
-# you may not want this build WITHOUT_SENSOR=yes
+# you may not want this.
+# WITHOUT_SENSOR=yes
 
 .include <bsd.port.pre.mk>
 
@@ -41,17 +44,24 @@ BINMODE=	4111
 BINMODE=	2111
 .endif
 
+MAKE_ENV+=	enable_nls=1 LOCALEDIR=${PREFIX}/share/locale
 CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${PREFIX}/share/gkrellm/themes\"' \
 		-DSYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm/plugins\"'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gkrellm ${PREFIX}/bin/gkrellm
+	@cd ${WRKSRC}/locale && \
+		${GMAKE} install enable_nls=1 LOCALEDIR=${PREFIX}/share/locale
+
 	@${MKDIR} ${PREFIX}/include/gkrellm
 .for file in ${INCLUDES}
 	${INSTALL_DATA} ${WRKSRC}/src/${file} ${PREFIX}/include/gkrellm
 .endfor
 	@${MKDIR} ${PREFIX}/libexec/gkrellm/plugins
 	@${MKDIR} ${PREFIX}/share/gkrellm/themes
+.for file in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${file} ${MANPREFIX}/man/man1/${file}
+.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/gkrellm
 .for file in ${DOCS}
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index c932a8bb0ab5..a081a620b732 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-1.0.6.tar.gz) = f937ba51f0d661f8994d5c2440db9065
+MD5 (gkrellm-1.0.7.tar.gz) = a72acffc0c110522cf4d39a01b53e7b7
diff --git a/sysutils/gkrellm/files/patch-af b/sysutils/gkrellm/files/patch-af
new file mode 100644
index 000000000000..efca767acaf6
--- /dev/null
+++ b/sysutils/gkrellm/files/patch-af
@@ -0,0 +1,74 @@
+Index: gkrellm.1
+diff -u gkrellm.1.orig gkrellm.1
+--- gkrellm.1.orig	Wed Mar 14 21:04:26 2001
++++ gkrellm.1	Thu Mar 15 00:12:14 2001
+@@ -1,4 +1,4 @@
+-.TH gkrellm 1 "Febuary 3, 2001" "Olympus GNU/Linux" "User's Manual"
++.TH gkrellm 1 "Febuary 3, 2001" "FreeBSD" "User's Manual"
+ 
+ .SH "NAME"
+ gkrellm \- The GNU Krell Monitors
+@@ -322,18 +322,18 @@
+ ppp is connecting, and the on state is the ppp link connected.
+ The phone line lock is determined by the existence of the modem
+ lock file
+-.IR /var/lock/LCK..modem.
++.IR /var/spool/lock/LCK..modem.
+ If your pppd setup does not use
+ .IR /dev/modem,
+ then you can configure an alternative with:
+ .PP
+ .RS
+ .nf
+-ln  -s  /var/lock/LCK..ttySx   ~/.gkrellm/LCK..modem
++ln  -s  /var/spool/lock/LCK..cuaaS   ~/.gkrellm/LCK..modem
+ .fi
+ .RE
+ .IP
+-where ttySx is the tty device your modem uses.  The ppp on
++where cuaaS is the tty device your modem uses.  The ppp on
+ state is detected by the existence of
+ .IR /var/run/pppX.pid
+ and the time stamp of this file is the base for the on line time.
+@@ -781,7 +781,7 @@
+ .PP
+ .B gkrellm
+ also searches
+-.IR /usr/share/gkrellm/themes
++.IR /usr/X11R6/share/gkrellm/themes
+ for any system wide themes installed as part of a distribution.
+ Finally, a theme you simply want to check out can be untarred anywhere and
+ used by running:
+@@ -806,12 +806,12 @@
+ The directories
+ .IR /usr/local/lib/gkrellm/plugins
+ and
+-.IR /usr/lib/gkrellm/plugins
++.IR /usr/X11R6/libexec/gkrellm/plugins
+ are also searched for plugins to install.
+ For compatibility with pre 1.0.6 versions, plugins from the directories
+ .IR /usr/local/share/gkrellm/plugins
+ and
+-.IR /usr/share/gkrellm/plugins
++.IR /usr/X11R6/libexec/gkrellm/plugins
+ are still installed, but this is not compatible with the FHS.
+ .PP
+ Some plugins may be available only as source files and they will
+@@ -832,7 +832,7 @@
+ .I ~/.gkrellm/plugins
+ User plugin directory.
+ .TP
+-.I /usr/lib/gkrellm/plugins
++.I /usr/X11R6/libexec/gkrellm/plugins
+ System wide plugin directory.
+ .TP
+ .I /usr/local/lib/gkrellm/plugins
+@@ -841,7 +841,7 @@
+ .I ~/.gkrellm/themes
+ User theme directory.
+ .TP
+-.I /usr/share/gkrellm/themes
++.I /usr/X11R6/share/gkrellm/themes
+ System wide theme directory.
+ .TP
+ .I /usr/local/share/gkrellm/themes
diff --git a/sysutils/gkrellm/pkg-plist b/sysutils/gkrellm/pkg-plist
index ef2d4724318f..e6f7680fb313 100644
--- a/sysutils/gkrellm/pkg-plist
+++ b/sysutils/gkrellm/pkg-plist
@@ -11,4 +11,8 @@ include/gkrellm/gkrellm_public_proto.h
 share/doc/gkrellm/COPYRIGHT
 share/doc/gkrellm/README
 share/doc/gkrellm/Themes.html
+share/locale/de/LC_MESSAGES/gkrellm.mo
+share/locale/es/LC_MESSAGES/gkrellm.mo
+share/locale/fr/LC_MESSAGES/gkrellm.mo
+share/locale/ja/LC_MESSAGES/gkrellm.mo
 @dirrm share/doc/gkrellm
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 9420815f857e..6138fcfabd22 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
+		http://newweb.wt.net/~billw/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ume
 
@@ -19,11 +20,13 @@ USE_IMLIB=	yes
 USE_GMAKE=	yes
 
 INCLUDES=	gkrellm.h gkrellm_public_proto.h
+MAN1=		gkrellm.1
 DOCS=		COPYRIGHT README Themes.html
 
 # You should aware that GKrellM must be setuid root to obtain
 # temperatures.  If your motherboard doesn't support LM78/79 feature,
-# you may not want this build WITHOUT_SENSOR=yes
+# you may not want this.
+# WITHOUT_SENSOR=yes
 
 .include <bsd.port.pre.mk>
 
@@ -41,17 +44,24 @@ BINMODE=	4111
 BINMODE=	2111
 .endif
 
+MAKE_ENV+=	enable_nls=1 LOCALEDIR=${PREFIX}/share/locale
 CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${PREFIX}/share/gkrellm/themes\"' \
 		-DSYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm/plugins\"'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/gkrellm ${PREFIX}/bin/gkrellm
+	@cd ${WRKSRC}/locale && \
+		${GMAKE} install enable_nls=1 LOCALEDIR=${PREFIX}/share/locale
+
 	@${MKDIR} ${PREFIX}/include/gkrellm
 .for file in ${INCLUDES}
 	${INSTALL_DATA} ${WRKSRC}/src/${file} ${PREFIX}/include/gkrellm
 .endfor
 	@${MKDIR} ${PREFIX}/libexec/gkrellm/plugins
 	@${MKDIR} ${PREFIX}/share/gkrellm/themes
+.for file in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${file} ${MANPREFIX}/man/man1/${file}
+.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/gkrellm
 .for file in ${DOCS}
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index c932a8bb0ab5..a081a620b732 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-1.0.6.tar.gz) = f937ba51f0d661f8994d5c2440db9065
+MD5 (gkrellm-1.0.7.tar.gz) = a72acffc0c110522cf4d39a01b53e7b7
diff --git a/sysutils/gkrellm2/files/patch-af b/sysutils/gkrellm2/files/patch-af
new file mode 100644
index 000000000000..efca767acaf6
--- /dev/null
+++ b/sysutils/gkrellm2/files/patch-af
@@ -0,0 +1,74 @@
+Index: gkrellm.1
+diff -u gkrellm.1.orig gkrellm.1
+--- gkrellm.1.orig	Wed Mar 14 21:04:26 2001
++++ gkrellm.1	Thu Mar 15 00:12:14 2001
+@@ -1,4 +1,4 @@
+-.TH gkrellm 1 "Febuary 3, 2001" "Olympus GNU/Linux" "User's Manual"
++.TH gkrellm 1 "Febuary 3, 2001" "FreeBSD" "User's Manual"
+ 
+ .SH "NAME"
+ gkrellm \- The GNU Krell Monitors
+@@ -322,18 +322,18 @@
+ ppp is connecting, and the on state is the ppp link connected.
+ The phone line lock is determined by the existence of the modem
+ lock file
+-.IR /var/lock/LCK..modem.
++.IR /var/spool/lock/LCK..modem.
+ If your pppd setup does not use
+ .IR /dev/modem,
+ then you can configure an alternative with:
+ .PP
+ .RS
+ .nf
+-ln  -s  /var/lock/LCK..ttySx   ~/.gkrellm/LCK..modem
++ln  -s  /var/spool/lock/LCK..cuaaS   ~/.gkrellm/LCK..modem
+ .fi
+ .RE
+ .IP
+-where ttySx is the tty device your modem uses.  The ppp on
++where cuaaS is the tty device your modem uses.  The ppp on
+ state is detected by the existence of
+ .IR /var/run/pppX.pid
+ and the time stamp of this file is the base for the on line time.
+@@ -781,7 +781,7 @@
+ .PP
+ .B gkrellm
+ also searches
+-.IR /usr/share/gkrellm/themes
++.IR /usr/X11R6/share/gkrellm/themes
+ for any system wide themes installed as part of a distribution.
+ Finally, a theme you simply want to check out can be untarred anywhere and
+ used by running:
+@@ -806,12 +806,12 @@
+ The directories
+ .IR /usr/local/lib/gkrellm/plugins
+ and
+-.IR /usr/lib/gkrellm/plugins
++.IR /usr/X11R6/libexec/gkrellm/plugins
+ are also searched for plugins to install.
+ For compatibility with pre 1.0.6 versions, plugins from the directories
+ .IR /usr/local/share/gkrellm/plugins
+ and
+-.IR /usr/share/gkrellm/plugins
++.IR /usr/X11R6/libexec/gkrellm/plugins
+ are still installed, but this is not compatible with the FHS.
+ .PP
+ Some plugins may be available only as source files and they will
+@@ -832,7 +832,7 @@
+ .I ~/.gkrellm/plugins
+ User plugin directory.
+ .TP
+-.I /usr/lib/gkrellm/plugins
++.I /usr/X11R6/libexec/gkrellm/plugins
+ System wide plugin directory.
+ .TP
+ .I /usr/local/lib/gkrellm/plugins
+@@ -841,7 +841,7 @@
+ .I ~/.gkrellm/themes
+ User theme directory.
+ .TP
+-.I /usr/share/gkrellm/themes
++.I /usr/X11R6/share/gkrellm/themes
+ System wide theme directory.
+ .TP
+ .I /usr/local/share/gkrellm/themes
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index ef2d4724318f..e6f7680fb313 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -11,4 +11,8 @@ include/gkrellm/gkrellm_public_proto.h
 share/doc/gkrellm/COPYRIGHT
 share/doc/gkrellm/README
 share/doc/gkrellm/Themes.html
+share/locale/de/LC_MESSAGES/gkrellm.mo
+share/locale/es/LC_MESSAGES/gkrellm.mo
+share/locale/fr/LC_MESSAGES/gkrellm.mo
+share/locale/ja/LC_MESSAGES/gkrellm.mo
 @dirrm share/doc/gkrellm