Add option (off by default) to build gtk support. From PR 44878 by

David H. Gutteridge, with some minor adjustments.

Plus a couple small patches to make gtk support actually build. :-/

6 files changed, 57 insertions, 4 deletions

diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 9ca560b430e..718ebc211d4 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/10/09 14:07:01 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2014/12/06 19:04:13 dholland Exp $
 #
 
 DISTNAME=	aiksaurus-1.2.1
@@ -12,7 +12,8 @@ COMMENT=	English-language thesaurus
 USE_LIBTOOL=	YES
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--without-gtk
 PKGCONFIG_OVERRIDE=	base/aiksaurus-1.0.pc.in
 
+.include "options.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aiksaurus/PLIST b/textproc/aiksaurus/PLIST
index 008d1218551..49179d7bdcf 100644
--- a/textproc/aiksaurus/PLIST
+++ b/textproc/aiksaurus/PLIST
@@ -1,9 +1,14 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:17:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/12/06 19:04:13 dholland Exp $
 bin/aiksaurus
 bin/caiksaurus
+${PLIST.gtk}bin/gaiksaurus
 include/Aiksaurus/Aiksaurus.h
 include/Aiksaurus/AiksaurusC.h
+${PLIST.gtk}include/Aiksaurus/AiksaurusGTK-C.h
+${PLIST.gtk}include/Aiksaurus/AiksaurusGTK.h
 lib/libAiksaurus.la
+${PLIST.gtk}lib/libAiksaurusGTK.la
 lib/pkgconfig/aiksaurus-1.0.pc
+${PLIST.gtk}lib/pkgconfig/gaiksaurus-1.0.pc
 share/aiksaurus/meanings.dat
 share/aiksaurus/words.dat
diff --git a/textproc/aiksaurus/distinfo b/textproc/aiksaurus/distinfo
index c49ad2eba34..98279c33024 100644
--- a/textproc/aiksaurus/distinfo
+++ b/textproc/aiksaurus/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2011/01/29 20:51:34 markd Exp $
+$NetBSD: distinfo,v 1.6 2014/12/06 19:04:13 dholland Exp $
 
 SHA1 (aiksaurus-1.2.1.tar.gz) = b9e98650bc5257673d5b1507f3e0edbc0cb6a0b5
 RMD160 (aiksaurus-1.2.1.tar.gz) = 0f46c121adb6222f0b4709787162cb6f0a0ff35e
 Size (aiksaurus-1.2.1.tar.gz) = 928893 bytes
 SHA1 (patch-aa) = f8a63f0b7f7cdfa67b1de58f450e8aa93ab301d0
+SHA1 (patch-gtk_src_Display.cpp) = 7f1703c30294fb9145adcf253229101a511bfab2
+SHA1 (patch-gtk_src_gtkAiksaur.t.cpp) = c50bbb17454b5b53cf46512d8d9e9b49ff736adf
diff --git a/textproc/aiksaurus/options.mk b/textproc/aiksaurus/options.mk
new file mode 100644
index 00000000000..667667886bb
--- /dev/null
+++ b/textproc/aiksaurus/options.mk
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2014/12/06 19:04:13 dholland Exp $
+
+PKG_OPTIONS_VAR=        PKG_OPTIONS.aiksaurus
+PKG_SUPPORTED_OPTIONS=  gtk
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		gtk
+.if !empty(PKG_OPTIONS:Mgtk)
+PLIST.gtk=		yes
+CONFIGURE_ARGS+=        --with-gtk
+.include "../../x11/gtk2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=        --without-gtk
+.endif
diff --git a/textproc/aiksaurus/patches/patch-gtk_src_Display.cpp b/textproc/aiksaurus/patches/patch-gtk_src_Display.cpp
new file mode 100644
index 00000000000..b0e4feaab49
--- /dev/null
+++ b/textproc/aiksaurus/patches/patch-gtk_src_Display.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-gtk_src_Display.cpp,v 1.1 2014/12/06 19:04:14 dholland Exp $
+
+Use standard headers.
+
+--- gtk/src/Display.cpp~	2003-05-27 23:56:54.000000000 +0000
++++ gtk/src/Display.cpp
+@@ -18,6 +18,8 @@
+  * 02111-1307, USA.
+  */
+ 
++#include <cstring>
++
+ #include "Display.h"
+ #include "Meaning.h"
+ #include "DialogMediator.h"
diff --git a/textproc/aiksaurus/patches/patch-gtk_src_gtkAiksaur.t.cpp b/textproc/aiksaurus/patches/patch-gtk_src_gtkAiksaur.t.cpp
new file mode 100644
index 00000000000..2be65298e83
--- /dev/null
+++ b/textproc/aiksaurus/patches/patch-gtk_src_gtkAiksaur.t.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-gtk_src_gtkAiksaur.t.cpp,v 1.1 2014/12/06 19:04:14 dholland Exp $
+
+Use standard headers.
+
+--- gtk/src/gtkAiksaur.t.cpp~	2002-01-12 02:02:12.000000000 +0000
++++ gtk/src/gtkAiksaur.t.cpp
+@@ -23,6 +23,7 @@
+ #include <gtk/gtk.h>
+ #include <iostream>
+ #include <string>
++#include <cstdlib>
+ using namespace std;
+ 
+ int main(int argc, char** argv)