cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix libintl/libiconv detection and linking

Browse Source 
- Don't use bundled libintl
- Regen PLIST
- Bump PKGNAME

ok pvalchev@
This commit is contained in:
alek 2005-02-16 21:55:55 +00:00
parent 54b22d21b3
commit 3572d62a73
5 changed files with 91 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/centericq/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.28 2004/12/16 00:31:20 alek Exp $
# $OpenBSD: Makefile,v 1.29 2005/02/16 21:55:55 alek Exp $
COMMENT= "curses-based icq client implementation"
DISTNAME= centericq-4.9.11
PKGNAME= ${DISTNAME}p0
CATEGORIES= net
MASTER_SITES= http://konst.org.ua/download/ \
http://konst.home.welcomehome.org/ \

64
net/centericq/patches/patch-configure Normal file
View File

@ -0,0 +1,64 @@
$OpenBSD: patch-configure,v 1.4 2005/02/16 21:55:55 alek Exp $
--- configure.orig Mon Mar 22 21:27:18 2004
+++ configure Sat Feb 12 18:37:45 2005
@@ -2655,7 +2655,7 @@ echo "configure:2648: checking how to li
-LIBS="$LIBS $LIBICONV"
+LIBS="$LIBS $LTLIBICONV"
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
echo "configure:2662: checking for socket in -lsocket" >&5
@@ -4907,7 +4907,6 @@ else
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
@@ -4915,7 +4914,7 @@ extern
const char *_nl_expand_alias ();
int main() {
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
; return 0; }
EOF
if { (eval echo configure:4922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -4935,7 +4934,6 @@ rm -f conftest*
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
extern
#ifdef __cplusplus
"C"
@@ -4943,7 +4941,7 @@ extern
const char *_nl_expand_alias ();
int main() {
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
; return 0; }
EOF
if { (eval echo configure:4950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -5078,7 +5076,7 @@ EOF
- INTLLIBS="$LIBINTL"
+ INTLLIBS="$LTLIBINTL"
@@ -5244,7 +5242,7 @@ s%@LIBGNUTLS_EXTRA_CONFIG@%$LIBGNUTLS_EX
s%@LIBGNUTLS_EXTRA_CFLAGS@%$LIBGNUTLS_EXTRA_CFLAGS%g
s%@LIBGNUTLS_EXTRA_LIBS@%$LIBGNUTLS_EXTRA_LIBS%g
s%@CXXCPP@%$CXXCPP%g
-s%@LIBICONV@%$LIBICONV%g
+s%@LIBICONV@%$LTLIBICONV%g
s%@LTLIBICONV@%$LTLIBICONV%g
s%@BUILD_YAHOO_TRUE@%$BUILD_YAHOO_TRUE%g
s%@BUILD_YAHOO_FALSE@%$BUILD_YAHOO_FALSE%g

12
net/centericq/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.4 2005/02/16 21:55:55 alek Exp $
--- src/Makefile.in.orig Sat Feb 12 19:20:50 2005
+++ src/Makefile.in Sat Feb 12 19:20:59 2005
@@ -92,7 +92,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIB
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/hooks -I$(top_srcdir)/firetalk-0.1 -I$(top_srcdir)/kkconsui-0.1/include -I$(top_srcdir)/kkstrtext-0.1 -I$(top_srcdir)/libicq2000-0.1 -I$(top_srcdir)/libjabber-0.1 -I$(top_srcdir)/libyahoo2-0.1 -I$(top_srcdir)/kksystr-0.1/include -I$(top_srcdir)/connwrap-0.1 -I$(top_srcdir)/libgadu-0.1 -I$(top_srcdir)/blip-0.1 -I$(top_srcdir)/libicq2000-0.1/libicq2000 -I$(top_srcdir)/intl
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/hooks -I$(top_srcdir)/firetalk-0.1 -I$(top_srcdir)/kkconsui-0.1/include -I$(top_srcdir)/kkstrtext-0.1 -I$(top_srcdir)/libicq2000-0.1 -I$(top_srcdir)/libjabber-0.1 -I$(top_srcdir)/libyahoo2-0.1 -I$(top_srcdir)/kksystr-0.1/include -I$(top_srcdir)/connwrap-0.1 -I$(top_srcdir)/libgadu-0.1 -I$(top_srcdir)/blip-0.1 -I$(top_srcdir)/libicq2000-0.1/libicq2000
bin_PROGRAMS = centericq
centericq_SOURCES = icqcontact.cc icqgroups.cc eventmanager.cc icqdialogs.cc icqhist.cc imexternal.cc imcontact.cc imlogger.cc accountmanager.cc icqcontacts.cc icqmlist.cc imcontroller.cc icqconf.cc imevents.cc icqface.cc centermain.cc icqgroup.cc centericq.cc
centericq_LDFLAGS = -L$(top_srcdir)/firetalk-0.1 -L$(top_srcdir)/kkconsui-0.1 -L$(top_srcdir)/kkstrtext-0.1 -L$(top_srcdir)/libicq2000-0.1 -L$(top_srcdir)/libjabber-0.1 -L$(top_srcdir)/libyahoo2-0.1 -L$(top_srcdir)/kksystr-0.1 -L$(top_srcdir)/connwrap-0.1 -L$(top_srcdir)/libgadu-0.1 -L$(top_srcdir)/blip-0.1

12
net/centericq/patches/patch-src_hooks_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_hooks_Makefile_in,v 1.1 2005/02/16 21:55:55 alek Exp $
--- src/hooks/Makefile.in.orig Sat Feb 12 19:20:26 2005
+++ src/hooks/Makefile.in Sat Feb 12 19:20:36 2005
@@ -92,7 +92,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIB
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/hooks -I$(top_srcdir)/firetalk-0.1 -I$(top_srcdir)/kkconsui-0.1/include -I$(top_srcdir)/kkstrtext-0.1 -I$(top_srcdir)/libicq2000-0.1 -I$(top_srcdir)/libjabber-0.1 -I$(top_srcdir)/libyahoo2-0.1 -I$(top_srcdir)/kksystr-0.1/include -I$(top_srcdir)/connwrap-0.1 -I$(top_srcdir)/libgadu-0.1 -I$(top_srcdir)/blip-0.1 -I$(top_srcdir)/libicq2000-0.1/libicq2000 -I$(top_srcdir)/intl
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/hooks -I$(top_srcdir)/firetalk-0.1 -I$(top_srcdir)/kkconsui-0.1/include -I$(top_srcdir)/kkstrtext-0.1 -I$(top_srcdir)/libicq2000-0.1 -I$(top_srcdir)/libjabber-0.1 -I$(top_srcdir)/libyahoo2-0.1 -I$(top_srcdir)/kksystr-0.1/include -I$(top_srcdir)/connwrap-0.1 -I$(top_srcdir)/libgadu-0.1 -I$(top_srcdir)/blip-0.1 -I$(top_srcdir)/libicq2000-0.1/libicq2000
noinst_LIBRARIES = libhooks.a
libhooks_a_SOURCES = yahoohook.cc jabberhook.cc aimhook.cc icqhook.cc irchook.cc abstracthook.cc rsshook.cc HTTPClient.cc ljhook.cc gaduhook.cc msnhook.cc
EXTRA_DIST = yahoohook.cc jabberhook.cc aimhook.cc icqhook.cc irchook.cc abstracthook.cc rsshook.cc HTTPClient.cc ljhook.cc gaduhook.cc msnhook.cc yahoohook.h aimhook.h jabberhook.h icqhook.h irchook.h abstracthook.h rsshook.h HTTPClient.h ljhook.h gaduhook.h msnhook.h

4
net/centericq/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2004/09/15 18:17:39 espie Exp $
@comment $OpenBSD: PLIST,v 1.16 2005/02/16 21:55:55 alek Exp $
bin/centericq
bin/cicqconv
bin/cicqsync
@ -17,7 +17,6 @@ bin/cicqsync
@comment include/libicq2000/libicq2000/time_extra.h
@comment include/libicq2000/libicq2000/userinfoconstants.h
@comment include/libicq2000/libicq2000/version.h
@comment lib/charset.alias
@man man/man1/centericq.1
@man man/man1/cicqconv.1
@man man/man1/cicqsync.1
@ -37,7 +36,6 @@ share/locale/es/LC_MESSAGES/centericq.mo
share/locale/fr/LC_MESSAGES/centericq.mo
share/locale/hu/LC_MESSAGES/centericq.mo
share/locale/it/LC_MESSAGES/centericq.mo
@comment share/locale/locale.alias
share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/centericq.mo