ports/78559: [patch] net/licq-osd: Update to 1.3.0

[Volker Stolz]

>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 at 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 at 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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
+.include <bsd.port.post.mk>
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: