diff options
| -rw-r--r-- | sysutils/gkfreq/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/gkfreq/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/gkfreq/files/Makefile | 24 | ||||
| -rw-r--r-- | sysutils/gkfreq/files/patch-Makefile | 30 | ||||
| -rw-r--r-- | sysutils/gkfreq/files/patch-gkfreq.c | 16 |
5 files changed, 42 insertions, 41 deletions
diff --git a/sysutils/gkfreq/Makefile b/sysutils/gkfreq/Makefile index 91d3c432a587..ed7af84defcd 100644 --- a/sysutils/gkfreq/Makefile +++ b/sysutils/gkfreq/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gkfreq -PORTVERSION= 0.1.1 -PORTREVISION= 1 +PORTVERSION= 1.0 #PORTREVISION= 0 CATEGORIES= sysutils +DISTNAME= gkrellm-gkfreq-${PORTVERSION} MASTER_SITES= http://www.peakunix.net/downloads/ MAINTAINER= ume@FreeBSD.org @@ -22,7 +22,4 @@ PLIST_FILES= libexec/gkrellm2/plugins/gkfreq.so USE_X_PREFIX= yes -post-patch: - @${CP} ${FILESDIR}/Makefile ${WRKSRC} - .include <bsd.port.mk> diff --git a/sysutils/gkfreq/distinfo b/sysutils/gkfreq/distinfo index e5acc67c849d..c9457d1d8e34 100644 --- a/sysutils/gkfreq/distinfo +++ b/sysutils/gkfreq/distinfo @@ -1,3 +1,3 @@ -MD5 (gkfreq-0.1.1.tar.gz) = d4186d02a9fbc55bbf1854399e78946a -SHA256 (gkfreq-0.1.1.tar.gz) = 4a1692246cd4562ad59af966aa033595b1a9dc0a9ec403616263db5bc48547f8 -SIZE (gkfreq-0.1.1.tar.gz) = 9089 +MD5 (gkrellm-gkfreq-1.0.tar.gz) = 84bd000f93b5c98e0e731ff9f5475064 +SHA256 (gkrellm-gkfreq-1.0.tar.gz) = a0ec044e4d7b08eb129ea2d8b5f1e0a29cd4f0c83cf28899c7d4076d8b9ce4ca +SIZE (gkrellm-gkfreq-1.0.tar.gz) = 8893 diff --git a/sysutils/gkfreq/files/Makefile b/sysutils/gkfreq/files/Makefile deleted file mode 100644 index 016e93de9014..000000000000 --- a/sysutils/gkfreq/files/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $FreeBSD$ - -PREFIX?= /usr/X11R6 -PLUGIN_DIR?= ${PREFIX}/libexec/gkrellm2/plugins - -GKRELLM_INCLUDE=-I${PREFIX}/include - -GTK_CONFIG= pkg-config gtk+-2.0 -GTK_CFLAGS= `${GTK_CONFIG} --cflags` - -CFLAGS+= -Wall -fPIC ${GTK_CFLAGS} ${GKRELLM_INCLUDE} - -INSTALL_PROGRAM?=${INSTALL} -s - -all: gkfreq.so - -gkfreq.so: gkfreq.o - ${CC} -Wall -shared -o gkfreq.so gkfreq.o - -install: gkfreq.so - ${INSTALL_PROGRAM} gkfreq.so ${PLUGIN_DIR} - -clean: - rm -f *.o core *.so* *.bak *~ diff --git a/sysutils/gkfreq/files/patch-Makefile b/sysutils/gkfreq/files/patch-Makefile new file mode 100644 index 000000000000..3f55669f91c1 --- /dev/null +++ b/sysutils/gkfreq/files/patch-Makefile @@ -0,0 +1,30 @@ +Index: Makefile +diff -u Makefile.orig Makefile +--- Makefile.orig Thu Aug 11 05:58:26 2005 ++++ Makefile Wed Nov 9 02:42:46 2005 +@@ -1,13 +1,20 @@ +-all: gkfreq.so ++PREFIX?= /usr/X11R6 ++PLUGIN_DIR?= ${PREFIX}/libexec/gkrellm2/plugins ++ ++GKRELLM_INCLUDE=-I${PREFIX}/include ++ ++GTK_CONFIG= pkg-config gtk+-2.0 ++GTK_CFLAGS= `${GTK_CONFIG} --cflags` + +-gkfreq.o: gkfreq.c +- gcc -fPIC -O2 -Wall `pkg-config gtk+-2.0 --cflags` -c gkfreq.c ++CFLAGS+= -Wall -fPIC ${GTK_CFLAGS} ${GKRELLM_INCLUDE} ++ ++all: gkfreq.so + + gkfreq.so: gkfreq.o +- gcc -shared -Wall -o gkfreq.so gkfreq.o ++ ${CC} -shared -Wall -o gkfreq.so gkfreq.o + + clean: + rm -rf *.o *.so + + install: +- cp gkfreq.so ~/.gkrellm2/plugins/ ++ ${INSTALL} -s gkfreq.so ${PLUGIN_DIR} diff --git a/sysutils/gkfreq/files/patch-gkfreq.c b/sysutils/gkfreq/files/patch-gkfreq.c index 4a926ea3191c..9bfb1502e538 100644 --- a/sysutils/gkfreq/files/patch-gkfreq.c +++ b/sysutils/gkfreq/files/patch-gkfreq.c @@ -1,8 +1,8 @@ Index: gkfreq.c diff -u -p gkfreq.c.orig gkfreq.c ---- gkfreq.c.orig Wed Jun 8 01:42:00 2005 -+++ gkfreq.c Tue Jul 5 16:12:29 2005 -@@ -9,6 +9,9 @@ +--- gkfreq.c.orig Fri Aug 12 01:53:22 2005 ++++ gkfreq.c Wed Nov 9 02:28:35 2005 +@@ -10,6 +10,9 @@ #include <sys/time.h> #include <string.h> #include <unistd.h> @@ -12,7 +12,7 @@ diff -u -p gkfreq.c.orig gkfreq.c #define CONFIG_NAME "gkfreq" #define STYLE_NAME "gkfreq" -@@ -17,20 +20,36 @@ static GkrellmMonitor *monitor; +@@ -18,18 +21,34 @@ static GkrellmMonitor *monitor; static GkrellmPanel *panel; static GkrellmDecal *decal_text1; static gint style_id; @@ -31,8 +31,6 @@ diff -u -p gkfreq.c.orig gkfreq.c } +#endif - /* FIXED : whatdoineed2do@yahoo.co.uk - */ static void read_MHz(char* buffer_, size_t bufsz_) { @@ -48,8 +46,8 @@ diff -u -p gkfreq.c.orig gkfreq.c +#else FILE *f; if ( (f = fopen("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r")) == NULL) { - /* this can happen if the the scaling is built as a module but it aint -@@ -44,6 +63,7 @@ void read_MHz(char* buffer_, size_t bufs + +@@ -41,6 +60,7 @@ void read_MHz(char* buffer_, size_t bufs snprintf(buffer_, bufsz_, "%d MHz", i/1000 ); fclose(f); } @@ -57,7 +55,7 @@ diff -u -p gkfreq.c.orig gkfreq.c } static gint -@@ -106,6 +126,12 @@ create_plugin(GtkWidget *vbox, gint firs +@@ -103,6 +123,12 @@ create_plugin(GtkWidget *vbox, gint firs if (first_create) g_signal_connect(G_OBJECT (panel->drawing_area), "expose_event", G_CALLBACK (panel_expose_event), NULL); |