pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat Since all the licq packages use the same distfile...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5a161443b4d1
branches: trunk
changeset: 533978:5a161443b4d1
user: rillig <rillig%pkgsrc.org@localhost>
date: Wed Oct 10 10:20:32 2007 +0000
description:
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.
diffstat:
chat/licq-core/distinfo | 5 +++-
chat/licq-core/patches/patch-ca | 39 ++++++++++++++++++++++++++++++++++
chat/licq-core/patches/patch-qa | 15 +++++++++++++
chat/licq-core/patches/patch-qb | 12 ++++++++++
chat/licq-gui-console/Makefile | 7 ++++-
chat/licq-gui-console/distinfo | 6 -----
chat/licq-gui-console/patches/patch-aa | 39 ----------------------------------
chat/licq-gui-qt/Makefile | 7 ++++-
chat/licq-gui-qt/distinfo | 6 -----
chat/licq-gui-qt/patches/patch-aa | 15 -------------
10 files changed, 80 insertions(+), 71 deletions(-)
diffs (226 lines):
diff -r e9ea5705a17c -r 5a161443b4d1 chat/licq-core/distinfo
--- a/chat/licq-core/distinfo Wed Oct 10 09:26:21 2007 +0000
+++ b/chat/licq-core/distinfo Wed Oct 10 10:20:32 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2007/09/29 12:51:17 rillig Exp $
+$NetBSD: distinfo,v 1.9 2007/10/10 10:20:32 rillig Exp $
SHA1 (licq-1.2.6.tar.bz2) = fef2d6d8c9a368313335f3ac0e86128aa24133ef
RMD160 (licq-1.2.6.tar.bz2) = fcb2e19bf7d30c1824392a9be3ea1619072e4ce5
@@ -12,3 +12,6 @@
SHA1 (patch-ag) = a8924861f010c4052ee5ade8937a064b675b3a37
SHA1 (patch-ah) = cec92dd4d617f47e98339b7b662052dc06d4d220
SHA1 (patch-ai) = f8cebb4e821a1b648e69135db5dd232a9459773a
+SHA1 (patch-ca) = 36475ac0642e8908a2ae6a8913efa25ba09af1c3
+SHA1 (patch-qa) = 92cac6e7248275ba4c1a611262e56dd2a33ffe73
+SHA1 (patch-qb) = 2fa14d43c3d415947fdd67db30642b31030e5a3b
diff -r e9ea5705a17c -r 5a161443b4d1 chat/licq-core/patches/patch-ca
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/licq-core/patches/patch-ca Wed Oct 10 10:20:32 2007 +0000
@@ -0,0 +1,39 @@
+$NetBSD: patch-ca,v 1.1 2007/10/10 10:20:32 rillig Exp $
+
+--- plugins/console/src/window.cpp.orig Mon Dec 10 15:05:49 2001
++++ plugins/console/src/window.cpp
+@@ -147,7 +147,10 @@ void CWindow::wprintf(char *formatIn, ..
+ va_list argp;
+ char formatOut[1024], out[1024];
+ unsigned short i = 0, j = 0;
+- attr_t save = win->_attrs;
++ attr_t save;
++ short dummy;
++
++ wattr_get(win, &save, &dummy, NULL);
+
+ va_start(argp, formatIn);
+
+@@ -163,12 +166,7 @@ void CWindow::wprintf(char *formatIn, ..
+ {
+ case 'C': // set color
+ i++;
+-//#if NCURSES_VERSION_PATCH < 990213
+- win->_attrs &= ~A_COLOR;
+- win->_attrs |= COLOR_PAIR(va_arg(argp, int));
+-//#else
+-// wcolor_set(win, va_arg(argp, short), NULL);
+-//#endif
++ wattr_set(win, save & ~A_COLOR, va_arg(argp, int), NULL);
+ while((formatIn[i]) && (formatIn[i] != '%') && j < 1022) formatOut[j++] = formatIn[i++];
+ formatOut[j] = '\0';
+ *this << formatOut;
+@@ -213,7 +211,7 @@ void CWindow::wprintf(char *formatIn, ..
+ }
+ va_end(argp);
+
+- win->_attrs = save;
++ wattr_set(win, save, dummy, NULL);
+ }
+
+
diff -r e9ea5705a17c -r 5a161443b4d1 chat/licq-core/patches/patch-qa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/licq-core/patches/patch-qa Wed Oct 10 10:20:32 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-qa,v 1.1 2007/10/10 10:20:32 rillig Exp $
+
+--- plugins/qt-gui/configure.orig 2006-04-28 10:36:59.000000000 +0000
++++ plugins/qt-gui/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"
diff -r e9ea5705a17c -r 5a161443b4d1 chat/licq-core/patches/patch-qb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/licq-core/patches/patch-qb Wed Oct 10 10:20:32 2007 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-qb,v 1.1 2007/10/10 10:20:32 rillig Exp $
+
+--- plugins/qt-gui/src/messagebox.h.orig 2001-11-22 20:27:00.000000000 +0000
++++ plugins/qt-gui/src/messagebox.h 2007-10-10 10:11:48.000000000 +0000
+@@ -8,6 +8,7 @@
+
+ class CUserEvent;
+ class MsgView;
++class CMsgViewTips;
+
+ //=====UserViewItem================================================================================
+ class MsgViewItem : public QListViewItem
diff -r e9ea5705a17c -r 5a161443b4d1 chat/licq-gui-console/Makefile
--- a/chat/licq-gui-console/Makefile Wed Oct 10 09:26:21 2007 +0000
+++ b/chat/licq-gui-console/Makefile Wed Oct 10 10:20:32 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/07/07 15:49:31 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2007/10/10 10:20:32 rillig Exp $
#
DISTNAME= licq-1.2.6
@@ -14,11 +14,14 @@
DEPENDS+= licq-core-[0-9]*:../../chat/licq-core
+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/console}
+CONFIGURE_DIRS= plugins/console
INCOMPAT_CURSES= NetBSD-1.4*-* NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-*
diff -r e9ea5705a17c -r 5a161443b4d1 chat/licq-gui-console/distinfo
--- a/chat/licq-gui-console/distinfo Wed Oct 10 09:26:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 15:59:12 agc 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) = 30f49170155627af831a81ae9472a5946c60b962
diff -r e9ea5705a17c -r 5a161443b4d1 chat/licq-gui-console/patches/patch-aa
--- a/chat/licq-gui-console/patches/patch-aa Wed Oct 10 09:26:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/04/28 04:54:50 minskim Exp $
-
---- src/window.cpp.orig Mon Dec 10 15:05:49 2001
-+++ src/window.cpp
-@@ -147,7 +147,10 @@ void CWindow::wprintf(char *formatIn, ..
- va_list argp;
- char formatOut[1024], out[1024];
- unsigned short i = 0, j = 0;
-- attr_t save = win->_attrs;
-+ attr_t save;
-+ short dummy;
-+
-+ wattr_get(win, &save, &dummy, NULL);
-
- va_start(argp, formatIn);
-
-@@ -163,12 +166,7 @@ void CWindow::wprintf(char *formatIn, ..
- {
- case 'C': // set color
- i++;
--//#if NCURSES_VERSION_PATCH < 990213
-- win->_attrs &= ~A_COLOR;
-- win->_attrs |= COLOR_PAIR(va_arg(argp, int));
--//#else
--// wcolor_set(win, va_arg(argp, short), NULL);
--//#endif
-+ wattr_set(win, save & ~A_COLOR, va_arg(argp, int), NULL);
- while((formatIn[i]) && (formatIn[i] != '%') && j < 1022) formatOut[j++] = formatIn[i++];
- formatOut[j] = '\0';
- *this << formatOut;
-@@ -213,7 +211,7 @@ void CWindow::wprintf(char *formatIn, ..
- }
- va_end(argp);
-
-- win->_attrs = save;
-+ wattr_set(win, save, dummy, NULL);
- }
-
-
diff -r e9ea5705a17c -r 5a161443b4d1 chat/licq-gui-qt/Makefile
--- a/chat/licq-gui-qt/Makefile Wed Oct 10 09:26:21 2007 +0000
+++ b/chat/licq-gui-qt/Makefile Wed Oct 10 10:20:32 2007 +0000
@@ -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 @@
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 -r e9ea5705a17c -r 5a161443b4d1 chat/licq-gui-qt/distinfo
--- a/chat/licq-gui-qt/distinfo Wed Oct 10 09:26:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r e9ea5705a17c -r 5a161443b4d1 chat/licq-gui-qt/patches/patch-aa
--- a/chat/licq-gui-qt/patches/patch-aa Wed Oct 10 09:26:21 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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"
Home |
Main Index |
Thread Index |
Old Index