From 6681486fdd480646ee77b0df1c5b23a3ee7939bc Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Fri, 26 Aug 2005 13:59:21 +0000
Subject: explicitly link against libintl instead of indirectly via gtk. fixes
 build on Solaris.

---
 misc/gperiodic/Makefile         |  5 ++++-
 misc/gperiodic/distinfo         |  4 ++--
 misc/gperiodic/patches/patch-aa | 11 ++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'misc')

diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index 9e2f0bdba6e..3ad0088199e 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:20 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/26 13:59:21 grant Exp $
 
 DISTNAME=		gperiodic-2.0.8
 CATEGORIES=		misc x11
@@ -22,6 +22,9 @@ BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 BUILD_TARGET=		gperiodic
 
+LIBS+=			-lintl
+MAKE_ENV+=		LIBS=${LIBS:Q}
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gperiodic/distinfo b/misc/gperiodic/distinfo
index 28b23dbecad..50048549360 100644
--- a/misc/gperiodic/distinfo
+++ b/misc/gperiodic/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2005/04/26 14:53:02 drochner Exp $
+$NetBSD: distinfo,v 1.9 2005/08/26 13:59:21 grant Exp $
 
 SHA1 (gperiodic-2.0.8.tar.gz) = b9d41c02ee8724b799280c7493aa2bb15a2d5cea
 RMD160 (gperiodic-2.0.8.tar.gz) = e799208c2233fbc9530c8e0b6a34fbcdba97931f
 Size (gperiodic-2.0.8.tar.gz) = 125402 bytes
-SHA1 (patch-aa) = 9fe15e0b2cf721db3f4618cec7763f300b2cad69
+SHA1 (patch-aa) = 6292e54cacd3e00972e720b4da155663dc067664
 SHA1 (patch-ab) = 6f79492b0ce20681288323c8b113f6240a649bb2
 SHA1 (patch-ac) = b46b521544d4dff146e8b71e66ac8811b6b8525f
 SHA1 (patch-ad) = 0ec076c13f652737459c2b1bf680338c5da52016
diff --git a/misc/gperiodic/patches/patch-aa b/misc/gperiodic/patches/patch-aa
index 77b9aa193d7..6e293cfd261 100644
--- a/misc/gperiodic/patches/patch-aa
+++ b/misc/gperiodic/patches/patch-aa
@@ -1,15 +1,16 @@
-$NetBSD: patch-aa,v 1.4 2003/12/14 12:38:30 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2005/08/26 13:59:22 grant Exp $
 
---- Makefile.orig	2003-08-09 21:33:27.000000000 +0200
+--- Makefile.orig	2003-08-10 05:33:27.000000000 +1000
 +++ Makefile
 @@ -1,8 +1,8 @@
 -CC=gcc
 -CFLAGS=`pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
-+CC?=gcc
-+CFLAGS+=`pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
- LIBS=`pkg-config --libs gtk+-2.0`
+-LIBS=`pkg-config --libs gtk+-2.0`
 -bindir ?= /usr/bin
 -datadir ?= /usr/share
++CC?=gcc
++CFLAGS+=`pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
++LIBS+=`pkg-config --libs gtk+-2.0`
 +bindir ?= ${PREFIX}/bin
 +datadir ?= ${PREFIX}/share
  
-- 
cgit v1.2.3