diff options
| author | wiz <wiz@pkgsrc.org> | 2007-04-01 21:36:16 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2007-04-01 21:36:16 +0000 |
| commit | e0378cad3d9fd4b681ba3777f2320b2ce79ba44e (patch) | |
| tree | 5bede7eac635be2ccff1fd7de33cd36d702ee0dd | |
| parent | 1e65ee8c3c7711a6cfaeae6bfbaacacb61d0a5fa (diff) | |
| download | pkgsrc-e0378cad3d9fd4b681ba3777f2320b2ce79ba44e.tar.gz | |
Remove gkrellm1 and its dependencies from pkgsrc.
This has been replaced ages ago with gkrellm version 2.
No disagreement on pkgsrc-users.
59 files changed, 5 insertions, 1048 deletions
diff --git a/audio/Makefile b/audio/Makefile index ff33271277c..d2b28ba05b8 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.353 2007/03/24 13:49:26 markd Exp $ +# $NetBSD: Makefile,v 1.354 2007/04/01 21:36:16 wiz Exp $ # COMMENT= Audio tools @@ -85,8 +85,6 @@ SUBDIR+= freepats SUBDIR+= freezetag SUBDIR+= gkrellm-volume SUBDIR+= gkrellm-xmms -SUBDIR+= gkrellm1-volume -SUBDIR+= gkrellm1-xmms SUBDIR+= glurp SUBDIR+= gmp3info SUBDIR+= gmpc diff --git a/audio/gkrellm1-volume/DESCR b/audio/gkrellm1-volume/DESCR deleted file mode 100644 index ece565f5008..00000000000 --- a/audio/gkrellm1-volume/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -gkrellm-volume is a gkrellm plugin to control all your mixer volumes. -It also allows to save/restore volumes between sessions. diff --git a/audio/gkrellm1-volume/Makefile b/audio/gkrellm1-volume/Makefile deleted file mode 100644 index 9c9678790ec..00000000000 --- a/audio/gkrellm1-volume/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: Makefile,v 1.11 2007/02/22 19:01:13 wiz Exp $ - -DISTNAME= volume-0.8 -PKGNAME= gkrellm-${DISTNAME} -PKGREVISION= 7 -CATEGORIES= audio -MASTER_SITES= http://gkrellm.luon.net/files/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://gkrellm.luon.net/volume.phtml -COMMENT= GKrellM volume mixer plugin - -WRKSRC= ${WRKDIR}/volume -PTHREAD_OPTS= require - -.include "../../graphics/imlib/buildlink3.mk" -.include "../../sysutils/gkrellm1/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/audio/gkrellm1-volume/PLIST b/audio/gkrellm1-volume/PLIST deleted file mode 100644 index 7068a9812f2..00000000000 --- a/audio/gkrellm1-volume/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 22:33:50 cube Exp $ -lib/gkrellm/plugins/volume.so diff --git a/audio/gkrellm1-volume/distinfo b/audio/gkrellm1-volume/distinfo deleted file mode 100644 index ba825b2d9f8..00000000000 --- a/audio/gkrellm1-volume/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.2 2005/02/23 20:39:46 agc Exp $ - -SHA1 (volume-0.8.tar.gz) = 7348c8fc41bdc6c236442748ef3c803851a151f8 -RMD160 (volume-0.8.tar.gz) = 11cfcedf4f695904b5d1b6900f89acbc5c6a8ae6 -Size (volume-0.8.tar.gz) = 8395 bytes -SHA1 (patch-aa) = adf96e0bd1e2b65e85394c4c50ce1db587b73195 -SHA1 (patch-ab) = 9281f2e550134887bfbc99464ab79987f4a26183 diff --git a/audio/gkrellm1-volume/patches/patch-aa b/audio/gkrellm1-volume/patches/patch-aa deleted file mode 100644 index 43dbdfbb8e8..00000000000 --- a/audio/gkrellm1-volume/patches/patch-aa +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 22:33:50 cube Exp $ - ---- Makefile.orig Fri Jun 23 19:47:00 2000 -+++ Makefile -@@ -1,27 +1,19 @@ - # Makefile for GKrellM volume plugin - --# Linux --GTK_CONFIG = gtk-config --SYSLIB = -lpthread -- --# FreeBSD --#GTK_CONFIG = gtk12-config --#SYSLIB = -- --PLUGIN_DIR = /usr/share/gkrellm/plugins -+PLUGIN_DIR = ${LOCALBASE}/lib/gkrellm/plugins - GKRELLM_INCLUDE = -I/usr/local/include - --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` - --FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) --LIBS = $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB) --LFLAGS = -shared -+CFLAGS+= -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) -+LIBS+= $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB) -+LFLAGS+= -shared -lpthread -lossaudio - --CC = gcc $(CFLAGS) $(FLAGS) -+CC = gcc $(CFLAGS) - - INSTALL = install -c - INSTALL_PROGRAM = $(INSTALL) -s -@@ -30,9 +22,6 @@ - - all: volume.so - --freebsd: -- make GTK_CONFIG=gtk12-config SYSLIB=all -- - volume.so: $(OBJS) - $(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS) - -@@ -40,6 +29,7 @@ - rm -f *.o core *.so* *.bak *~ - - install: -+ mkdir -p $(PLUGIN_DIR) - $(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR) - - volume.c.o: volume.c diff --git a/audio/gkrellm1-volume/patches/patch-ab b/audio/gkrellm1-volume/patches/patch-ab deleted file mode 100644 index 3bf518bd27a..00000000000 --- a/audio/gkrellm1-volume/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/02/24 22:33:50 cube Exp $ - ---- volume.c.orig Wed Nov 22 21:35:42 2000 -+++ volume.c -@@ -19,6 +19,8 @@ - - #ifdef __FreeBSD__ - #include <machine/soundcard.h> -+#elif __NetBSD__ -+#include <soundcard.h> - #else - #include <sys/soundcard.h> - #endif diff --git a/audio/gkrellm1-xmms/DESCR b/audio/gkrellm1-xmms/DESCR deleted file mode 100644 index e14ff0aa341..00000000000 --- a/audio/gkrellm1-xmms/DESCR +++ /dev/null @@ -1,12 +0,0 @@ -gkrellm plugin for controlling XMMS from within GKrellM. - -GKrellMMS Features: - - -Local Playlist Editor - -Title scrolling - -Progress bar (Krell) to see where you are in a song - -Jumping in a file, by picking up the Krell - -LED indicator which indicates whether XMMS is on, off, stopped, - playing or paused - -Themeable buttons, to control XMMS - -A menu for some misc. XMMS-commands diff --git a/audio/gkrellm1-xmms/Makefile b/audio/gkrellm1-xmms/Makefile deleted file mode 100644 index b5d041ad929..00000000000 --- a/audio/gkrellm1-xmms/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: Makefile,v 1.8 2007/02/22 19:01:13 wiz Exp $ - -DISTNAME= gkrellmms-0.5.6 -PKGNAME= gkrellm-xmms-0.5.6 -PKGREVISION= 7 -CATEGORIES= audio -MASTER_SITES= http://gkrellm.luon.net/files/ - -MAINTAINER= damon@NetBSD.org -HOMEPAGE= http://gkrellm.luon.net/gkrellmms.phtml -COMMENT= GKrellM xmms plugin - -WRKSRC= ${WRKDIR}/gkrellmms - -pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins - -.include "../../audio/xmms/buildlink3.mk" -.include "../../sysutils/gkrellm1/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/audio/gkrellm1-xmms/PLIST b/audio/gkrellm1-xmms/PLIST deleted file mode 100644 index c34b8230abc..00000000000 --- a/audio/gkrellm1-xmms/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 22:44:35 cube Exp $ -lib/gkrellm/plugins/gkrellmms.so diff --git a/audio/gkrellm1-xmms/distinfo b/audio/gkrellm1-xmms/distinfo deleted file mode 100644 index 13dbc27ac95..00000000000 --- a/audio/gkrellm1-xmms/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2005/02/23 20:39:46 agc Exp $ - -SHA1 (gkrellmms-0.5.6.tar.gz) = a657f47c5e8f5a874c0ad0b91e238147065593bc -RMD160 (gkrellmms-0.5.6.tar.gz) = aae09db9b58ad97bb4faa9f2aaad773c564c8a7a -Size (gkrellmms-0.5.6.tar.gz) = 27249 bytes -SHA1 (patch-aa) = f0b0c9266046bcea9b97fd9ae57f41b595d1eb11 diff --git a/audio/gkrellm1-xmms/patches/patch-aa b/audio/gkrellm1-xmms/patches/patch-aa deleted file mode 100644 index 6bc30784124..00000000000 --- a/audio/gkrellm1-xmms/patches/patch-aa +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 22:44:35 cube Exp $ - ---- Makefile.orig Sat Jan 20 15:28:38 2001 -+++ Makefile -@@ -10,14 +10,16 @@ - XMMS_INCLUDE = `xmms-config --cflags` - XMMS_LIB = `xmms-config --libs` - --FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE) -+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE) - LIBS = $(GTK_LIB) $(IMLIB_LIB) $(XMMS_LIB) - LFLAGS = -shared -lpthread - --CC = gcc $(CFLAGS) $(FLAGS) -+CC = gcc $(CFLAGS) - - OBJS = gkrellmms.o options.o playlist.o - -+all: $(BIN_FILENAME).so -+ - $(BIN_FILENAME).so: $(OBJS) - $(CC) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS) - -@@ -25,7 +27,7 @@ - rm -f *.o core *.so* *.bak *~ - - install: -- install -c -s -m 755 $(BIN_FILENAME).so /usr/share/gkrellm/plugins -+ install -c -s -m 644 $(BIN_FILENAME).so ${PREFIX}/lib/gkrellm/plugins - - gkrellmms.c.o: gkrellmms.c - options.c.o: options.c diff --git a/finance/Makefile b/finance/Makefile index 46b39c91768..e0a6cc63be5 100644 --- a/finance/Makefile +++ b/finance/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2006/07/11 12:59:43 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2007/04/01 21:36:16 wiz Exp $ # COMMENT= Monetary, financial and related applications SUBDIR+= gkrellm-stock -SUBDIR+= gkrellm1-stock SUBDIR+= gnucash SUBDIR+= gnucash-docs SUBDIR+= gnucash-gtk1 diff --git a/finance/gkrellm1-stock/DESCR b/finance/gkrellm1-stock/DESCR deleted file mode 100644 index 5b472a8fc29..00000000000 --- a/finance/gkrellm1-stock/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -GKrellStock is a plugin for GKrellM that displays given stock -tickers (current point and net change). - -Uses perl script to get Quote information from given source -(US, European, Australian, Canadian and Asian Markets). diff --git a/finance/gkrellm1-stock/Makefile b/finance/gkrellm1-stock/Makefile deleted file mode 100644 index a59f23c711a..00000000000 --- a/finance/gkrellm1-stock/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $NetBSD: Makefile,v 1.13 2007/02/22 19:26:29 wiz Exp $ - -DISTNAME= gkrellstock-0.2 -PKGNAME= gkrellm-stock-0.2 -PKGREVISION= 10 -CATEGORIES= finance -MASTER_SITES= http://www.geocities.com/m_muthukumar/ - -MAINTAINER= damon@NetBSD.org -HOMEPAGE= http://www.geocities.com/m_muthukumar/gkrellstock.html -COMMENT= gkrellm stock ticker plugin - -DEPENDS+= p5-Finance-Quote-1.*:../../finance/p5-Finance-Quote - -WRKSRC= ${WRKDIR}/gkrellStock-0.2 -USE_TOOLS+= perl:run - -do-configure: -.for FILE in GetQuote Asia.pm - ${CP} ${WRKSRC}/${FILE} ${WRKSRC}/${FILE}.ORIG - ${SED} -e "s,/usr/bin/perl,${PERL5},g" \ - < ${WRKSRC}/${FILE}.ORIG > ${WRKSRC}/${FILE} -.endfor - -pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins - -.include "../../sysutils/gkrellm1/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/finance/gkrellm1-stock/PLIST b/finance/gkrellm1-stock/PLIST deleted file mode 100644 index 83517e9eb34..00000000000 --- a/finance/gkrellm1-stock/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 23:03:52 cube Exp $ -lib/gkrellm/plugins/gkrellstock.so -bin/GetQuote diff --git a/finance/gkrellm1-stock/distinfo b/finance/gkrellm1-stock/distinfo deleted file mode 100644 index 172160188b2..00000000000 --- a/finance/gkrellm1-stock/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.2 2005/02/22 21:11:48 agc Exp $ - -SHA1 (gkrellstock-0.2.tar.gz) = 09f754fdb57505e52afacb22caec6c398ecc57de -RMD160 (gkrellstock-0.2.tar.gz) = 48d6fc809a078f49eb9a62e4e1123829f0b889fb -Size (gkrellstock-0.2.tar.gz) = 19062 bytes -SHA1 (patch-aa) = bcdc060a96420778992a75deb7244da14de68e1e -SHA1 (patch-ab) = 22d4b7ca33f5f682849c9f05e035567c422e2d31 diff --git a/finance/gkrellm1-stock/patches/patch-aa b/finance/gkrellm1-stock/patches/patch-aa deleted file mode 100644 index 26ff44a99d3..00000000000 --- a/finance/gkrellm1-stock/patches/patch-aa +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:03:52 cube Exp $ - ---- Makefile.orig Tue Aug 7 10:06:13 2001 -+++ Makefile -@@ -5,14 +5,16 @@ - IMLIB_LIB = `imlib-config --libs-gdk` - - --FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) -+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) -I${PREFIX}/include - LIBS = $(GTK_LIB) $(IMLIB_LIB) - LFLAGS = -shared - --CC = gcc $(CFLAGS) $(FLAGS) -+CC = gcc $(CFLAGS) - - OBJS = gkrellstock.o - -+all: gkrellstock.so -+ - gkrellstock.so: $(OBJS) - $(CC) $(OBJS) -o gkrellstock.so $(LFLAGS) $(LIBS) -lpthread - -@@ -22,23 +24,10 @@ - gkrellstock.o: gkrellstock.c - - install: -- if [ -d /usr/lib/gkrellm/plugins/ ] ; then \ -- install -c -s -m 644 gkrellstock.so /usr/lib/gkrellm/plugins/ ; \ -- elif [ -d /usr/share/gkrellm/plugins/ ] ; then \ -- install -c -s -m 644 gkrellstock.so /usr/share/gkrellm/plugins/ ; \ -- elif [ -d /usr/local/lib/gkrellm/plugins/ ] ; then \ -- install -c -s -m 644 gkrellstock.so /usr/local/lib/gkrellm/plugins/ ; \ -- elif [ -d /usr/lib/gkrellm/plugins/ ] ; then \ -- install -c -s -m 644 gkrellstock.so /usr/lib/gkrellm/plugins/ ; \ -- else \ -- install -D -c -s -m 644 gkrellstock.so /usr/lib/gkrellm/plugins/gkrellstock.so ; \ -- fi -- install -c -m 755 GetStock /usr/X11R6/bin -+ install -c -s -m 644 gkrellstock.so ${PREFIX}/lib/gkrellm/plugins -+ install -c -m 755 GetQuote ${PREFIX}/bin - - uninstall: -- rm -f /usr/lib/gkrellm/plugins/gkrellstock.so -- rm -f /usr/share/gkrellm/plugins/gkrellstock.so -- rm -f /usr/local/lib/gkrellm/plugins/gkrellstock.so -- rm -f /usr/lib/gkrellm/plugins/gkrellstock.so -- rm -f /usr/X11R6/bin/GetQuote -+ rm -f ${PREFIX}/lib/gkrellm/plugins/gkrellstock.so -+ rm -f ${PREFIX}/bin/GetQuote - diff --git a/finance/gkrellm1-stock/patches/patch-ab b/finance/gkrellm1-stock/patches/patch-ab deleted file mode 100644 index 026f80fae74..00000000000 --- a/finance/gkrellm1-stock/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/02/24 23:03:52 cube Exp $ - ---- GetQuote.orig Sat Oct 20 00:52:44 2001 -+++ GetQuote -@@ -95,7 +95,10 @@ - # Get rid of puncuation in @ARGV. This will filter out metacharacters and - # such, which makes the script marginally more safe - # --foreach (@tickers) { s/[^a-zA-Z0-9\-=_\.]//; } -+ -+# Add ^ to the list so that we can display indices -+ -+foreach (@tickers) { s/[^a-zA-Z0-9\-=_\.\^]//; } - - # Check the input to make sure we can look stuff up - # diff --git a/misc/Makefile b/misc/Makefile index 47efae74793..187117912cb 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.274 2007/03/22 17:16:42 rillig Exp $ +# $NetBSD: Makefile,v 1.275 2007/04/01 21:36:16 wiz Exp $ # COMMENT= Miscellaneous utilities @@ -59,8 +59,6 @@ SUBDIR+= gkrellm-launch SUBDIR+= gkrellm-leds SUBDIR+= gkrellm-moon SUBDIR+= gkrellm-weather -SUBDIR+= gkrellm1-moon -SUBDIR+= gkrellm1-weather SUBDIR+= gnome-dirs SUBDIR+= gnome-user-docs SUBDIR+= gnome1-dirs diff --git a/misc/gkrellm1-moon/DESCR b/misc/gkrellm1-moon/DESCR deleted file mode 100644 index 7fa851bba24..00000000000 --- a/misc/gkrellm1-moon/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -gkrellmoon is a moon clock plugin for gkrellm. It shows the -current phase of the moon. diff --git a/misc/gkrellm1-moon/Makefile b/misc/gkrellm1-moon/Makefile deleted file mode 100644 index 866ea5f5967..00000000000 --- a/misc/gkrellm1-moon/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile,v 1.8 2006/04/17 13:46:40 wiz Exp $ - -DISTNAME= gkrellmoon-0.3 -PKGNAME= gkrellm-moon-0.3 -PKGREVISION= 8 -CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gkrellmoon/} - -MAINTAINER= damon@NetBSD.org -HOMEPAGE= http://gkrellmoon.sourceforge.net/ -COMMENT= gkrellm moonclock plugin - - -pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins - -.include "../../sysutils/gkrellm1/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/misc/gkrellm1-moon/PLIST b/misc/gkrellm1-moon/PLIST deleted file mode 100644 index 77dac802a84..00000000000 --- a/misc/gkrellm1-moon/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 23:09:51 cube Exp $ -lib/gkrellm/plugins/gkrellmoon.so diff --git a/misc/gkrellm1-moon/distinfo b/misc/gkrellm1-moon/distinfo deleted file mode 100644 index e7a14d7accd..00000000000 --- a/misc/gkrellm1-moon/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 11:02:52 agc Exp $ - -SHA1 (gkrellmoon-0.3.tar.gz) = 13c774ab2acc9cadc157c7cf16776c3b6bfb42f1 -RMD160 (gkrellmoon-0.3.tar.gz) = 713a8e52223dfc61fdc2bd0e2bf324ded044fe2d -Size (gkrellmoon-0.3.tar.gz) = 51988 bytes -SHA1 (patch-aa) = 1af28d177f7ecaabcd41608d12685398f541c33d diff --git a/misc/gkrellm1-moon/patches/patch-aa b/misc/gkrellm1-moon/patches/patch-aa deleted file mode 100644 index 6ea4320659e..00000000000 --- a/misc/gkrellm1-moon/patches/patch-aa +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:09:51 cube Exp $ - ---- Makefile.orig Sat Oct 20 01:40:33 2001 -+++ Makefile -@@ -4,17 +4,19 @@ - IMLIB_INCLUDE = `imlib-config --cflags-gdk` - IMLIB_LIB = `imlib-config --libs-gdk` - THREAD_LIB = -lpthread --INSTALLDIR = /usr/share/gkrellm/plugins -+INSTALLDIR = ${PREFIX}/lib/gkrellm/plugins - - --FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) -+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) -I${PREFIX}/include - LIBS = $(GTK_LIB) $(IMLIB_LIB) $(THREAD_LIB) - LFLAGS = -shared - --CC = gcc $(CFLAGS) $(FLAGS) -+CC = gcc $(CFLAGS) - - OBJS = gkrellmoon.o MoonRise.o CalcEphem.o Moon.o - -+all: gkrellmoon.so -+ - gkrellmoon.so: $(OBJS) - $(CC) $(OBJS) -o gkrellmoon.so $(LFLAGS) $(LIBS) - -@@ -26,4 +28,4 @@ - # %.o: %.c - - install: gkrellmoon.so -- sudo install -c -s -m 644 gkrellmoon.so $(INSTALLDIR) -+ install -c -s -m 644 gkrellmoon.so $(INSTALLDIR) diff --git a/misc/gkrellm1-weather/DESCR b/misc/gkrellm1-weather/DESCR deleted file mode 100644 index 4fb93ca8126..00000000000 --- a/misc/gkrellm1-weather/DESCR +++ /dev/null @@ -1,11 +0,0 @@ -GKrellWeather is a weather plugin for GKrellM. -Features - -Choose your own location by 4-letter METAR station identifier code. - -Monitor temperature, dew point, pressure, relative humidity, sky - condition, wind direction and speed - -Display using imperial units (degrees Fahrenheit, inches of Mercury, - miles per hour) - -Display using metric units (degrees Celsius, millimeters of Mercury, - kilometers per hour) - -Display pressure in kPa, hPa and mmHg - -Display wind speeds in kmph, mps and beaufort scale diff --git a/misc/gkrellm1-weather/Makefile b/misc/gkrellm1-weather/Makefile deleted file mode 100644 index c561f5b8d5a..00000000000 --- a/misc/gkrellm1-weather/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:49 wiz Exp $ - -DISTNAME= gkrellweather-0.2.7 -PKGNAME= gkrellm-weather-0.2.7 -PKGREVISION= 10 -CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_LOCAL} - -MAINTAINER= damon@NetBSD.org -HOMEPAGE= http://www.cse.unsw.edu.au/~flam/ -COMMENT= gkrellm weather plugin - -DEPENDS+= wmweather>=1.3:../../x11/wmweather - - -pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins - -.include "../../sysutils/gkrellm1/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/misc/gkrellm1-weather/PLIST b/misc/gkrellm1-weather/PLIST deleted file mode 100644 index bad1e0ce43c..00000000000 --- a/misc/gkrellm1-weather/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 23:10:42 cube Exp $ -lib/gkrellm/plugins/gkrellweather.so diff --git a/misc/gkrellm1-weather/distinfo b/misc/gkrellm1-weather/distinfo deleted file mode 100644 index 3d7f263105a..00000000000 --- a/misc/gkrellm1-weather/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 11:02:52 agc Exp $ - -SHA1 (gkrellweather-0.2.7.tar.gz) = 509ec48ee81022f22ebe8cfa01768bcc6db2a7a7 -RMD160 (gkrellweather-0.2.7.tar.gz) = 387bfa9138c4375fe4e1b38aef3541a8294b2961 -Size (gkrellweather-0.2.7.tar.gz) = 17188 bytes -SHA1 (patch-aa) = e1fed69e9ea938c1295bff7b06c29187c5a5ed4b diff --git a/misc/gkrellm1-weather/patches/patch-aa b/misc/gkrellm1-weather/patches/patch-aa deleted file mode 100644 index 4ed2acdc36e..00000000000 --- a/misc/gkrellm1-weather/patches/patch-aa +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:10:43 cube Exp $ - ---- Makefile.orig Sat Oct 20 01:16:36 2001 -+++ Makefile -@@ -5,14 +5,16 @@ - IMLIB_LIB = `imlib-config --libs-gdk` - - --FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) -+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) -I${PREFIX}/include - LIBS = $(GTK_LIB) $(IMLIB_LIB) - LFLAGS = -shared - --CC = gcc $(CFLAGS) $(FLAGS) -+CC = gcc $(CFLAGS) - - OBJS = gkrellweather.o - -+all: gkrellweather.so -+ - gkrellweather.so: $(OBJS) - $(CC) $(OBJS) -o gkrellweather.so $(LFLAGS) $(LIBS) -lpthread - -@@ -22,23 +24,7 @@ - gkrellweather.o: gkrellweather.c - - install: -- if [ -d /usr/lib/gkrellm/plugins/ ] ; then \ -- install -c -s -m 644 gkrellweather.so /usr/lib/gkrellm/plugins/ ; \ -- elif [ -d /usr/share/gkrellm/plugins/ ] ; then \ -- install -c -s -m 644 gkrellweather.so /usr/share/gkrellm/plugins/ ; \ -- elif [ -d /usr/local/lib/gkrellm/plugins/ ] ; then \ -- install -c -s -m 644 gkrellweather.so /usr/local/lib/gkrellm/plugins/ ; \ -- elif [ -d /usr/lib/gkrellm/plugins/ ] ; then \ -- install -c -s -m 644 gkrellweather.so /usr/lib/gkrellm/plugins/ ; \ -- else \ -- install -D -c -s -m 644 gkrellweather.so /usr/lib/gkrellm/plugins/gkrellweather.so ; \ -- fi -- install -c -m 755 GrabWeather /usr/X11R6/bin -+ install -c -s -m 644 gkrellweather.so ${PREFIX}/lib/gkrellm/plugins/ - - uninstall: -- rm -f /usr/lib/gkrellm/plugins/gkrellweather.so -- rm -f /usr/share/gkrellm/plugins/gkrellweather.so -- rm -f /usr/local/lib/gkrellm/plugins/gkrellweather.so -- rm -f /usr/lib/gkrellm/plugins/gkrellweather.so -- rm -f /usr/X11R6/bin/GrabWeather -- -+ rm -f ${PREFIX}/lib/plugins/gkrellweather.so diff --git a/net/Makefile b/net/Makefile index a5a97a6d551..1e615d4dae4 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.663 2007/04/01 21:18:45 wiz Exp $ +# $NetBSD: Makefile,v 1.664 2007/04/01 21:36:16 wiz Exp $ # COMMENT= Networking tools @@ -115,11 +115,8 @@ SUBDIR+= gift-openft SUBDIR+= giftcurs SUBDIR+= gini SUBDIR+= gkrellm-multiping -SUBDIR+= gkrellm-ping SUBDIR+= gkrellm-snmp SUBDIR+= gkrellm-wireless -SUBDIR+= gkrellm1-snmp -SUBDIR+= gkrellm1-wireless SUBDIR+= gnapfetch SUBDIR+= gnet SUBDIR+= gnet1 diff --git a/net/gkrellm-ping/DESCR b/net/gkrellm-ping/DESCR deleted file mode 100644 index cdae7ea88c8..00000000000 --- a/net/gkrellm-ping/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -GKrellM Ping is a gkrellm plugin that watches a given server and can list - the returned ping time diff --git a/net/gkrellm-ping/Makefile b/net/gkrellm-ping/Makefile deleted file mode 100644 index 04ae6585710..00000000000 --- a/net/gkrellm-ping/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $NetBSD: Makefile,v 1.20 2006/04/17 13:46:43 wiz Exp $ - -DISTNAME= gkrellmPing-0.2-3 -PKGNAME= gkrellm-ping-0.2.3 -PKGREVISION= 8 -CATEGORIES= net sysutils -MASTER_SITES= http://gkrellmping.dweb.ro/downloads/ - -MAINTAINER= damon@NetBSD.org -HOMEPAGE= http://gkrellmping.dweb.ro/ -COMMENT= gkrellm ping plugin - -WRKSRC= ${WRKDIR}/gkrellmPing -USE_TOOLS+= gmake - -INSTALLATION_DIRS= lib/gkrellm/plugins - -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins - ${INSTALL_PROGRAM} ${WRKSRC}/gkrellmPing.so ${PREFIX}/lib/gkrellm/plugins/ - -.include "../../sysutils/gkrellm1/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/net/gkrellm-ping/PLIST b/net/gkrellm-ping/PLIST deleted file mode 100644 index 6e4a1db1428..00000000000 --- a/net/gkrellm-ping/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:26 zuntum Exp $ -lib/gkrellm/plugins/gkrellmPing.so diff --git a/net/gkrellm-ping/distinfo b/net/gkrellm-ping/distinfo deleted file mode 100644 index af9395446d2..00000000000 --- a/net/gkrellm-ping/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 12:13:47 agc Exp $ - -SHA1 (gkrellmPing-0.2-3.tar.gz) = 9e2e6167bce18d66e7ddfa57d60af4ebf2ad39b8 -RMD160 (gkrellmPing-0.2-3.tar.gz) = a478a2048f6b8ad62063cb9a085ed7a428113c08 -Size (gkrellmPing-0.2-3.tar.gz) = 11901 bytes -SHA1 (patch-aa) = 439b74a13ce89d513b7088f46e3f7c08e73c3c79 -SHA1 (patch-ab) = 8afc1538f0555b6aaac657a7c6da15e939d9a5ce diff --git a/net/gkrellm-ping/patches/patch-aa b/net/gkrellm-ping/patches/patch-aa deleted file mode 100644 index e1c64cf0338..00000000000 --- a/net/gkrellm-ping/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2001/10/31 16:30:52 damon Exp $ - ---- Makefile.orig Sat May 19 17:40:38 2001 -+++ Makefile -@@ -1,13 +1,13 @@ - # Modify INCLUDE to point to gkrellm.h (if it's not in /usr/local/include) --INCLUDE = -+INCLUDE =${LOCALBASE}/include - - CC = gcc --CFLAGS = -Wall -O2 -fPIC -I$(INCLUDE) \ -+CFLAGS += -fPIC -I$(INCLUDE) \ - `gtk-config --cflags` `imlib-config --cflags-gdk` - LDFLAGS = - TARGET = gkrellmPing - -- -+all: $(TARGET).so - - $(TARGET).so: $(TARGET).o - $(CC) -shared -Wl $< -o $@ diff --git a/net/gkrellm-ping/patches/patch-ab b/net/gkrellm-ping/patches/patch-ab deleted file mode 100644 index 495d5e57a9b..00000000000 --- a/net/gkrellm-ping/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/10/31 00:24:38 damon Exp $ - ---- gkrellmPing.c.orig Tue Oct 30 19:01:33 2001 -+++ gkrellmPing.c -@@ -32,7 +32,7 @@ - #define STYLE_NAME "gkrellmPing" - - #define VERSION "0.2-2" --#define DEF_COMMAND "ping 127.0.0.1 -c 1 | grep round-trip" -+#define DEF_COMMAND "ping -c 1 127.0.0.1 | grep round-trip" - #define DEF_NONE_MSG "Unknown Host" - #define DEF_VIEW_MSG "Ping: %s ms" - #define DEF_SEPS "=/// ;2" diff --git a/net/gkrellm1-snmp/DESCR b/net/gkrellm1-snmp/DESCR deleted file mode 100644 index 99e826d9ac2..00000000000 --- a/net/gkrellm1-snmp/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -gkrellm-snmp is a plugin for gkrellm that can show the value of an oid on an -snmp enabled device diff --git a/net/gkrellm1-snmp/Makefile b/net/gkrellm1-snmp/Makefile deleted file mode 100644 index 8c98a84f42c..00000000000 --- a/net/gkrellm1-snmp/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: Makefile,v 1.13 2007/03/25 05:55:26 wiz Exp $ - -DISTNAME= gkrellm_snmp-0.18 -PKGNAME= gkrellm-snmp-0.18 -PKGREVISION= 12 -CATEGORIES= net sysutils -MASTER_SITES= http://triq.net/gkrellm/ - -MAINTAINER= jasper@pointless.net -HOMEPAGE= http://triq.net/gkrellm_snmp.html -COMMENT= Simple SNMP monitor for gkrellm - -USE_TOOLS+= gmake -INSTALLATION_DIRS= lib/gkrellm/plugins - -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins - ${INSTALL_PROGRAM} ${WRKSRC}/gkrellm_snmp.so ${PREFIX}/lib/gkrellm/plugins/ - -.include "../../graphics/imlib/buildlink3.mk" -.include "../../net/net-snmp/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../sysutils/gkrellm1/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/net/gkrellm1-snmp/PLIST b/net/gkrellm1-snmp/PLIST deleted file mode 100644 index 71ad192f18e..00000000000 --- a/net/gkrellm1-snmp/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 23:27:25 cube Exp $ -lib/gkrellm/plugins/gkrellm_snmp.so diff --git a/net/gkrellm1-snmp/distinfo b/net/gkrellm1-snmp/distinfo deleted file mode 100644 index 369b33a9074..00000000000 --- a/net/gkrellm1-snmp/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 12:13:47 agc Exp $ - -SHA1 (gkrellm_snmp-0.18.tar.gz) = c1aa5edf8e86aedb377c454cf1f249d956ec8a67 -RMD160 (gkrellm_snmp-0.18.tar.gz) = e989afa881ae880f9b1c5a16e1eb339b2a6dec0e -Size (gkrellm_snmp-0.18.tar.gz) = 15450 bytes -SHA1 (patch-aa) = b8c84280e496febff37579914d700b4980f8cc37 -SHA1 (patch-ab) = f9a8f15814e0c57b1fd8b05612ffbc321a150ca8 diff --git a/net/gkrellm1-snmp/patches/patch-aa b/net/gkrellm1-snmp/patches/patch-aa deleted file mode 100644 index 574f05c369f..00000000000 --- a/net/gkrellm1-snmp/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:27:26 cube Exp $ - ---- Makefile.orig Tue Apr 3 09:25:07 2001 -+++ Makefile -@@ -5,7 +5,7 @@ - IMLIB_CONFIG = imlib-config - SYSLIB = -lsnmp - # we need lib crypto if libsnmp has privacy support. --SYSLIB += -lcrypto -L/usr/local/ssl/lib -L/usr/ssl/lib -+SYSLIB += -lcrypto - - # FreeBSD - #GTK_CONFIG = gtk12-config -@@ -14,8 +14,8 @@ - #PLUGIN_DIR = /usr/X11R6/libexec/gkrellm/plugins/ - - USER_PLUGIN_DIR = $(HOME)/.gkrellm/plugins --PLUGIN_DIR = /usr/share/gkrellm/plugins --GKRELLM_INCLUDE = -I/usr/local/include -+PLUGIN_DIR = ${PREFIX}/lib/gkrellm/plugins -+GKRELLM_INCLUDE = -I${PREFIX}/include - - GTK_INCLUDE = `$(GTK_CONFIG) --cflags` - GTK_LIB = `$(GTK_CONFIG) --libs` diff --git a/net/gkrellm1-snmp/patches/patch-ab b/net/gkrellm1-snmp/patches/patch-ab deleted file mode 100644 index 1daa9e5d854..00000000000 --- a/net/gkrellm1-snmp/patches/patch-ab +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2004/03/29 16:27:30 cube Exp $ - ---- gkrellm_snmp.c.orig 2001-07-27 20:06:41.000000000 +0000 -+++ gkrellm_snmp.c -@@ -33,14 +33,9 @@ - #include <stdio.h> - #include <sys/types.h> - --#include <ucd-snmp/asn1.h> --#include <ucd-snmp/mib.h> --#include <ucd-snmp/parse.h> -- --#include <ucd-snmp/snmp.h> --#include <ucd-snmp/snmp_api.h> --#include <ucd-snmp/snmp_client.h> --#include <ucd-snmp/snmp_impl.h> /* special ASN types */ -+#include <net-snmp/net-snmp-config.h> -+#include <net-snmp/net-snmp-includes.h> -+ - #ifdef DEBUG_SNMP - #include <ucd-snmp/snmp_debug.h> - #endif /* DEBUG_SNMP */ -@@ -88,6 +83,7 @@ struct Reader { - GtkTooltips *tooltip; - }; - -+oid *snmp_parse_oid(const char *argv, oid *root, size_t *rootlen); - - /* - * caller needs to free the returned gchar* -@@ -277,7 +273,8 @@ retry: - if (response->errstat == SNMP_ERR_NOERROR){ - /* just render all vars */ - for(vars = response->variables; vars; vars = vars->next_variable) { -- sprint_variable(textbuf, vars->name, vars->name_length, vars); -+ snprint_variable(textbuf, 1023, vars->name, vars->name_length, vars); -+ textbuf[1023] = '\0'; - if (result) { - tmp = result; - result = g_strdup_printf("%s\n%s\n", tmp, textbuf); -@@ -375,7 +372,7 @@ snmp_input(int op, - u_long time = 0; - Reader *reader = NULL; - -- if (op == RECEIVED_MESSAGE) { -+ if (op == NETSNMP_CALLBACK_OP_RECEIVED_MESSAGE) { - - if (pdu->errstat == SNMP_ERR_NOERROR) { - -@@ -415,7 +412,7 @@ snmp_input(int op, - } - - -- } else if (op == TIMED_OUT){ -+ } else if (op == NETSNMP_CALLBACK_OP_TIMED_OUT){ - error = g_strdup_printf("Error! SNMP Timeout."); - } - /* we use session's callback magic to pass back data */ diff --git a/net/gkrellm1-wireless/DESCR b/net/gkrellm1-wireless/DESCR deleted file mode 100644 index 728f8c57d97..00000000000 --- a/net/gkrellm1-wireless/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -gkrellmwireless is a plugin for gkrellm that shows the signal -strength/quality/noise of a wireless ethernet card. - -Currently only wi(4) (Lucent ORiNOCO and derivatives) interfaces are supported. diff --git a/net/gkrellm1-wireless/Makefile b/net/gkrellm1-wireless/Makefile deleted file mode 100644 index cfbe0e0d943..00000000000 --- a/net/gkrellm1-wireless/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:43 wiz Exp $ - -DISTNAME= gkrellmwireless-0.2.2 -PKGNAME= gkrellm-wireless-0.2.2 -PKGREVISION= 8 -CATEGORIES= net sysutils -MASTER_SITES= http://gkrellm.luon.net/files/ - -MAINTAINER= jasper@pointless.net -HOMEPAGE= http://gkrellm.luon.net/gkrellmwireless.phtml -COMMENT= Wavelan signal strength monitor for gkrellm - -USE_TOOLS+= gmake -INSTALLATION_DIRS= lib/gkrellm/plugins - -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins - ${INSTALL_PROGRAM} ${WRKSRC}/wireless.so ${PREFIX}/lib/gkrellm/plugins/ - -.include "../../graphics/imlib/buildlink3.mk" -.include "../../sysutils/gkrellm1/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/net/gkrellm1-wireless/PLIST b/net/gkrellm1-wireless/PLIST deleted file mode 100644 index cbdda0a6cf6..00000000000 --- a/net/gkrellm1-wireless/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 23:28:35 cube Exp $ -lib/gkrellm/plugins/wireless.so diff --git a/net/gkrellm1-wireless/distinfo b/net/gkrellm1-wireless/distinfo deleted file mode 100644 index 344a1f3d510..00000000000 --- a/net/gkrellm1-wireless/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 12:13:47 agc Exp $ - -SHA1 (gkrellmwireless-0.2.2.tar.gz) = 184d1aa034e4cf4a76d279d8bf0dcc278b134252 -RMD160 (gkrellmwireless-0.2.2.tar.gz) = aafb2ce0ed6d43af7a70e9a944fa3f9bb7c4ff85 -Size (gkrellmwireless-0.2.2.tar.gz) = 7971 bytes -SHA1 (patch-aa) = df80eba1947398684988f199c462185b1ab02c0d -SHA1 (patch-ab) = 562d62972c385ef019be93cbb6f9fe5a0bf05c62 diff --git a/net/gkrellm1-wireless/patches/patch-aa b/net/gkrellm1-wireless/patches/patch-aa deleted file mode 100644 index ccf6abb0d9d..00000000000 --- a/net/gkrellm1-wireless/patches/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:28:35 cube Exp $ - ---- Makefile.orig Sun Sep 9 10:12:41 2001 -+++ Makefile -@@ -12,6 +12,9 @@ - GTK_CONFIG = gtk-config - endif - -+ifeq ($(OS),NetBSD) -+ GTK_CONFIG = gtk-config -+endif - - GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread` - GTK_LIB = `$(GTK_CONFIG) --libs gthread` -@@ -20,17 +23,17 @@ - IMLIB_LIB = `imlib-config --libs-gdk` - - --FLAGS = -g -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(INCLUDE) -+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(INCLUDE) -I${PREFIX}/include - LIBS = $(GTK_LIB) $(IMLIB_LIB) - LFLAGS = -shared - --CC = gcc $(CFLAGS) $(FLAGS) -+CC = gcc $(CFLAGS) - - OBJS = wireless.o - - INSTALL = install -c -s - INSTALL_PERMS = -m 755 --PLUGIN_DIR = /usr/lib/gkrellm/plugins -+PLUGIN_DIR = ${PREFIX}/lib/gkrellm/plugins - - - all: wireless.so diff --git a/net/gkrellm1-wireless/patches/patch-ab b/net/gkrellm1-wireless/patches/patch-ab deleted file mode 100644 index d4d60f41c81..00000000000 --- a/net/gkrellm1-wireless/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2004/09/12 22:19:27 wiz Exp $ - ---- wireless.h.orig 2001-09-09 16:25:55.000000000 +0200 -+++ wireless.h -@@ -31,8 +31,16 @@ - #include <net/if_dl.h> - #include <net/if_ether.h> - #include <net/if_media.h> -+# if __NetBSD_Version__ > 106250000 -+ #include <net80211/ieee80211.h> -+# else - #include <net/if_ieee80211.h> -- #include <dev/pcmcia/if_wi_ieee.h> -+# endif -+# if __NetBSD_Version__ > 105210000 -+ #include <dev/ic/wi_ieee.h> -+# else -+ #include <dev/pcmcia/if_wi_ieee.h> -+# endif - #endif - - #define PLUGIN_CONFIG_KEYWORD "gkrellmwireless" diff --git a/sysutils/Makefile b/sysutils/Makefile index cc7d0942144..c5cb3dae78d 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.390 2007/03/13 17:40:26 obache Exp $ +# $NetBSD: Makefile,v 1.391 2007/04/01 21:36:17 wiz Exp $ # COMMENT= System utilities @@ -102,7 +102,6 @@ SUBDIR+= gkrellm SUBDIR+= gkrellm-est SUBDIR+= gkrellm-server SUBDIR+= gkrellm-share -SUBDIR+= gkrellm1 SUBDIR+= gkx86info SUBDIR+= gnome-menus SUBDIR+= gnome-pkgview diff --git a/sysutils/gkrellm1/DESCR b/sysutils/gkrellm1/DESCR deleted file mode 100644 index da90c4a04d6..00000000000 --- a/sysutils/gkrellm1/DESCR +++ /dev/null @@ -1,24 +0,0 @@ -With a single process, GKrellM manages multiple stacked monitors and supports -applying themes to match the monitors appearance to your window manager, -Gtk, or any other theme. - - * SMP CPU, Disk, Proc, and active net interface monitors with LEDs. - * Internet monitor that displays current and charts historical port hits - - * Memory and swap space usage meters and a system uptime monitor. - * File system meters show capacity/free space and can mount/umount. - * A mailbox monitor which can launch mail reader, remote mail fetch. - * Clock/calendar and hostname display. - * APM laptop battery monitor. - * CPU/motherboard temperature display if lm_sensors modules installed. - - * Multiple monitors managed by a single process to reduce system load. - * A timer button that can execute PPP or ISDN logon/logoff scripts. - * Charts are autoscaling with configurable grid line resolution, or - can be set to a fixed scale mode. - * Separate colors for "in" and "out" data. The in color is used for - CPU user time, disk read, forks, and net receive data. The out color - is used for CPU sys time, disk write, load, and net transmit data. - * Commands can be configured to run when monitor labels are clicked. - * GKrellM is plugin capable so special interest monitors can be created. - * A different theme can be created with the GIMP. diff --git a/sysutils/gkrellm1/Makefile b/sysutils/gkrellm1/Makefile deleted file mode 100644 index 6543ab60567..00000000000 --- a/sysutils/gkrellm1/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# $NetBSD: Makefile,v 1.13 2006/06/27 21:55:04 wiz Exp $ -# - -DISTNAME= gkrellm-1.2.13 -PKGREVISION= 6 -CATEGORIES= sysutils -MASTER_SITES= http://web.wt.net/~billw/gkrellm/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://gkrellm.net/ -COMMENT= GTK based system monitor - -OSVERSION_SPECIFIC= YES -USE_TOOLS+= gmake msgfmt -USE_PKGLOCALEDIR= YES - -CONFLICTS+= gkrellm-share>=2.0 - -BUILD_TARGET= netbsd -INSTALL_TARGET= install_netbsd - -MAKE_ENV+= PTHREAD_INC="-I${LOCALBASE}/include" -MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q} - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/gkrellm - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins - ${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm/themes - -.include "../../graphics/imlib/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gkrellm1/PLIST b/sysutils/gkrellm1/PLIST deleted file mode 100644 index 42954a15bc7..00000000000 --- a/sysutils/gkrellm1/PLIST +++ /dev/null @@ -1,20 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:34 jlam Exp $ -bin/gkrellm -include/gkrellm/gkrellm.h -include/gkrellm/gkrellm_public_proto.h -man/man1/gkrellm.1 -@exec ${MKDIR} %D/share/gkrellm/themes -@exec ${MKDIR} %D/lib/gkrellm/plugins -share/gkrellm/README -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 -share/locale/pl/LC_MESSAGES/gkrellm.mo -share/locale/ru/LC_MESSAGES/gkrellm.mo -share/locale/sv/LC_MESSAGES/gkrellm.mo -@dirrm include/gkrellm -@dirrm lib/gkrellm/plugins -@dirrm lib/gkrellm -@dirrm share/gkrellm/themes -@dirrm share/gkrellm diff --git a/sysutils/gkrellm1/buildlink3.mk b/sysutils/gkrellm1/buildlink3.mk deleted file mode 100644 index bbd29184c5b..00000000000 --- a/sysutils/gkrellm1/buildlink3.mk +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:09 jlam Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GKRELLM_BUILDLINK3_MK:= ${GKRELLM_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gkrellm -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngkrellm} -BUILDLINK_PACKAGES+= gkrellm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gkrellm - -.if !empty(GKRELLM_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.gkrellm+= gkrellm<2.0 -BUILDLINK_ABI_DEPENDS.gkrellm?= gkrellm>=1.2.13nb6 -BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm1 -.endif # GKRELLM_BUILDLINK3_MK - -.include "../../graphics/imlib/buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/gkrellm1/distinfo b/sysutils/gkrellm1/distinfo deleted file mode 100644 index 0b5b051f4b9..00000000000 --- a/sysutils/gkrellm1/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: distinfo,v 1.4 2005/09/06 08:10:59 abs Exp $ - -SHA1 (gkrellm-1.2.13.tar.bz2) = ab0282e663b69ecf0d622ad7c02db0c72b793bd3 -RMD160 (gkrellm-1.2.13.tar.bz2) = a5d9b7e439788613ebab9718aa05eff0c39d0a9a -Size (gkrellm-1.2.13.tar.bz2) = 438917 bytes -SHA1 (patch-aa) = c2656b0d5372ef1e26479ccedcbd05f4e6dbb5e3 -SHA1 (patch-ab) = a2f1d4b4a253323b6623200c1fca4e0cee0d46f2 -SHA1 (patch-ac) = 0bdbe9b788e62e4732ec87a1d6d8dbcacde7da82 -SHA1 (patch-ad) = 4de2da50a6bd95c6e9d564f933ec19008771624c diff --git a/sysutils/gkrellm1/patches/patch-aa b/sysutils/gkrellm1/patches/patch-aa deleted file mode 100644 index daa8328d706..00000000000 --- a/sysutils/gkrellm1/patches/patch-aa +++ /dev/null @@ -1,80 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 22:06:57 cube Exp $ - ---- Makefile.top_enable_nls.orig Wed Dec 5 08:41:15 2001 -+++ Makefile.top_enable_nls -@@ -31,8 +31,11 @@ - # Default - #-------- - GTK_CONFIG = gtk-config -+IMLIB_CONFIG = imlib-config - EXTRAOBJS = md5c.o - BINMODE = 755 -+BINGRP = wheel -+PREFIX ?= /usr/local - - # FreeBSD 2.X - #------------ -@@ -53,12 +56,17 @@ - - # NetBSD or OpenBSD - #------------------ --#GTK_CONFIG= gtk-config --#GTOP_LIBS= --#PTHREAD_INC=-I/usr/local/include --#SYS_LIBS=-lkvm --#EXTRAOBJS = --#BINMODE=2755 -+GTK_CONFIG ?= gtk-config -+IMLIB_CONFIG ?= imlib-config -+GTOP_INCLUDE = -+GTOP_LIBS = -+PTHREAD_INC ?= -I/usr/pkg/include -+EXTRAOBJS = -+LINK_FLAGS = $(EXPORT_SYMBOLS_LDFLAGS) -+LOCALEDIR = ${PREFIX}/share/locale -+MANDIR = ${PREFIX}/man/man1 -+BINMODE = 2755 -+BINGRP = kmem - - # Solaris 2.x - #------------ -@@ -75,21 +83,23 @@ - # used if you "make gnome-gtop" or "make gtop". - #----------------------------------- - GTOP_PREFIX = /usr --GTOP_INCLUDE = -I$(GTOP_PREFIX)/include --GTOP_LIBS = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps -lXau -+GTOP_INCLUDE ?= -I$(GTOP_PREFIX)/include -+GTOP_LIBS ?= -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps -lXau - - --INSTALLDIR=/usr/local/bin --MANDIR=/usr/local/share/man/man1 -+PREFIX ?= /usr/local -+INSTALLDIR ?= ${PREFIX}/bin -+MANDIR ?= ${PREFIX}/share/man/man1 - MANMODE = 644 - MANDIRMODE = 755 --INCLUDEDIR=/usr/local/include -+INCLUDEDIR ?= ${PREFIX}/include - INCLUDEMODE = 644 - INCLUDEDIRMODE = 755 - - LOCALEDIR ?= /usr/share/locale - - export GTK_CONFIG GTOP_INCLUDE GTOP_LIBS SYS_LIBS EXTRAOBJS BINMODE -+export BINGRP IMLIB_CONFIG LINK_FLAGS PREFIX - export INSTALLDIR INCLUDEDIR INCLUDEMODE INCLUDEDIRMODE LOCALEDIR - export MANDIR MANDIRMODE MANMODE - -@@ -132,9 +142,7 @@ - - netbsd: - (cd po && ${MAKE} all) -- (cd src && ${MAKE} GTK_CONFIG=gtk-config GTOP_LIBS= GTOP_INCLUDE= \ -- PTHREAD_INC=-I/usr/local/include EXTRAOBJS= \ -- SYS_LIBS="-lkvm" gkrellm ) -+ (cd src && ${MAKE} SYS_LIBS="-lkvm" gkrellm ) - - openbsd: - (cd po && ${MAKE} all) diff --git a/sysutils/gkrellm1/patches/patch-ab b/sysutils/gkrellm1/patches/patch-ab deleted file mode 100644 index 96c21a83c41..00000000000 --- a/sysutils/gkrellm1/patches/patch-ab +++ /dev/null @@ -1,87 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/02/24 22:06:57 cube Exp $ - ---- src/Makefile.src.orig Mon Jul 1 04:13:04 2002 -+++ src/Makefile.src Sat Feb 15 10:06:54 2003 -@@ -1,30 +1,36 @@ - GTK_CONFIG ?= gtk-config -+IMLIB_CONFIG ?= imlib-config -+PREFIX ?= /usr/local - EXTRAOBJS ?= md5c.o - BINMODE ?= 755 --INSTALLDIR ?= /usr/local/bin --INCLUDEDIR ?= /usr/local/include -+BINGRP ?= wheel -+INSTALLDIR ?= ${PREFIX}/bin -+INCLUDEDIR ?= ${PREFIX}/include - INCLUDEMODE ?= 644 - INCLUDEDIRMODE ?= 755 --MANDIR ?= /usr/local/share/man/man1 -+MANDIR ?= ${PREFIX}/man/man1 - MANMODE ?= 644 - MANDIRMODE ?= 755 - INSTALL ?= install --LINK_FLAGS ?= -Wl,-E -+LINK_FLAGS ?= $(EXPORT_SYMBOLS_LDFLAGS) - CC ?= gcc - STRIP ?= -s - - GKRELLM_INCLUDES = gkrellm.h gkrellm_public_proto.h - - GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread` --IMLIB_INCLUDE = `imlib-config --cflags-gdk` -+IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk` - - GTK_LIB = `$(GTK_CONFIG) --libs gthread` --IMLIB_LIB = `imlib-config --libs-gdk` -+IMLIB_LIB = `$(IMLIB_CONFIG) --libs-gdk` - --FLAGS = -O2 -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE) -+FLAGS = -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE) - FLAGS+= $(PTHREAD_INC) -+FLAGS+= -DSYSTEM_PLUGINS_DIR=\"${PREFIX}/lib/gkrellm/plugins\" -+FLAGS+= -DSYSTEM_THEMES_DIR=\"${PREFIX}/share/gkrellm/themes\" -+ -+LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS) $(LINK_FLAGS) - --LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS) - - ifeq ($(debug),1) - FLAGS += -g -@@ -38,7 +44,9 @@ - FLAGS += -DHAVE_GETADDRINFO - endif - --CC += -Wall $(FLAGS) -+CC ?= gcc -+CFLAGS ?= -O2 -+CC += -Wall $(FLAGS) $(CFLAGS) - - OBJS = main.o alerts.o apm.o base64.o clock.o cpu.o disk.o fs.o hostname.o \ - inet.o mail.o meminfo.o net.o proc.o sensors.o uptime.o \ -@@ -68,15 +76,14 @@ - gkrellm - - netbsd: -- $(MAKE) PTHREAD_INC=-I/usr/local/include \ -- GTK_CONFIG=gtk-config GTOP_LIBS= EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm -+ $(MAKE) GTOP_LIBS= EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm - - solaris: - $(MAKE) CFLAGS="-Wno-implicit-int" \ - SYS_LIBS="-lkstat -lkvm -ldevinfo" gkrellm - - install: -- $(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellm $(INSTALLDIR)/gkrellm -+ $(INSTALL) -c $(STRIP) -m $(BINMODE) -g $(BINGRP) gkrellm $(INSTALLDIR)/gkrellm - $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm - $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm - $(INSTALL) -d -m $(MANDIRMODE) $(MANDIR) -@@ -87,8 +94,6 @@ - - install_netbsd: - $(MAKE) install -- chgrp kmem $(INSTALLDIR)/gkrellm -- chmod g+s $(INSTALLDIR)/gkrellm - - install_openbsd: - $(MAKE) install diff --git a/sysutils/gkrellm1/patches/patch-ac b/sysutils/gkrellm1/patches/patch-ac deleted file mode 100644 index 2428d85b7c1..00000000000 --- a/sysutils/gkrellm1/patches/patch-ac +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/02/24 22:06:57 cube Exp $ - ---- src/disk.c.orig Tue Jan 1 15:08:07 2002 -+++ src/disk.c -@@ -446,10 +446,24 @@ - * d.xfer value (number of transfers) but there a scaling problem: - * d.xfer is usually much more smaller thant d.dk_bytes... */ - -+ /* Separate read/write stats were implemented in NetBSD 1.6K. */ -+ - disk = (DiskMon *) list->data; -- disk->rblk = d.dk_bytes / 512; /* block size hardcoded : -- * d.dk_byteshift is always 0 ?? */ -+#if __NetBSD_Version__ >= 106110000 -+ /* d.dk_byteshift is not set in, or used, by the kernel as of -+ * NetBSD 1.6K, but maybe one day... In the meantime, NetBSD -+ * only supports a blocksize of 512 == 2^^9, so assume that. */ -+ if (d.dk_byteshift == 0) { -+ disk->rblk = d.dk_rbytes >> 9; -+ disk->wblk = d.dk_wbytes >> 9; -+ } else { -+ disk->rblk = d.dk_rbytes / d.dk_byteshift; -+ disk->wblk = d.dk_wbytes / d.dk_byteshift; -+ } -+#else -+ disk->rblk = d.dk_bytes >> 9; - disk->wblk = 0; -+#endif - - composite_disk->rblk += disk->rblk; - composite_disk->wblk += disk->wblk; /* useless, isn't it ? :-D */ diff --git a/sysutils/gkrellm1/patches/patch-ad b/sysutils/gkrellm1/patches/patch-ad deleted file mode 100644 index 407ff4eaf2e..00000000000 --- a/sysutils/gkrellm1/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2005/09/06 08:10:59 abs Exp $ - ---- src/fs.c.orig 2002-06-30 21:20:15.000000000 -0500 -+++ src/fs.c -@@ -35,6 +35,10 @@ - #include "gkrellm_private_proto.h" - #include "gkrellm_threads.h" - -+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900) /* NetBSD 2.99.9 */ -+#define statfs statvfs -+#endif -+ - typedef struct - { - gchar *directory; |