From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Mar 7 20:50:11 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E761116A4FB for ; Mon, 7 Mar 2005 20:50:07 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7375E43D5C for ; Mon, 7 Mar 2005 20:50:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j27Ko7wV016187 for ; Mon, 7 Mar 2005 20:50:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j27Ko7LC016183; Mon, 7 Mar 2005 20:50:07 GMT (envelope-from gnats) Resent-Date: Mon, 7 Mar 2005 20:50:07 GMT Resent-Message-Id: <200503072050.j27Ko7LC016183@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Volker Stolz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 48F4B16A4CE for ; Mon, 7 Mar 2005 20:45:32 +0000 (GMT) Received: from atlas.informatik.rwth-aachen.de (atlas.informatik.RWTH-Aachen.DE [137.226.194.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F20643D53 for ; Mon, 7 Mar 2005 20:45:31 +0000 (GMT) (envelope-from stolz@i2.informatik.rwth-aachen.de) Received: from i2.informatik.rwth-aachen.de (menelaos.informatik.RWTH-Aachen.DE [137.226.194.73]) with ESMTP id j27KjUos023243 for ; Mon, 7 Mar 2005 21:45:30 +0100 Received: (from stolz@localhost)j27KjT9X070133; Mon, 7 Mar 2005 21:45:29 +0100 (CET) (envelope-from stolz) Message-Id: <200503072045.j27KjT9X070133@i2.informatik.rwth-aachen.de> Date: Mon, 7 Mar 2005 21:45:29 +0100 (CET) From: Volker Stolz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/78559: [patch] net/licq-osd: Update to 1.3.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 20:50:11 -0000 >Number: 78559 >Category: ports >Synopsis: [patch] net/licq-osd: Update to 1.3.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Mar 07 20:50:06 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Volker Stolz >Release: FreeBSD 4.11-STABLE i386 >Organization: Lehrstuhl für Informatik II; RWTH Aachen Universität >Environment: System: FreeBSD menelaos.informatik.rwth-aachen.de 4.11-STABLE FreeBSD 4.11-STABLE #23: Fri Jan 14 09:26:11 CET 2005 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386 >Description: Update to 1.3.0 from main licq-distribution. I couldn't get it to work without manually overriding the default-font, so in the end I patched it to something that at least works for me. pkg-message should be checked for validity, probably. The WWW-tag in pkg-descr should probably be reset since the SF-homepage ist still stuck at 1.2.7. net/licq should also perhaps get a PORTREV-bump since it contains a required modification as well. >How-To-Repeat: >Fix: --- licq-osd.diff begins here --- Index: licq/Makefile.inc =================================================================== RCS file: /home/pcvs/ports/net/licq/Makefile.inc,v retrieving revision 1.17 diff -u -r1.17 Makefile.inc --- licq/Makefile.inc 12 Oct 2004 04:15:58 -0000 1.17 +++ licq/Makefile.inc 7 Mar 2005 20:40:38 -0000 @@ -4,6 +4,7 @@ PKGNAMEPREFIX= licq- LICQ_VER= 1.3.0 QT_LICQ_VER= 1.3.0 +OSD_LICQ_VER= 1.3.0 RMS_LICQ_VER= 0.33 CONSOLE_LICQ_VER= 1.3.0 JONS_GTK_LICQ_VER= 0.20.2 Index: licq-osd/Makefile =================================================================== RCS file: /home/pcvs/ports/net/licq-osd/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- licq-osd/Makefile 7 Mar 2005 17:31:55 -0000 1.5 +++ licq-osd/Makefile 7 Mar 2005 20:40:38 -0000 @@ -6,31 +6,25 @@ # # -PORTNAME= licq_osd_plugin -PORTVERSION= 1.2.7.2 -PORTREVISION= 1 +PORTNAME= osd +PORTVERSION= ${OSD_LICQ_VER} CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=/sourceforge/licq-osd -DISTNAME= licq_osd_plugin-${PORTVERSION} MAINTAINER= nm@web.am COMMENT= OnScreenDisplay messages in licq (like in SIM and more) -BROKEN= "Incompatible with licq-1.3.0" - -BUILD_DEPENDS= ${X11BASE}/lib/libxosd.so.4:${PORTSDIR}/misc/xosd \ - ${LOCALBASE}/include/licq/licq_icqd.h:${PORTSDIR}/net/licq +LIB_DEPENDS= xosd.4:${PORTSDIR}/misc/xosd RUN_DEPENDS=${LOCALBASE}/lib/licq/licq_qt-gui.so:${PORTSDIR}/net/licq-qt-gui # run dependency may be too strict, delete it if you use another # plugin (gtk+) and wish run osd with it. i've not tested with # plugins other than qt-gui -GNU_CONFIGURE=yes -CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv" -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 + +LICQ_PORT?= net/licq -PLIST_FILES= lib/licq/licq_osd.la lib/licq/licq_osd.so +PLIST_FILES= lib/licq/licq_osd.so -.include +.include +.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" +.include Index: licq-osd/files/patch-aa =================================================================== RCS file: /home/pcvs/ports/net/licq-osd/files/patch-aa,v retrieving revision 1.1 diff -u -r1.1 patch-aa --- licq-osd/files/patch-aa 26 Jul 2003 18:32:34 -0000 1.1 +++ licq-osd/files/patch-aa 7 Mar 2005 20:40:38 -0000 @@ -1,10 +1,10 @@ ---- src/licq-osd.cpp.orig Wed Jul 16 13:00:53 2003 -+++ src/licq-osd.cpp Wed Jul 16 12:55:10 2003 -@@ -675,7 +675,7 @@ +--- src/licq-osd.cpp.orig Tue Aug 17 20:02:35 2004 ++++ src/licq-osd.cpp Mon Mar 7 18:42:53 2005 +@@ -804,7 +804,7 @@ while ((fromsize>0) && (tosize>0)) { -- if ((int)iconv(conv, &msgptr, &fromsize, &resptr, &tosize)==-1) +- if ((int)iconv(conv, (char **)&msgptr, &fromsize, &resptr, &tosize)==-1) + if ((int)iconv(conv, (const char**)(&msgptr), &fromsize, &resptr, &tosize)==-1) { // array is not enough Index: licq-osd/files/patch-src::licq_osd.conf.h =================================================================== RCS file: licq-osd/files/patch-src::licq_osd.conf.h diff -N licq-osd/files/patch-src::licq_osd.conf.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ licq-osd/files/patch-src::licq_osd.conf.h 7 Mar 2005 20:40:38 -0000 @@ -0,0 +1,11 @@ +--- src/licq_osd.conf.h.orig Mon Mar 7 19:24:09 2005 ++++ src/licq_osd.conf.h Mon Mar 7 19:27:17 2005 +@@ -4,7 +4,7 @@ + "# you can get the available fonts for your machine from xfontsel\n" + "# i prefer this one - but it is not available everywhere\n" + "# Font=-*-lucida-*-r-*-*-24-*-*-*-*-*-iso8859-15\n" +-"Font=-*-*-*-*-*-*-24-*-*-*-*-*-*-*\n" ++"Font=-*-lucida-*-*-*-*-24-*-*-*-*-*-iso8859-15\n" + "\n" + "# how long should a message be displayed\n" + "Timeout=5\n" --- licq-osd.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: