mirror of
https://git.freebsd.org/ports.git
synced 2025-07-17 17:29:23 -04:00
- Unbreak licq-osd: Update to 1.3.0 from main licq-distribution
and use already available infrastructure from net/licq - Reset maintainer PR: ports/78559 Approved by: maintainer
This commit is contained in:
parent
2566156f4c
commit
8728e40bd9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=132695
8 changed files with 54 additions and 42 deletions
|
@ -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
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
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
|
||||
|
||||
PLIST_FILES= lib/licq/licq_osd.la lib/licq/licq_osd.so
|
||||
LICQ_PORT?= net/licq
|
||||
|
||||
.include <bsd.port.mk>
|
||||
PLIST_FILES= lib/licq/licq_osd.so
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
|
@ -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
|
||||
|
|
11
net-im/licq-osd/files/patch-src::licq_osd.conf.h
Normal file
11
net-im/licq-osd/files/patch-src::licq_osd.conf.h
Normal file
|
@ -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"
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
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
|
||||
|
||||
PLIST_FILES= lib/licq/licq_osd.la lib/licq/licq_osd.so
|
||||
LICQ_PORT?= net/licq
|
||||
|
||||
.include <bsd.port.mk>
|
||||
PLIST_FILES= lib/licq/licq_osd.so
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
|
@ -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
|
||||
|
|
11
net/licq-osd/files/patch-src::licq_osd.conf.h
Normal file
11
net/licq-osd/files/patch-src::licq_osd.conf.h
Normal file
|
@ -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"
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue