pan2-git: fix build after switch from intltool to modern gettext.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon May 15 16:37:41 2017 +0200
Changeset:	595c6eb7c03fc5bb56f3d5dcb2b0a047f0959614

Modified Files:
	pan2-git/Makefile
	pan2-git/options.mk

Log Message:
pan2-git: fix build after switch from intltool to modern gettext.

While here, clean up and simplify the package, update dependencies
and move optional dependencies to options.mk for future optionizing.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=595c6eb7c03fc5bb56f3d5dcb2b0a047f0959614

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pan2-git/Makefile   | 51 +++++++++++++--------------------------------------
 pan2-git/options.mk | 15 +++++++++++++--
 2 files changed, 26 insertions(+), 40 deletions(-)

diffs:
diff --git a/pan2-git/Makefile b/pan2-git/Makefile
index 0a8e9a1596..63820c244b 100644
--- a/pan2-git/Makefile
+++ b/pan2-git/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/12/11 07:55:04 thomasklausner Exp $
+# $NetBSD$
 
 DISTNAME=		pan2-2
 CATEGORIES=		news
@@ -9,58 +9,33 @@ HOMEPAGE=		http://pan.rebelbase.com/
 COMMENT=		Newsreader for GTK2
 LICENSE=		gnu-gpl-v2
 
-# These are various repositories for Pan, ordered from latest to oldest.
-# It is discussed in the mailing list at
-# http://lists.gnu.org/archive/html/pan-users/ .
+BUILD_DEPENDS+=		gnome-common>=3.6.0nb1:../../devel/gnome-common
+BUILD_DEPENDS+=		gettext-tools-[0-9]*:../../devel/gettext-tools
+
 GIT_REPOSITORIES=	gnome
 GIT_REPO.gnome= 	git://git.gnome.org/pan2
 GIT_MODULE.gnome=	pan2
-GIT_REPO.aexoden=	git://github.com/aexoden/pan2.git
-GIT_MODULE.aexoden=	pan2
-GIT_REPO.khaley=	git://github.com/lostcoder/pan2.git
-GIT_MODULE.khaley=	pan2
 WRKSRC=			${WRKDIR}/pan2
-CONFIGURE_SCRIPT=	autogen.sh
-GNU_CONFIGURE=		YES
 
-USE_TOOLS+=		msgfmt perl pkg-config
-USE_TOOLS+=		gmake
-USE_TOOLS+=		automake gettext-m4
-AUTOMAKE_OVERRIDE=	no	# autogen.sh calls automake-1.12 by version
-USE_TOOLS+=		autoconf intltool
-USE_LIBTOOL=		YES
+USE_TOOLS+=		autoconf automake gettext-m4 gmake perl pkg-config
+USE_LIBTOOL=		yes
 USE_LANGUAGES+=		c c++
-USE_PKGLOCALEDIR=	YES
-GNU_CONFIGURE=		YES
-#CONFIGURE_ARGS=		--enable-debug
-#CONFIGURE_ENV+=		CXXFLAGS=-ggdb
-#CONFIGURE_ENV+=		CFLAGS=-ggdb
-#CONFIGURE_ENV+=		LDFLAGS=-ggdb
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-gnutls
 
-.include "../../mk/bsd.prefs.mk"
-.if (${OPSYS} != "Darwin" && ${OPSYS} != "SunOS" && ${OPSYS} != "Linux")
-LIBS+=			-lcompat
-.endif
+pre-configure:
+	cd ${WRKSRC} && autoreconf -fiv
 
-BUILD_DEPENDS+=		gnome-common>=3.6.0nb1:../../devel/gnome-common
-BUILD_DEPENDS+=		gettext-tools-[0-9]*:../../devel/gettext-tools
+.include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mail/gmime24/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-gnutls
+.include "../../mail/gmime/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"			# optional
-# default-off
-#.include "../../security/libgnome-keyring/buildlink3.mk"	# optional
-# default-off
-#.include "../../sysutils/dbus/buildlink3.mk"			# optional
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-# default-off
-#.include "../../sysutils/libnotify07/buildlink3.mk"		# optional
 .include "../../textproc/gtkspell/buildlink3.mk"		# optional
-
-.include "options.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pan2-git/options.mk b/pan2-git/options.mk
index dc2651f076..eb9651b689 100644
--- a/pan2-git/options.mk
+++ b/pan2-git/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2013/10/24 16:28:55 rhialto Exp $
+# $NetBSD$
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.pan2_git
 PKG_OPTIONS_REQUIRED_GROUPS=	gtkversion
-PKG_OPTIONS_GROUP.gtkversion=   gtk2 gtk3
+PKG_OPTIONS_GROUP.gtkversion=	gtk2 gtk3
 PKG_SUGGESTED_OPTIONS=		gtk2
 
 .include "../../mk/bsd.options.mk"
@@ -13,3 +13,14 @@ CONFIGURE_ARGS+=	--with-gtk3
 .else
 .include "../../x11/gtk2/buildlink3.mk"
 .endif
+
+# TODO: add options for:
+#.include "../../security/libgnome-keyring/buildlink3.mk"
+#.include "../../sysutils/dbus/buildlink3.mk"
+#.include "../../sysutils/libnotify07/buildlink3.mk"
+#.include "../../www/webkit-gtk/buildlink3.mk"
+# TODO: add debug option:
+#CONFIGURE_ARGS=	--enable-debug
+#CONFIGURE_ENV+=	CXXFLAGS=-ggdb
+#CONFIGURE_ENV+=	CFLAGS=-ggdb
+#CONFIGURE_ENV+=	LDFLAGS=-ggdb