pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/gaim Remove the OpenSSL patch; use gnutls instead...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc2fad014be5
branches:  trunk
changeset: 465001:cc2fad014be5
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Fri Dec 19 09:43:39 2003 +0000

description:
Remove the OpenSSL patch; use gnutls instead.  Bump PKGREVISION to 3.
According to gaim's developers, it is illegal to link OpenSSL together
with gaim (ewww, GPL).

diffstat:

 chat/gaim/Makefile |  11 +++--------
 chat/gaim/PLIST    |   5 +----
 chat/gaim/distinfo |   4 +---
 3 files changed, 5 insertions(+), 15 deletions(-)

diffs (69 lines):

diff -r cf4a5f02d2f3 -r cc2fad014be5 chat/gaim/Makefile
--- a/chat/gaim/Makefile        Fri Dec 19 09:22:30 2003 +0000
+++ b/chat/gaim/Makefile        Fri Dec 19 09:43:39 2003 +0000
@@ -1,16 +1,12 @@
-# $NetBSD: Makefile,v 1.45 2003/12/13 00:45:21 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2003/12/19 09:43:39 jmmv Exp $
 #
 
 DISTNAME=      gaim-0.74
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    chat x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=  .tar.bz2
 
-PATCH_SITES=   ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/marcus/
-PATCHFILES=    ${DISTNAME}-openssl.patch.gz
-PATCH_DIST_STRIP=      -p1
-
 MAINTAINER=    mjl%luckie.org.nz@localhost
 HOMEPAGE=      http://gaim.sourceforge.net/
 COMMENT=       GTK2 based client for the AOL Instant Messenger chat system
@@ -33,7 +29,6 @@
 CONFIGURE_ARGS+=       --disable-perl
 CONFIGURE_ARGS+=       --disable-nss
 CONFIGURE_ARGS+=       --disable-tcl
-CONFIGURE_ARGS+=       --disable-gnutls
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -47,7 +42,7 @@
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/gnutls/buildlink2.mk"
 .include "../../textproc/gtkspell/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../x11/startup-notification/buildlink2.mk"
diff -r cf4a5f02d2f3 -r cc2fad014be5 chat/gaim/PLIST
--- a/chat/gaim/PLIST   Fri Dec 19 09:22:30 2003 +0000
+++ b/chat/gaim/PLIST   Fri Dec 19 09:43:39 2003 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2003/12/03 13:23:28 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.22 2003/12/19 09:43:39 jmmv Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim-remote/remote-socket.h
@@ -66,9 +66,6 @@
 lib/gaim/ssl-nss.a
 lib/gaim/ssl-nss.la
 lib/gaim/ssl-nss.so
-lib/gaim/ssl-openssl.a
-lib/gaim/ssl-openssl.la
-lib/gaim/ssl-openssl.so
 lib/gaim/ssl.a
 lib/gaim/ssl.la
 lib/gaim/ssl.so
diff -r cf4a5f02d2f3 -r cc2fad014be5 chat/gaim/distinfo
--- a/chat/gaim/distinfo        Fri Dec 19 09:22:30 2003 +0000
+++ b/chat/gaim/distinfo        Fri Dec 19 09:43:39 2003 +0000
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.34 2003/12/03 13:23:28 jmmv Exp $
+$NetBSD: distinfo,v 1.35 2003/12/19 09:43:39 jmmv Exp $
 
 SHA1 (gaim-0.74.tar.bz2) = f9df2adbd49e0dba95eb0442fdd7b75b7177dcbd
 Size (gaim-0.74.tar.bz2) = 3285757 bytes
-SHA1 (gaim-0.74-openssl.patch.gz) = 230ce6408cf6a11c6dd38b8fcb7f3ec7dd58ec86
-Size (gaim-0.74-openssl.patch.gz) = 7669 bytes



Home | Main Index | Thread Index | Old Index