From 9a2212e51a989baba79403a94ebdf9085b80a89c Mon Sep 17 00:00:00 2001 From: cube Date: Tue, 24 Feb 2004 23:12:37 +0000 Subject: Update to version 0.6. This is the GKrellM-2 port of the moon plugin. --- misc/gkrellm-moon/DESCR | 2 +- misc/gkrellm-moon/Makefile | 26 ++++++++++++-------------- misc/gkrellm-moon/PLIST | 4 ++-- misc/gkrellm-moon/distinfo | 8 ++++---- misc/gkrellm-moon/patches/patch-aa | 35 +++++++++++++++-------------------- 5 files changed, 34 insertions(+), 41 deletions(-) diff --git a/misc/gkrellm-moon/DESCR b/misc/gkrellm-moon/DESCR index 7fa851bba24..39c9ee3e394 100644 --- a/misc/gkrellm-moon/DESCR +++ b/misc/gkrellm-moon/DESCR @@ -1,2 +1,2 @@ -gkrellmoon is a moon clock plugin for gkrellm. It shows the +gkrellmoon is a moon clock plugin for gkrellm. It shows the current phase of the moon. diff --git a/misc/gkrellm-moon/Makefile b/misc/gkrellm-moon/Makefile index f4450d25089..14e35a4ff5e 100644 --- a/misc/gkrellm-moon/Makefile +++ b/misc/gkrellm-moon/Makefile @@ -1,19 +1,17 @@ -# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:46 reed Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/24 23:12:37 cube Exp $ +# -DISTNAME= gkrellmoon-0.3 -PKGNAME= gkrellm-moon-0.3 -PKGREVISION= 4 -CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gkrellmoon/} +DISTNAME= gkrellmoon-0.6 +PKGNAME= gkrellm-moon-0.6 +CATEGORIES= misc +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gkrellmoon/} -MAINTAINER= damon@NetBSD.org -HOMEPAGE= http://gkrellmoon.sourceforge.net/ -COMMENT= gkrellm moonclock plugin +MAINTAINER= cube@NetBSD.org +HOMEPAGE= http://gkrellmoon.sourceforge.net/ +COMMENT= GKrellM2 moonclock plugin -USE_BUILDLINK2= YES +USE_BUILDLINK3= yes +ALL_TARGET= gkrellmoon.so -pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins - -.include "../../sysutils/gkrellm/buildlink2.mk" +.include "../../sysutils/gkrellm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gkrellm-moon/PLIST b/misc/gkrellm-moon/PLIST index d695710033e..9eeac47a094 100644 --- a/misc/gkrellm-moon/PLIST +++ b/misc/gkrellm-moon/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:28:06 zuntum Exp $ -lib/gkrellm/plugins/gkrellmoon.so +@comment $NetBSD: PLIST,v 1.2 2004/02/24 23:12:38 cube Exp $ +lib/gkrellm2/plugins/gkrellmoon.so diff --git a/misc/gkrellm-moon/distinfo b/misc/gkrellm-moon/distinfo index f2f5f676529..688b23951b7 100644 --- a/misc/gkrellm-moon/distinfo +++ b/misc/gkrellm-moon/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/10/30 13:24:25 damon Exp $ +$NetBSD: distinfo,v 1.2 2004/02/24 23:12:38 cube Exp $ -SHA1 (gkrellmoon-0.3.tar.gz) = 13c774ab2acc9cadc157c7cf16776c3b6bfb42f1 -Size (gkrellmoon-0.3.tar.gz) = 51988 bytes -SHA1 (patch-aa) = 1af28d177f7ecaabcd41608d12685398f541c33d +SHA1 (gkrellmoon-0.6.tar.gz) = 17c59576d422e921fc05c9ebfc5ae68b7ec2bac4 +Size (gkrellmoon-0.6.tar.gz) = 55035 bytes +SHA1 (patch-aa) = 7759b9ad16353169747bbad1d624447b8bb24576 diff --git a/misc/gkrellm-moon/patches/patch-aa b/misc/gkrellm-moon/patches/patch-aa index 9216ebc2d27..6c8ab77a488 100644 --- a/misc/gkrellm-moon/patches/patch-aa +++ b/misc/gkrellm-moon/patches/patch-aa @@ -1,33 +1,28 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/10/30 13:24:25 damon Exp $ +$NetBSD: patch-aa,v 1.2 2004/02/24 23:12:38 cube Exp $ ---- Makefile.orig Sat Oct 20 01:40:33 2001 +--- Makefile.orig 2002-12-11 04:36:06.000000000 +0100 +++ 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 +@@ -1,14 +1,14 @@ + GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags` + GTK_LIB = `pkg-config gtk+-2.0 --libs` +-INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins ++INSTALLDIR = ${PREFIX}/lib/gkrellm2/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) + + FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) + LIBS = $(GTK_LIB) LFLAGS = -shared -CC = gcc $(CFLAGS) $(FLAGS) -+CC = gcc $(CFLAGS) ++CC += $(CFLAGS) $(FLAGS) 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 @@ +@@ -23,4 +23,5 @@ gkrellmoon.o: gkrellmoon.c moon_60.xpm # %.o: %.c install: gkrellmoon.so -- sudo install -c -s -m 644 gkrellmoon.so $(INSTALLDIR) -+ install -c -s -m 644 gkrellmoon.so $(INSTALLDIR) +- install -c -s -m 644 gkrellmoon.so $(INSTALLDIR) ++ $(BSD_INSTALL_DATA_DIR) $(INSTALLDIR) ++ $(BSD_INSTALL_DATA) gkrellmoon.so $(INSTALLDIR) -- cgit v1.2.3