aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHajimu UMEMOTO <ume@FreeBSD.org>2001-12-05 19:28:32 +0000
committerHajimu UMEMOTO <ume@FreeBSD.org>2001-12-05 19:28:32 +0000
commit4819c441da62446aac0b3deec4d02d6c093758d6 (patch)
treefb433673bb15142d4ae884762367a4d8b7e97cd0
parent1301e3e01dfaddb0d7f5b0e45b78c24378d59ccd (diff)
downloadports-4819c441da62446aac0b3deec4d02d6c093758d6.tar.gz
ports-4819c441da62446aac0b3deec4d02d6c093758d6.zip
Notes
-rw-r--r--sysutils/gkrellm/Makefile4
-rw-r--r--sysutils/gkrellm/distinfo2
-rw-r--r--sysutils/gkrellm/files/patch-ad16
-rw-r--r--sysutils/gkrellm/files/patch-ag28
-rw-r--r--sysutils/gkrellm/pkg-plist1
-rw-r--r--sysutils/gkrellm2/Makefile4
-rw-r--r--sysutils/gkrellm2/distinfo2
-rw-r--r--sysutils/gkrellm2/files/patch-ad16
-rw-r--r--sysutils/gkrellm2/files/patch-ag28
-rw-r--r--sysutils/gkrellm2/pkg-plist1
10 files changed, 80 insertions, 22 deletions
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 4944d64d3bdc..aaabcd9dc46b 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gkrellm
-PORTVERSION= 1.2.4
+PORTVERSION= 1.2.5
CATEGORIES= sysutils ipv6
MASTER_SITES= http://web.wt.net/~billw/gkrellm/ \
${MASTER_SITE_LOCAL}
@@ -45,7 +45,7 @@ BINMODE= 4111
BINMODE= 2111
.endif
-MAKE_ENV+= enable_nls=1 LOCALEDIR=${PREFIX}/share/locale
+MAKE_ENV+= LOCALEDIR=${PREFIX}/share/locale
CFLAGS+= -DSYSTEM_THEMES_DIR='\"${PREFIX}/share/gkrellm/themes\"' \
-DSYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm/plugins\"'
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index fc826694f958..bcf052cf58c5 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-1.2.4.tar.gz) = 414e33eb7d845a95ad78c9fd20382a16
+MD5 (gkrellm-1.2.5.tar.gz) = b8b51e9316869e346738e96aa856779f
diff --git a/sysutils/gkrellm/files/patch-ad b/sysutils/gkrellm/files/patch-ad
index 5814f899d50e..247f6baa3cd3 100644
--- a/sysutils/gkrellm/files/patch-ad
+++ b/sysutils/gkrellm/files/patch-ad
@@ -1,28 +1,28 @@
Index: Makefile.top
diff -u Makefile.top.orig Makefile.top
---- Makefile.top.orig Sun Oct 14 13:24:54 2001
-+++ Makefile.top Mon Oct 22 23:10:07 2001
+--- Makefile.top.orig Thu Dec 6 01:25:04 2001
++++ Makefile.top Thu Dec 6 03:33:13 2001
@@ -30,7 +30,7 @@
#
# Default
#--------
-GTK_CONFIG = gtk-config
+#GTK_CONFIG = gtk-config
+ EXTRAOBJS = md5c.o
BINMODE = 755
- # FreeBSD 2.X
-@@ -117,12 +117,12 @@
+@@ -122,12 +122,12 @@
freebsd2:
(cd po && ${MAKE} all)
- (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 )
++ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
+ EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellm )
freebsd3 freebsd4 freebsd5 freebsd:
(cd po && ${MAKE} all)
- (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 )
++ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
+ EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellm )
netbsd:
diff --git a/sysutils/gkrellm/files/patch-ag b/sysutils/gkrellm/files/patch-ag
new file mode 100644
index 000000000000..59031f3a2a86
--- /dev/null
+++ b/sysutils/gkrellm/files/patch-ag
@@ -0,0 +1,28 @@
+Index: Makefile.top_enable_nls
+diff -u Makefile.top_enable_nls.orig Makefile.top_enable_nls
+--- Makefile.top_enable_nls.orig Wed Dec 5 16:41:15 2001
++++ Makefile.top_enable_nls Thu Dec 6 03:35:21 2001
+@@ -30,7 +30,7 @@
+ #
+ # Default
+ #--------
+-GTK_CONFIG = gtk-config
++#GTK_CONFIG = gtk-config
+ EXTRAOBJS = md5c.o
+ BINMODE = 755
+
+@@ -122,12 +122,12 @@
+
+ freebsd2:
+ (cd po && ${MAKE} all)
+- (cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
++ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
+ EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellm )
+
+ freebsd3 freebsd4 freebsd5 freebsd:
+ (cd po && ${MAKE} all)
+- (cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
++ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
+ EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellm )
+
+ netbsd:
diff --git a/sysutils/gkrellm/pkg-plist b/sysutils/gkrellm/pkg-plist
index 9a4554a735d3..939247f6792e 100644
--- a/sysutils/gkrellm/pkg-plist
+++ b/sysutils/gkrellm/pkg-plist
@@ -9,6 +9,7 @@ share/locale/es/LC_MESSAGES/gkrellm.mo
share/locale/fr/LC_MESSAGES/gkrellm.mo
share/locale/ja/LC_MESSAGES/gkrellm.mo
share/locale/pl/LC_MESSAGES/gkrellm.mo
+share/locale/ru/LC_MESSAGES/gkrellm.mo
share/locale/sv/LC_MESSAGES/gkrellm.mo
%%PORTDOCS%%@dirrm share/doc/gkrellm
@dirrm include/gkrellm
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 4944d64d3bdc..aaabcd9dc46b 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gkrellm
-PORTVERSION= 1.2.4
+PORTVERSION= 1.2.5
CATEGORIES= sysutils ipv6
MASTER_SITES= http://web.wt.net/~billw/gkrellm/ \
${MASTER_SITE_LOCAL}
@@ -45,7 +45,7 @@ BINMODE= 4111
BINMODE= 2111
.endif
-MAKE_ENV+= enable_nls=1 LOCALEDIR=${PREFIX}/share/locale
+MAKE_ENV+= LOCALEDIR=${PREFIX}/share/locale
CFLAGS+= -DSYSTEM_THEMES_DIR='\"${PREFIX}/share/gkrellm/themes\"' \
-DSYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm/plugins\"'
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index fc826694f958..bcf052cf58c5 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-1.2.4.tar.gz) = 414e33eb7d845a95ad78c9fd20382a16
+MD5 (gkrellm-1.2.5.tar.gz) = b8b51e9316869e346738e96aa856779f
diff --git a/sysutils/gkrellm2/files/patch-ad b/sysutils/gkrellm2/files/patch-ad
index 5814f899d50e..247f6baa3cd3 100644
--- a/sysutils/gkrellm2/files/patch-ad
+++ b/sysutils/gkrellm2/files/patch-ad
@@ -1,28 +1,28 @@
Index: Makefile.top
diff -u Makefile.top.orig Makefile.top
---- Makefile.top.orig Sun Oct 14 13:24:54 2001
-+++ Makefile.top Mon Oct 22 23:10:07 2001
+--- Makefile.top.orig Thu Dec 6 01:25:04 2001
++++ Makefile.top Thu Dec 6 03:33:13 2001
@@ -30,7 +30,7 @@
#
# Default
#--------
-GTK_CONFIG = gtk-config
+#GTK_CONFIG = gtk-config
+ EXTRAOBJS = md5c.o
BINMODE = 755
- # FreeBSD 2.X
-@@ -117,12 +117,12 @@
+@@ -122,12 +122,12 @@
freebsd2:
(cd po && ${MAKE} all)
- (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 )
++ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
+ EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellm )
freebsd3 freebsd4 freebsd5 freebsd:
(cd po && ${MAKE} all)
- (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 )
++ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
+ EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellm )
netbsd:
diff --git a/sysutils/gkrellm2/files/patch-ag b/sysutils/gkrellm2/files/patch-ag
new file mode 100644
index 000000000000..59031f3a2a86
--- /dev/null
+++ b/sysutils/gkrellm2/files/patch-ag
@@ -0,0 +1,28 @@
+Index: Makefile.top_enable_nls
+diff -u Makefile.top_enable_nls.orig Makefile.top_enable_nls
+--- Makefile.top_enable_nls.orig Wed Dec 5 16:41:15 2001
++++ Makefile.top_enable_nls Thu Dec 6 03:35:21 2001
+@@ -30,7 +30,7 @@
+ #
+ # Default
+ #--------
+-GTK_CONFIG = gtk-config
++#GTK_CONFIG = gtk-config
+ EXTRAOBJS = md5c.o
+ BINMODE = 755
+
+@@ -122,12 +122,12 @@
+
+ freebsd2:
+ (cd po && ${MAKE} all)
+- (cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
++ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
+ EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellm )
+
+ freebsd3 freebsd4 freebsd5 freebsd:
+ (cd po && ${MAKE} all)
+- (cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
++ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
+ EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellm )
+
+ netbsd:
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index 9a4554a735d3..939247f6792e 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -9,6 +9,7 @@ share/locale/es/LC_MESSAGES/gkrellm.mo
share/locale/fr/LC_MESSAGES/gkrellm.mo
share/locale/ja/LC_MESSAGES/gkrellm.mo
share/locale/pl/LC_MESSAGES/gkrellm.mo
+share/locale/ru/LC_MESSAGES/gkrellm.mo
share/locale/sv/LC_MESSAGES/gkrellm.mo
%%PORTDOCS%%@dirrm share/doc/gkrellm
@dirrm include/gkrellm