[57737] trunk/dports/net/net6
raimue at macports.org
raimue at macports.org
Tue Sep 15 14:50:48 PDT 2009
Revision: 57737
http://trac.macports.org/changeset/57737
Author: raimue at macports.org
Date: 2009-09-15 14:50:47 -0700 (Tue, 15 Sep 2009)
Log Message:
-----------
net/net6:
Update to 1.3.9, with patches to use pkg-config for new gnutls version which
does not have libgnutls-config anymore.
Modified Paths:
--------------
trunk/dports/net/net6/Portfile
Added Paths:
-----------
trunk/dports/net/net6/files/
trunk/dports/net/net6/files/patch-gnutls-pkgconfig.diff
Modified: trunk/dports/net/net6/Portfile
===================================================================
--- trunk/dports/net/net6/Portfile 2009-09-15 21:31:07 UTC (rev 57736)
+++ trunk/dports/net/net6/Portfile 2009-09-15 21:50:47 UTC (rev 57737)
@@ -3,7 +3,7 @@
PortSystem 1.0
name net6
-version 1.3.6
+version 1.3.9
categories net
maintainers nomaintainer
description Network access framework for IPv4/IPv6
@@ -19,9 +19,14 @@
master_sites http://gentoo.osuosl.org/distfiles/ \
http://releases.0x539.de/net6/
+patchfiles patch-gnutls-pkgconfig.diff
+use_autoreconf yes
+
configure.args CXXFLAGS=-I${prefix}/include
-checksums md5 033734dff97af88741f41633fbe992bc
+checksums md5 afab12d33fc201a7dbc2cfa116218079 \
+ sha1 86c15f3b3bcd89bfa8da9cef68518b32349ba36f \
+ rmd160 178c0093edfc9edc3f11afed06c4743ef86052e8
depends_build port:pkgconfig
depends_lib port:libsigcxx2 \
Added: trunk/dports/net/net6/files/patch-gnutls-pkgconfig.diff
===================================================================
--- trunk/dports/net/net6/files/patch-gnutls-pkgconfig.diff (rev 0)
+++ trunk/dports/net/net6/files/patch-gnutls-pkgconfig.diff 2009-09-15 21:50:47 UTC (rev 57737)
@@ -0,0 +1,206 @@
+--- configure.ac-old
++++ configure.ac
+@@ -72,18 +72,7 @@ AC_SUBST(addlibs)
+ AM_CONDITIONAL(WIN32, test x$win32 = xtrue)
+
+ # Checks for libraries.
+-PKG_CHECK_MODULES([libnet6], [sigc++-2.0])
+-
+-AM_PATH_LIBGNUTLS( 1.0.0,, AC_MSG_ERROR([[
+-***
+-*** libgnutls was not found. You may want to get it by using the
+-*** package manager of your distribution or by compiling the source
+-*** from ftp://ftp.gnutls.org/pub/gnutls/. This dependency is
+-*** now mandatory.
+-]]))
+-addlibs="$addlibs $LIBGNUTLS_LIBS"
+-addcflags="$LIBGNUTLS_CFLAGS"
+-AC_SUBST(addcflags)
++PKG_CHECK_MODULES([libnet6], [sigc++-2.0 gnutls])
+
+ # gettext / i18n
+ AM_GNU_GETTEXT([external])
+
+--- Makefile.am-old
++++ Makefile.am
+@@ -8,14 +8,14 @@ lib_LTLIBRARIES = libnet6.la
+ # interface : changes : compatibility
+ libnet6_la_LDFLAGS = -version-info 0:0:0 -release 1.3
+
+-libnet6_la_LIBADD = $(libnet6_LIBS) $(LIBGNUTLS_LIBS)
++libnet6_la_LIBADD = $(libnet6_LIBS)
+
+ if WIN32
+ libnet6_la_LIBADD += -lws2_32 -lintl
+ libnet6_la_LDFLAGS += -no-undefined
+ endif
+
+-INCLUDES = $(libnet6_CFLAGS) $(LIBGNUTLS_CFLAGS) -I$(srcdir)/inc
++INCLUDES = $(libnet6_CFLAGS) -I$(srcdir)/inc
+
+ pkginclude_HEADERS = \
+ inc/enum_ops.hpp \
+--- m4/libgnutls.m4
++++ /dev/null
+@@ -1,160 +0,0 @@
+-dnl Autoconf macros for libgnutls
+-dnl $id$
+-
+-# Modified for LIBGNUTLS -- nmav
+-# Configure paths for LIBGCRYPT
+-# Shamelessly stolen from the one of XDELTA by Owen Taylor
+-# Werner Koch 99-12-09
+-
+-dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+-dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
+-dnl
+-AC_DEFUN([AM_PATH_LIBGNUTLS],
+-[dnl
+-dnl Get the cflags and libraries from the libgnutls-config script
+-dnl
+-AC_ARG_WITH(libgnutls-prefix,
+- [ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)],
+- libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
+-
+- if test x$libgnutls_config_prefix != x ; then
+- if test x${LIBGNUTLS_CONFIG+set} != xset ; then
+- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
+- fi
+- fi
+-
+- AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
+- min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
+- AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
+- no_libgnutls=""
+- if test "$LIBGNUTLS_CONFIG" = "no" ; then
+- no_libgnutls=yes
+- else
+- LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
+- LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
+- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
+-
+-
+- ac_save_CXXFLAGS="$CXXFLAGS"
+- ac_save_LIBS="$LIBS"
+- CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS"
+- LIBS="$LIBS $LIBGNUTLS_LIBS"
+-dnl
+-dnl Now check if the installed libgnutls is sufficiently new. Also sanity
+-dnl checks the results of libgnutls-config to some extent
+-dnl
+- rm -f conf.libgnutlstest
+- AC_TRY_RUN([
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <gnutls/gnutls.h>
+-
+-int
+-main ()
+-{
+- system ("touch conf.libgnutlstest");
+-
+- if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
+- {
+- printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
+- "$libgnutls_config_version", gnutls_check_version(NULL) );
+- printf("*** was found! If libgnutls-config was correct, then it is best\n");
+- printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
+- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+- printf("*** required on your system.\n");
+- printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
+- printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
+- printf("*** before re-running configure\n");
+- }
+- else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
+- {
+- printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
+- printf("*** library (version %s)\n", gnutls_check_version(NULL) );
+- }
+- else
+- {
+- if ( gnutls_check_version( "$min_libgnutls_version" ) )
+- {
+- return 0;
+- }
+- else
+- {
+- printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
+- gnutls_check_version(NULL) );
+- printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
+- "$min_libgnutls_version" );
+- printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
+- printf("*** \n");
+- printf("*** If you have already installed a sufficiently new version, this error\n");
+- printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
+- printf("*** being found. The easiest way to fix this is to remove the old version\n");
+- printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
+- printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
+- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+- printf("*** so that the correct libraries are found at run-time))\n");
+- }
+- }
+- return 1;
+-}
+-],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+- CXXFLAGS="$ac_save_CXXFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+-
+- if test "x$no_libgnutls" = x ; then
+- AC_MSG_RESULT(yes)
+- ifelse([$2], , :, [$2])
+- else
+- if test -f conf.libgnutlstest ; then
+- :
+- else
+- AC_MSG_RESULT(no)
+- fi
+- if test "$LIBGNUTLS_CONFIG" = "no" ; then
+- echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
+- echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
+- echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
+- echo "*** full path to libgnutls-config."
+- else
+- if test -f conf.libgnutlstest ; then
+- :
+- else
+- echo "*** Could not run libgnutls test program, checking why..."
+- CXXFLAGS="$CXXFLAGS $LIBGNUTLS_CFLAGS"
+- LIBS="$LIBS $LIBGNUTLS_LIBS"
+- AC_TRY_LINK([
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <gnutls/gnutls.h>
+-], [ return !!gnutls_check_version(NULL); ],
+- [ echo "*** The test program compiled, but did not run. This usually means"
+- echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
+- echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
+- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+- echo "*** to the installed location Also, make sure you have run ldconfig if that"
+- echo "*** is required on your system"
+- echo "***"
+- echo "*** If you have an old version installed, it is best to remove it, although"
+- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+- echo "***" ],
+- [ echo "*** The test program failed to compile or link. See the file config.log for the"
+- echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
+- echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
+- echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
+- CXXFLAGS="$ac_save_CXXFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- fi
+- LIBGNUTLS_CFLAGS=""
+- LIBGNUTLS_LIBS=""
+- ifelse([$3], , :, [$3])
+- fi
+- rm -f conf.libgnutlstest
+- AC_SUBST(LIBGNUTLS_CFLAGS)
+- AC_SUBST(LIBGNUTLS_LIBS)
+-])
+-
+-dnl *-*wedit:notab*-* Please keep this as the last line.
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090915/bf5d9b97/attachment.html>
More information about the macports-changes
mailing list