From fe915ce9d38ba195dbf236a1f332cc7c5c8fc82b Mon Sep 17 00:00:00 2001 From: Sergey Matveychuk Date: Fri, 24 Dec 2004 01:34:06 +0000 Subject: - Update to 0.11.8.1 PR: ports/75278 Submitted by: Joel Diaz Approved by: maintainer --- net-p2p/gift/Makefile | 16 ++++------------ net-p2p/gift/distinfo | 4 ++-- net-p2p/gift/files/patch-configure | 20 ++++++++++++++++++++ net/gift/Makefile | 16 ++++------------ net/gift/distinfo | 4 ++-- net/gift/files/patch-configure | 20 ++++++++++++++++++++ 6 files changed, 52 insertions(+), 28 deletions(-) create mode 100644 net-p2p/gift/files/patch-configure create mode 100644 net/gift/files/patch-configure diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile index baf7ad6ee6cf..04cc3eb78a26 100644 --- a/net-p2p/gift/Makefile +++ b/net-p2p/gift/Makefile @@ -6,8 +6,7 @@ # PORTNAME= giFT -PORTVERSION= 0.11.6 -PORTREVISION= 1 +PORTVERSION= 0.11.8.1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME:L} @@ -16,13 +15,9 @@ DISTNAME= ${PORTNAME:L}-${PORTVERSION} MAINTAINER= shoesoft@gmx.net COMMENT= An OpenFT, Gnutella and FastTrack p2p network client -LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \ - Magick.7:${PORTSDIR}/graphics/ImageMagick -.if defined(WITH_LIBMAGIC) -BUILD_DEPENDS+= ${LOCALBASE}/include/magic.h:${PORTSDIR}/sysutils/file -LIB_DEPENDS+= magic.1:${PORTSDIR}/sysutils/file -.endif +LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis +USE_GNOME= glib20 USE_LIBLTDL= yes USE_BZIP2= yes USE_REINPLACE= yes @@ -32,10 +27,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" -INSTALLS_SHLIB =yes -.if defined(WITH_LIBMAGIC) -CONFIGURE_ARGS= --enable-libmagic -.endif +INSTALLS_SHLIB= yes MAN1= giftd.1 diff --git a/net-p2p/gift/distinfo b/net-p2p/gift/distinfo index 30815981218b..3cb17505d105 100644 --- a/net-p2p/gift/distinfo +++ b/net-p2p/gift/distinfo @@ -1,2 +1,2 @@ -MD5 (gift-0.11.6.tar.bz2) = 614c7dc355c65522424b649684fde8be -SIZE (gift-0.11.6.tar.bz2) = 533799 +MD5 (gift-0.11.8.1.tar.bz2) = 1c70477af403af142359d07ee4a03348 +SIZE (gift-0.11.8.1.tar.bz2) = 541446 diff --git a/net-p2p/gift/files/patch-configure b/net-p2p/gift/files/patch-configure new file mode 100644 index 000000000000..3783e5f8538c --- /dev/null +++ b/net-p2p/gift/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig Fri Dec 24 04:13:11 2004 ++++ configure Fri Dec 24 04:13:41 2004 +@@ -21401,7 +21401,7 @@ + void f (int i, ...) { + va_list a1, a2; + va_start (a1, i); +- __va_copy (a2, a1); ++ a2 = a1; + if (va_arg (a2, int) != 42 || + va_arg (a1, int) != 42) + exit (1); +@@ -21452,7 +21452,7 @@ + #define VA_COPY_FUNC __va_copy + #endif + _ACEOF +- else if test "x$libgift_cv_copy_by_val" = "xyes"; then ++ else if test "x$libgift_cv_va_copy_by_val" = "xyes"; then + cat >>gconfdefs.h <<_ACEOF + #ifndef VA_COPY_BY_VAL + #define VA_COPY_BY_VAL 1 diff --git a/net/gift/Makefile b/net/gift/Makefile index baf7ad6ee6cf..04cc3eb78a26 100644 --- a/net/gift/Makefile +++ b/net/gift/Makefile @@ -6,8 +6,7 @@ # PORTNAME= giFT -PORTVERSION= 0.11.6 -PORTREVISION= 1 +PORTVERSION= 0.11.8.1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME:L} @@ -16,13 +15,9 @@ DISTNAME= ${PORTNAME:L}-${PORTVERSION} MAINTAINER= shoesoft@gmx.net COMMENT= An OpenFT, Gnutella and FastTrack p2p network client -LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \ - Magick.7:${PORTSDIR}/graphics/ImageMagick -.if defined(WITH_LIBMAGIC) -BUILD_DEPENDS+= ${LOCALBASE}/include/magic.h:${PORTSDIR}/sysutils/file -LIB_DEPENDS+= magic.1:${PORTSDIR}/sysutils/file -.endif +LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis +USE_GNOME= glib20 USE_LIBLTDL= yes USE_BZIP2= yes USE_REINPLACE= yes @@ -32,10 +27,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" -INSTALLS_SHLIB =yes -.if defined(WITH_LIBMAGIC) -CONFIGURE_ARGS= --enable-libmagic -.endif +INSTALLS_SHLIB= yes MAN1= giftd.1 diff --git a/net/gift/distinfo b/net/gift/distinfo index 30815981218b..3cb17505d105 100644 --- a/net/gift/distinfo +++ b/net/gift/distinfo @@ -1,2 +1,2 @@ -MD5 (gift-0.11.6.tar.bz2) = 614c7dc355c65522424b649684fde8be -SIZE (gift-0.11.6.tar.bz2) = 533799 +MD5 (gift-0.11.8.1.tar.bz2) = 1c70477af403af142359d07ee4a03348 +SIZE (gift-0.11.8.1.tar.bz2) = 541446 diff --git a/net/gift/files/patch-configure b/net/gift/files/patch-configure new file mode 100644 index 000000000000..3783e5f8538c --- /dev/null +++ b/net/gift/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig Fri Dec 24 04:13:11 2004 ++++ configure Fri Dec 24 04:13:41 2004 +@@ -21401,7 +21401,7 @@ + void f (int i, ...) { + va_list a1, a2; + va_start (a1, i); +- __va_copy (a2, a1); ++ a2 = a1; + if (va_arg (a2, int) != 42 || + va_arg (a1, int) != 42) + exit (1); +@@ -21452,7 +21452,7 @@ + #define VA_COPY_FUNC __va_copy + #endif + _ACEOF +- else if test "x$libgift_cv_copy_by_val" = "xyes"; then ++ else if test "x$libgift_cv_va_copy_by_val" = "xyes"; then + cat >>gconfdefs.h <<_ACEOF + #ifndef VA_COPY_BY_VAL + #define VA_COPY_BY_VAL 1 -- cgit v1.2.3