Sun Nov 28 20:52:44 2010 UTC ()
Fix PR 44163 by setting PREFIX correctly within the package. While
here, add patch comments and remove pkglint. PKGREVISION -> 7.


(dholland)
diff -r1.34 -r1.35 pkgsrc/misc/gkrellm-weather/Makefile
diff -r1.5 -r1.6 pkgsrc/misc/gkrellm-weather/distinfo
diff -r1.2 -r1.3 pkgsrc/misc/gkrellm-weather/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/misc/gkrellm-weather/patches/patch-ab
cvs diff -r1.34 -r1.35 pkgsrc/misc/gkrellm-weather/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/gkrellm-weather/Makefile 2010/11/15 22:57:56 1.34
+++ pkgsrc/misc/gkrellm-weather/Makefile 2010/11/28 20:52:44 1.35
@@ -1,45 +1,44 @@ @@ -1,45 +1,44 @@
1# $NetBSD: Makefile,v 1.34 2010/11/15 22:57:56 abs Exp $ 1# $NetBSD: Makefile,v 1.35 2010/11/28 20:52:44 dholland Exp $
2 2
3DISTNAME= gkrellweather-2.0.7 3DISTNAME= gkrellweather-2.0.7
4PKGNAME= gkrellm-weather-2.0.7 4PKGNAME= gkrellm-weather-2.0.7
5PKGREVISION= 6 5PKGREVISION= 7
6CATEGORIES= misc 6CATEGORIES= misc
7MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/ 7MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= tripledes@eslack.org 10MAINTAINER= tripledes@eslack.org
11HOMEPAGE= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/ 11HOMEPAGE= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
12COMMENT= Gkrellm2 weather plugin 12COMMENT= Gkrellm2 weather plugin
13 13
14DEPENDS+= wget>=1.8:../../net/wget 14DEPENDS+= wget>=1.8:../../net/wget
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18USE_TOOLS+= gmake msgfmt perl:run pkg-config 18USE_TOOLS+= gmake msgfmt perl:run pkg-config
19USE_PKGLOCALEDIR= YES 19USE_PKGLOCALEDIR= YES
20REPLACE_PERL= GrabWeather 20REPLACE_PERL= GrabWeather
21BUILD_TARGET= gkrellweather.so 21BUILD_TARGET= gkrellweather.so
22 22
23MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale 23LOCALEDIR= ${PREFIX}/${PKGLOCALEDIR}/locale
24MAKE_ENV+= enable_nls=1 24INSTALLATION_DIRS= bin lib lib/gkrellm2/plugins
25MAKE_ENV+= PREFIX=${PREFIX:Q} 
26 25
27INSTALLATION_DIRS= bin lib 26MAKE_ENV+= LOCALEDIR=${LOCALEDIR}
 27MAKE_ENV+= enable_nls=1
28 28
29do-install: 29do-install:
30 ${INSTALL_SCRIPT} ${WRKSRC}/GrabWeather ${DESTDIR}${PREFIX}/bin 30 ${INSTALL_SCRIPT} ${WRKSRC}/GrabWeather ${DESTDIR}${PREFIX}/bin
31 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib/gkrellm2/plugins 
32 ${INSTALL_LIB} ${WRKSRC}/gkrellweather.so \ 31 ${INSTALL_LIB} ${WRKSRC}/gkrellweather.so \
33 ${DESTDIR}${PREFIX}/lib/gkrellm2/plugins 32 ${DESTDIR}${PREFIX}/lib/gkrellm2/plugins
34 cd ${WRKSRC}/po && for f in *.mo; do \ 33 set -e; cd ${WRKSRC}/po && for f in *.mo; do \
35 localedir=${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale; \ 34 base=`basename "$$f" .mo`; \
36 modir=$${localedir}/$$(basename $$f .mo)/LC_MESSAGES; \ 35 modir=${DESTDIR}${LOCALEDIR}/"$${base}"/LC_MESSAGES; \
37 ${INSTALL_DATA_DIR} $${modir}; \ 36 ${INSTALL_DATA_DIR} "$${modir}"; \
38 ${INSTALL_DATA} $$f $${modir}/gkrellweather.mo; \ 37 ${INSTALL_DATA} "$$f" "$${modir}"/gkrellweather.mo; \
39 done 38 done
40 39
41.include "../../sysutils/gkrellm/buildlink3.mk" 40.include "../../sysutils/gkrellm/buildlink3.mk"
42.include "../../x11/gtk2/buildlink3.mk" 41.include "../../x11/gtk2/buildlink3.mk"
43.include "../../mk/pthread.buildlink3.mk" 42.include "../../mk/pthread.buildlink3.mk"
44 43
45.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/misc/gkrellm-weather/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/gkrellm-weather/distinfo 2006/08/13 13:01:44 1.5
+++ pkgsrc/misc/gkrellm-weather/distinfo 2010/11/28 20:52:44 1.6
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.5 2006/08/13 13:01:44 xtraeme Exp $ 1$NetBSD: distinfo,v 1.6 2010/11/28 20:52:44 dholland Exp $
2 2
3SHA1 (gkrellweather-2.0.7.tgz) = 53f62999a4aff018f6943b8b56dd9e54907754c3 3SHA1 (gkrellweather-2.0.7.tgz) = 53f62999a4aff018f6943b8b56dd9e54907754c3
4RMD160 (gkrellweather-2.0.7.tgz) = a8f92a45ea048c194970f5615e50c4b08120efe0 4RMD160 (gkrellweather-2.0.7.tgz) = a8f92a45ea048c194970f5615e50c4b08120efe0
5Size (gkrellweather-2.0.7.tgz) = 19968 bytes 5Size (gkrellweather-2.0.7.tgz) = 19968 bytes
6SHA1 (patch-aa) = ab3068c247a1e8cc2c9f636aa5b10d317c93ac04 6SHA1 (patch-aa) = 2c4850e84b873c3b3dbc2d1cf41123a9e2fffbce
7SHA1 (patch-ab) = a8b0a0f1435bc968ce182bdef2fe8cf4c8e83a3d 7SHA1 (patch-ab) = e7ee2c8b3f4302b4b733ed668fae25746530cd8c
cvs diff -r1.2 -r1.3 pkgsrc/misc/gkrellm-weather/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/misc/gkrellm-weather/patches/patch-aa 2004/02/24 23:15:55 1.2
+++ pkgsrc/misc/gkrellm-weather/patches/patch-aa 2010/11/28 20:52:44 1.3
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-aa,v 1.2 2004/02/24 23:15:55 cube Exp $ 1$NetBSD: patch-aa,v 1.3 2010/11/28 20:52:44 dholland Exp $
 2
 3Find GrabWeather where we install it.
2 4
3--- gkrellweather.c.orig 2003-11-02 12:05:08.000000000 +0000 5--- gkrellweather.c.orig 2003-11-02 12:05:08.000000000 +0000
4+++ gkrellweather.c 2003-11-02 12:05:23.000000000 +0000 6+++ gkrellweather.c 2003-11-02 12:05:23.000000000 +0000
5@@ -983,7 +983,7 @@ 7@@ -983,7 +983,7 @@
6 options.windspeed_unit = 1; 8 options.windspeed_unit = 1;
7 options.pressure_unit = 1; 9 options.pressure_unit = 1;
8 strcpy(options.station, DEFAULT_STATION_ID); 10 strcpy(options.station, DEFAULT_STATION_ID);
9- sprintf(options.command, "/usr/share/gkrellm/GrabWeather %s", options.station); 11- sprintf(options.command, "/usr/share/gkrellm/GrabWeather %s", options.station);
10+ sprintf(options.command, "GrabWeather %s", options.station); 12+ sprintf(options.command, "%s/bin/GrabWeather %s", PREFIX, options.station);
11 sprintf(options.filename, "%s/.wmWeatherReports/%s.dat", 13 sprintf(options.filename, "%s/.wmWeatherReports/%s.dat",
12 getenv("HOME"), options.station); 14 getenv("HOME"), options.station);
13 } 15 }
cvs diff -r1.1 -r1.2 pkgsrc/misc/gkrellm-weather/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/misc/gkrellm-weather/patches/patch-ab 2006/03/25 17:29:45 1.1
+++ pkgsrc/misc/gkrellm-weather/patches/patch-ab 2010/11/28 20:52:44 1.2
@@ -1,13 +1,36 @@ @@ -1,13 +1,36 @@
1$NetBSD: patch-ab,v 1.1 2006/03/25 17:29:45 joerg Exp $ 1$NetBSD: patch-ab,v 1.2 2010/11/28 20:52:44 dholland Exp $
2 2
3--- Makefile.orig 2003-03-31 11:12:57.000000000 +0000 3- use pkgsrc-provided PREFIX and LOCALEDIR
 4- fix pthread linkage
 5
 6--- Makefile.orig 2005-02-27 13:54:47.000000000 +0000
4+++ Makefile 7+++ Makefile
 8@@ -3,16 +3,16 @@ VERSION = 2.0.7
 9 CFLAGS = -O2 -std=gnu99 -Wall -fPIC `pkg-config gtk+-2.0 --cflags`
 10 LIBS = `pkg-config gtk+-2.0 --libs`
 11 LFLAGS = -shared
 12-PREFIX = /usr/local
 13+#PREFIX = /usr/local
 14
 15-LOCALEDIR := $(PREFIX)/share/locale
 16+#LOCALEDIR := $(PREFIX)/share/locale
 17
 18 ifeq ($(enable_nls),1)
 19 CFLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
 20 export enable_nls
 21 endif
 22 CFLAGS += -DPACKAGE="\"$(PKGNAME)\""
 23-export PKGNAME LOCALEDIR
 24+export PKGNAME #LOCALEDIR
 25
 26 CC = gcc
 27
5@@ -20,7 +20,7 @@ OBJS = gkrellweather.o 28@@ -20,7 +20,7 @@ OBJS = gkrellweather.o
6  29
7 gkrellweather.so: $(OBJS) 30 gkrellweather.so: $(OBJS)
8 (cd po && ${MAKE} all ) 31 (cd po && ${MAKE} all )
9- $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) -lpthread 32- $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) -lpthread
10+ $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 33+ $(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
11  34
12 clean: 35 clean:
13 (cd po && ${MAKE} clean ) 36 (cd po && ${MAKE} clean )