pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/irssi-icb Convert to use glib2 instead of glib1. ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c391a65dfbfc
branches:  trunk
changeset: 392265:c391a65dfbfc
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Apr 29 12:47:23 2009 +0000

description:
Convert to use glib2 instead of glib1. Bump PKGREVISION.

diffstat:

 chat/irssi-icb/Makefile         |   9 ++++++---
 chat/irssi-icb/distinfo         |   3 ++-
 chat/irssi-icb/patches/patch-ae |  14 ++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diffs (66 lines):

diff -r ec5d6e3978c6 -r c391a65dfbfc chat/irssi-icb/Makefile
--- a/chat/irssi-icb/Makefile   Wed Apr 29 12:34:42 2009 +0000
+++ b/chat/irssi-icb/Makefile   Wed Apr 29 12:47:23 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2009/01/19 10:20:03 sketch Exp $
+# $NetBSD: Makefile,v 1.26 2009/04/29 12:47:23 wiz Exp $
 #
 
 DISTNAME=      irssi-icb-0.14
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    chat
 MASTER_SITES=  http://www.irssi.org/files/plugins/icb/
 DISTFILES=     ${DISTNAME}.tar.gz ${IRSSI_DISTFILE}
@@ -22,9 +22,12 @@
 GNU_CONFIGURE= yes
 
 USE_LIBTOOL=   yes
+USE_TOOLS+=    pkg-config
 SHLIBTOOL_OVERRIDE=    # empty
 
 CONFIGURE_ARGS+=       --with-irssi=${WRKDIR}/${IRSSI_DISTNAME}
+CONFIGURE_ARGS+=       --with-glib-prefix=${BUILDLINK_PREFIX.glib2}
+CONFIGURE_ARGS+=       --disable-glibtest
 
 INSTALLATION_DIRS+=    share/doc/irssi
 
@@ -37,5 +40,5 @@
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/irssi/README.icb
 
-.include "../../devel/glib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ec5d6e3978c6 -r c391a65dfbfc chat/irssi-icb/distinfo
--- a/chat/irssi-icb/distinfo   Wed Apr 29 12:34:42 2009 +0000
+++ b/chat/irssi-icb/distinfo   Wed Apr 29 12:47:23 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/01/19 10:20:03 sketch Exp $
+$NetBSD: distinfo,v 1.12 2009/04/29 12:47:23 wiz Exp $
 
 SHA1 (irssi-0.8.12.tar.bz2) = 00ecca04766c51feef057b2327f67166be473fa3
 RMD160 (irssi-0.8.12.tar.bz2) = 0588e6c2df0425c4f36bd84c1621d9ad170b6a81
@@ -10,3 +10,4 @@
 SHA1 (patch-ab) = c270c35891164c9e42696e2ffc84d1e7ffaaaa2a
 SHA1 (patch-ac) = 27f9148f68e2fb612dac51ac5d9401338e926d77
 SHA1 (patch-ad) = e07327f473c253c341d83fe9b3ce1f34667b33f2
+SHA1 (patch-ae) = 0a1c916e44d70d108ba1d3b229ff1d3d72365622
diff -r ec5d6e3978c6 -r c391a65dfbfc chat/irssi-icb/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/irssi-icb/patches/patch-ae   Wed Apr 29 12:47:23 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2009/04/29 12:47:23 wiz Exp $
+
+--- configure.orig     2002-11-24 13:17:37.000000000 +0000
++++ configure
+@@ -5892,6 +5892,9 @@ rm -f conftest*
+   rm -f conf.glibtest
+ 
+ 
++GLIB_CFLAGS="`pkg-config --cflags glib-2.0`"
++GLIB_LIBS="`pkg-config --libs glib-2.0`"
++
+ # gcc specific options
+ if test "x$ac_cv_prog_gcc" = "xyes"; then
+   CFLAGS="$CFLAGS -Wall"



Home | Main Index | Thread Index | Old Index