From dc669fbc688fff6b9e24aa3f919f436c7cf60499 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Wed, 10 Oct 2007 10:20:32 +0000
Subject: Since all the licq packages use the same distfile and need the same
 patches, it is better to provide them once for all packages.

Fixed building the gui plugins.
---
 chat/licq-gui-qt/Makefile         |  7 +++++--
 chat/licq-gui-qt/distinfo         |  6 ------
 chat/licq-gui-qt/patches/patch-aa | 15 ---------------
 3 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 chat/licq-gui-qt/distinfo
 delete mode 100644 chat/licq-gui-qt/patches/patch-aa

(limited to 'chat/licq-gui-qt')

diff --git a/chat/licq-gui-qt/Makefile b/chat/licq-gui-qt/Makefile
index 541d47599c2..7efa9263976 100644
--- a/chat/licq-gui-qt/Makefile
+++ b/chat/licq-gui-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/06/15 17:08:12 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2007/10/10 10:20:33 rillig Exp $
 #
 
 DISTNAME=	licq-1.2.6
@@ -21,11 +21,14 @@ DEPENDS+=	licq-core-[0-9]*:../../chat/licq-core
 PKG_FAIL_REASON+=	"XScrnSaver support is needed"
 .endif
 
+DISTINFO_FILE=		${.CURDIR}/../../chat/licq-core/distinfo
+PATCHDIR=		${.CURDIR}/../../chat/licq-core/patches
+
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
 SHLIBTOOL_OVERRIDE=	# empty
-WRKSRC=			${WRKDIR:=/${DISTNAME}/plugins/qt-gui}
+CONFIGURE_DIRS=		plugins/qt-gui
 
 INCOMPAT_CURSES=	NetBSD-1.4*-* NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-*
 
diff --git a/chat/licq-gui-qt/distinfo b/chat/licq-gui-qt/distinfo
deleted file mode 100644
index 04f38c3a310..00000000000
--- a/chat/licq-gui-qt/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/04/28 11:10:02 joerg Exp $
-
-SHA1 (licq-1.2.6.tar.bz2) = fef2d6d8c9a368313335f3ac0e86128aa24133ef
-RMD160 (licq-1.2.6.tar.bz2) = fcb2e19bf7d30c1824392a9be3ea1619072e4ce5
-Size (licq-1.2.6.tar.bz2) = 3282918 bytes
-SHA1 (patch-aa) = b14e54362a10d1de9acac6cb8e11739d85838ff9
diff --git a/chat/licq-gui-qt/patches/patch-aa b/chat/licq-gui-qt/patches/patch-aa
deleted file mode 100644
index 2c981f21dc5..00000000000
--- a/chat/licq-gui-qt/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/04/28 11:10:02 joerg Exp $
-
---- configure.orig	2006-04-28 10:36:59.000000000 +0000
-+++ configure
-@@ -17307,8 +17307,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-     save_LIBS="$LIBS"
- 
-     CXXFLAGS="$CXXFLAGS $QT_INCLUDES $X_CFLAGS"
--    LDFLAGS="$X_LIBS $QT_LDFLAGS $LDFLAGS"
--    LIBS="$LIB_QT $X_PRE_LIBS -lX11 -lXext $LIBS"
-+    LDFLAGS="$X_LIBS $QT_LDFLAGS $LDFLAGS $PTHREAD_LDFLAGS"
-+    LIBS="$LIB_QT $X_PRE_LIBS -lX11 -lXext $LIBS $PTHREAD_LIBS"
- 
-     cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-- 
cgit v1.2.3