From 1b71ab858ab13c389fb611f60af1f141d61fd3a9 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Thu, 8 Feb 2007 00:25:13 +0000
Subject: Made the package work on Solaris by fixing the handling of
 PKGLOCALEDIR.

---
 devel/geany/Makefile         | 10 +++++-----
 devel/geany/distinfo         |  3 ++-
 devel/geany/patches/patch-aa | 13 +++++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 devel/geany/patches/patch-aa

(limited to 'devel/geany')

diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 4ebc7679959..5d87ed05f38 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/02/07 22:12:21 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/08 00:25:13 rillig Exp $
 
 DISTNAME=	geany-0.10
 CATEGORIES=	devel
@@ -8,12 +8,12 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://geany.uvena.de/
 COMMENT=	Geany integrated development environment (IDE)
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
-USE_LANGUAGES=	c c++
-
-BUILDLINK_TRANSFORM+=	rm:-lstdc++
+USE_LANGUAGES=		c c++
+USE_PKGLOCALEDIR=	yes
 MAKE_FLAGS+=		CCLD=${CXX:Q}
+BUILDLINK_TRANSFORM+=	rm:-lstdc++
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index 63e67bf3c9d..724f6e3fbc6 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/02/07 19:32:03 rmind Exp $
+$NetBSD: distinfo,v 1.2 2007/02/08 00:25:13 rillig Exp $
 
 SHA1 (geany-0.10.tar.gz) = a47ac6ef444755a3d5bccd8270adf36507048fe1
 RMD160 (geany-0.10.tar.gz) = 6a69798162c0fd1a5ed49ac0f5e80ab2c534f81c
 Size (geany-0.10.tar.gz) = 2027571 bytes
+SHA1 (patch-aa) = b4a3d0b25c1687c2ce7f19b1354d8e100fd6cf53
diff --git a/devel/geany/patches/patch-aa b/devel/geany/patches/patch-aa
new file mode 100644
index 00000000000..5137c08f9dc
--- /dev/null
+++ b/devel/geany/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/02/08 00:25:13 rillig Exp $
+
+--- src/Makefile.in.orig	2007-02-07 23:46:59.000000000 +0100
++++ src/Makefile.in	2007-02-07 23:58:21.031979136 +0100
+@@ -247,7 +247,7 @@
+ #AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -mms-bitfields -g -O0
+ @MINGW_TRUE@geany_LDFLAGS = -mwindows
+ @MINGW_FALSE@INCLUDES = \
+-@MINGW_FALSE@	-DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
++@MINGW_FALSE@	-DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
+ @MINGW_FALSE@	-I../scintilla/include -I../tagmanager/include @PACKAGE_CFLAGS@
+ 
+ @MINGW_TRUE@INCLUDES = -I../scintilla/include -I../tagmanager/include -DENABLE_NLS \
-- 
cgit v1.2.3