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

update to 2.3.1

Browse Source 
with wantlib reordering by brad
This commit is contained in:
steven 2007-12-09 10:56:31 +00:00
parent 029dbf5bcd
commit f4eef20fd2
5 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/pidgin/Makefile
View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.14 2007/11/29 13:58:53 okan Exp $
# $OpenBSD: Makefile,v 1.15 2007/12/09 10:56:31 steven Exp $
SHARED_ONLY= Yes
COMMENT= multi-protocol instant messaging client
DISTNAME= pidgin-2.3.0
PKGNAME= ${DISTNAME}p0
DISTNAME= pidgin-2.3.1
SHARED_LIBS += jabber 0.0 # .0.0
SHARED_LIBS += oscar 0.0 # .0.0
SHARED_LIBS += purple 2.0 # .3.0
SHARED_LIBS += purple-client 2.0 # .3.0
SHARED_LIBS += purple 2.1 # .3.1
SHARED_LIBS += purple-client 2.1 # .3.1
SHARED_LIBS += gnt 2.0 # .0.0
CATEGORIES= net
@ -22,13 +21,12 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= glib-2.0 ICE SM X11 Xcomposite Xext Xrender Xss \
Xdamage pcre \
atk-1.0 c crypto dbus-1 expat fontconfig freetype \
gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 \
ssl pangocairo-1.0 cairo glitz png \
pangoft2-1.0 z pthread m ncurses panel stdc++
WANTLIB += Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr
WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
Xext Xfixes Xi Xinerama Xrandr Xrender Xss atk-1.0 \
c cairo crypto dbus-1 expat fontconfig freetype \
glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \
m ncurses panel pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pcre png pthread ssl stdc++ z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}

10
net/pidgin/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pidgin-2.3.0.tar.gz) = 32N9WGcr43LBKnKGYvTtaA==
RMD160 (pidgin-2.3.0.tar.gz) = J1QQxNg3/JX82pqs84z+EA+Nc/E=
SHA1 (pidgin-2.3.0.tar.gz) = mKzCE8QG7hKtmKSGzFc6vH2MLjc=
SHA256 (pidgin-2.3.0.tar.gz) = x2EC21x/8Gn6TMAO+uJVuj08ydU83iwcCLRY6jAa3vk=
SIZE (pidgin-2.3.0.tar.gz) = 13255252
MD5 (pidgin-2.3.1.tar.gz) = p1CZ9QE8e7cWHSlL+nQ5ww==
RMD160 (pidgin-2.3.1.tar.gz) = SaKAr5ztNKgs6WIB8Ogh06Rpi3c=
SHA1 (pidgin-2.3.1.tar.gz) = JYjDj65nbtyYGm8s00RE5KkqxG4=
SHA256 (pidgin-2.3.1.tar.gz) = FavIvI+ABtfbNtfGTluign2B5v17LnxBMLjN2A62+cs=
SIZE (pidgin-2.3.1.tar.gz) = 13262172

14
net/pidgin/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.7 2007/11/28 08:48:32 steven Exp $
--- configure.ac.orig Sat Nov 24 14:05:48 2007
+++ configure.ac Mon Nov 26 16:06:45 2007
$OpenBSD: patch-configure_ac,v 1.8 2007/12/09 10:56:31 steven Exp $
--- configure.ac.orig Fri Dec 7 15:36:58 2007
+++ configure.ac Sat Dec 8 21:03:07 2007
@@ -610,6 +610,7 @@ if test "x$enable_consoleui" = "xyes"; then
# ncursesw was not found. Look for plain old ncurses
enable_consoleui=yes
@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2007/11/28 08:48:32 steven Exp $
AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"], [enable_consoleui=no])
AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have wide-character support.])
if test x"$ac_ncurses_includes" != "x"; then
@@ -823,7 +824,7 @@ else
@@ -831,7 +832,7 @@ else
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2007/11/28 08:48:32 steven Exp $
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
@@ -1510,8 +1511,13 @@ dnl ##################################################
@@ -1518,8 +1519,13 @@ dnl ##################################################
dnl These two are inverses of each other <-- stolen from evolution!
@ -33,7 +33,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2007/11/28 08:48:32 steven Exp $
[enable_gnutls="$enableval"],
[enable_gnutls="yes"])
@@ -1523,6 +1529,90 @@ AC_ARG_ENABLE(nss,
@@ -1531,6 +1537,90 @@ AC_ARG_ENABLE(nss,
msg_ssl="None. MSN, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
dnl #
@ -124,7 +124,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2007/11/28 08:48:32 steven Exp $
dnl # Check for GnuTLS if it's specified.
dnl #
if test "x$enable_gnutls" != "xno"; then
@@ -1877,12 +1967,20 @@ fi
@@ -1893,12 +1983,20 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")

10
net/pidgin/patches/patch-finch_libgnt_gntmain_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-finch_libgnt_gntmain_c,v 1.3 2007/10/01 22:03:29 merdely Exp $
--- finch/libgnt/gntmain.c.orig Tue Jul 31 18:31:35 2007
+++ finch/libgnt/gntmain.c Tue Jul 31 18:31:48 2007
$OpenBSD: patch-finch_libgnt_gntmain_c,v 1.4 2007/12/09 10:56:31 steven Exp $
--- finch/libgnt/gntmain.c.orig Fri Dec 7 15:37:00 2007
+++ finch/libgnt/gntmain.c Sat Dec 8 21:04:07 2007
@@ -21,7 +21,7 @@
*/
#define _GNU_SOURCE
-#if defined(__APPLE__) || defined(__unix__)
+#if defined(__APPLE__) || defined(__unix__) && !defined(__OpenBSD__)
-#if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__)
+#if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
#define _XOPEN_SOURCE_EXTENDED
#endif

10
net/pidgin/patches/patch-finch_libgnt_gntwm_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-finch_libgnt_gntwm_c,v 1.3 2007/10/01 22:03:29 merdely Exp $
--- finch/libgnt/gntwm.c.orig Tue Jul 31 18:31:26 2007
+++ finch/libgnt/gntwm.c Tue Jul 31 18:31:58 2007
$OpenBSD: patch-finch_libgnt_gntwm_c,v 1.4 2007/12/09 10:56:31 steven Exp $
--- finch/libgnt/gntwm.c.orig Fri Dec 7 15:37:01 2007
+++ finch/libgnt/gntwm.c Sat Dec 8 21:04:33 2007
@@ -21,7 +21,7 @@
*/
#define _GNU_SOURCE
-#if defined(__APPLE__) || defined(__unix__)
+#if defined(__APPLE__) || defined(__unix__) && !defined(__OpenBSD__)
-#if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__)
+#if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
#define _XOPEN_SOURCE_EXTENDED
#endif