Fix PR 44163 by setting PREFIX correctly within the package. While

here, add patch comments and remove pkglint. PKGREVISION -> 7.

4 files changed, 43 insertions, 19 deletions

diff --git a/misc/gkrellm-weather/Makefile b/misc/gkrellm-weather/Makefile
index d95b577398f..79bcfda8ef5 100644
--- a/misc/gkrellm-weather/Makefile
+++ b/misc/gkrellm-weather/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2010/11/15 22:57:56 abs Exp $
+# $NetBSD: Makefile,v 1.35 2010/11/28 20:52:44 dholland Exp $
 
 DISTNAME=	gkrellweather-2.0.7
 PKGNAME=	gkrellm-weather-2.0.7
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	misc
 MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
 EXTRACT_SUFX=	.tgz
@@ -20,22 +20,21 @@ USE_PKGLOCALEDIR=	YES
 REPLACE_PERL=		GrabWeather
 BUILD_TARGET=		gkrellweather.so
 
-MAKE_ENV+=	LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
-MAKE_ENV+=	enable_nls=1
-MAKE_ENV+=	PREFIX=${PREFIX:Q}
+LOCALEDIR=		${PREFIX}/${PKGLOCALEDIR}/locale
+INSTALLATION_DIRS=	bin lib lib/gkrellm2/plugins
 
-INSTALLATION_DIRS=	bin lib
+MAKE_ENV+=	LOCALEDIR=${LOCALEDIR}
+MAKE_ENV+=	enable_nls=1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/GrabWeather ${DESTDIR}${PREFIX}/bin
-	${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib/gkrellm2/plugins
 	${INSTALL_LIB} ${WRKSRC}/gkrellweather.so \
 	    ${DESTDIR}${PREFIX}/lib/gkrellm2/plugins
-	cd ${WRKSRC}/po && for f in *.mo; do \
-	    localedir=${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale; \
-	    modir=$${localedir}/$$(basename $$f .mo)/LC_MESSAGES; \
-	    ${INSTALL_DATA_DIR} $${modir}; \
-	    ${INSTALL_DATA} $$f $${modir}/gkrellweather.mo; \
+	set -e; cd ${WRKSRC}/po && for f in *.mo; do \
+	    base=`basename "$$f" .mo`;					\
+	    modir=${DESTDIR}${LOCALEDIR}/"$${base}"/LC_MESSAGES;	\
+	    ${INSTALL_DATA_DIR} "$${modir}";				\
+	    ${INSTALL_DATA} "$$f" "$${modir}"/gkrellweather.mo;		\
 	done
 
 .include "../../sysutils/gkrellm/buildlink3.mk"
diff --git a/misc/gkrellm-weather/distinfo b/misc/gkrellm-weather/distinfo
index 9e65bf60d63..da2133398fa 100644
--- a/misc/gkrellm-weather/distinfo
+++ b/misc/gkrellm-weather/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2006/08/13 13:01:44 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2010/11/28 20:52:44 dholland Exp $
 
 SHA1 (gkrellweather-2.0.7.tgz) = 53f62999a4aff018f6943b8b56dd9e54907754c3
 RMD160 (gkrellweather-2.0.7.tgz) = a8f92a45ea048c194970f5615e50c4b08120efe0
 Size (gkrellweather-2.0.7.tgz) = 19968 bytes
-SHA1 (patch-aa) = ab3068c247a1e8cc2c9f636aa5b10d317c93ac04
-SHA1 (patch-ab) = a8b0a0f1435bc968ce182bdef2fe8cf4c8e83a3d
+SHA1 (patch-aa) = 2c4850e84b873c3b3dbc2d1cf41123a9e2fffbce
+SHA1 (patch-ab) = e7ee2c8b3f4302b4b733ed668fae25746530cd8c
diff --git a/misc/gkrellm-weather/patches/patch-aa b/misc/gkrellm-weather/patches/patch-aa
index ab88bed5dbc..08d7fb46efa 100644
--- a/misc/gkrellm-weather/patches/patch-aa
+++ b/misc/gkrellm-weather/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2004/02/24 23:15:55 cube Exp $
+$NetBSD: patch-aa,v 1.3 2010/11/28 20:52:44 dholland Exp $
+
+Find GrabWeather where we install it.
 
 --- gkrellweather.c.orig	2003-11-02 12:05:08.000000000 +0000
 +++ gkrellweather.c	2003-11-02 12:05:23.000000000 +0000
@@ -7,7 +9,7 @@ $NetBSD: patch-aa,v 1.2 2004/02/24 23:15:55 cube Exp $
      options.pressure_unit = 1;
      strcpy(options.station, DEFAULT_STATION_ID);
 -    sprintf(options.command, "/usr/share/gkrellm/GrabWeather %s", options.station);
-+    sprintf(options.command, "GrabWeather %s", options.station);
++    sprintf(options.command, "%s/bin/GrabWeather %s", PREFIX, options.station);
      sprintf(options.filename, "%s/.wmWeatherReports/%s.dat",
              getenv("HOME"), options.station);
  }
diff --git a/misc/gkrellm-weather/patches/patch-ab b/misc/gkrellm-weather/patches/patch-ab
index cd80c94b44b..50a5334d88a 100644
--- a/misc/gkrellm-weather/patches/patch-ab
+++ b/misc/gkrellm-weather/patches/patch-ab
@@ -1,7 +1,30 @@
-$NetBSD: patch-ab,v 1.1 2006/03/25 17:29:45 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2010/11/28 20:52:44 dholland Exp $
 
---- Makefile.orig	2003-03-31 11:12:57.000000000 +0000
+- use pkgsrc-provided PREFIX and LOCALEDIR
+- fix pthread linkage
+
+--- Makefile.orig	2005-02-27 13:54:47.000000000 +0000
 +++ Makefile
+@@ -3,16 +3,16 @@ VERSION = 2.0.7
+ CFLAGS = -O2 -std=gnu99 -Wall -fPIC `pkg-config gtk+-2.0 --cflags`
+ LIBS = `pkg-config gtk+-2.0 --libs`
+ LFLAGS = -shared
+-PREFIX = /usr/local
++#PREFIX = /usr/local
+ 
+-LOCALEDIR := $(PREFIX)/share/locale
++#LOCALEDIR := $(PREFIX)/share/locale
+ 
+ ifeq ($(enable_nls),1)
+     CFLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
+     export enable_nls
+ endif
+ CFLAGS += -DPACKAGE="\"$(PKGNAME)\""
+-export PKGNAME LOCALEDIR
++export PKGNAME #LOCALEDIR
+ 
+ CC = gcc
+ 
 @@ -20,7 +20,7 @@ OBJS = gkrellweather.o
  
  gkrellweather.so: $(OBJS)