1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00

Update to 0.7.4.

This commit is contained in:
Maxim Sobolev 2002-07-20 12:18:49 +00:00
parent 2bad28a773
commit 1dc07f416e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=63272
21 changed files with 111 additions and 306 deletions

View File

@ -6,31 +6,27 @@
#
PORTNAME= soup
PORTVERSION= 0.5.1
PORTVERSION= 0.7.4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/soup
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
xml.5:${PORTSDIR}/textproc/libxml
WRKSRC= ${WRKDIR}/${DISTNAME}
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_BZIP2= yes
USE_GNOMENG= yes
USE_GNOME= glib12
USE_GNOME= gnomehack glib12 libxml
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (soup-0.5.1.tar.gz) = 3890d3ea50a61e4eb576b18e60668dc0
MD5 (gnome/soup-0.7.4.tar.bz2) = 848ccf5e7616cd897593bab72bbc9b5a

View File

@ -1,27 +1,26 @@
$FreeBSD$
--- configure.orig Fri Sep 28 11:59:17 2001
+++ configure Fri Sep 28 12:00:34 2001
@@ -5722,9 +5722,9 @@
--- configure.orig Fri Jun 7 18:58:41 2002
+++ configure Sat Jul 20 15:01:54 2002
@@ -6554,6 +6554,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -7460,9 +7461,9 @@
rm -f conf.glibtest
- GLIB_CFLAGS=`glib-config --cflags glib`
- GLIB_LIBS=`glib-config --libs glib`
- GMODULE_LIBS=`glib-config --libs gmodule`
+ GLIB_CFLAGS=`$GLIB_CONFIG --cflags glib`
+ GLIB_LIBS=`$GLIB_CONFIG --libs glib`
+ GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
FAVOUR_LIBXML=1
SOUP_PKGCONFIG_REQUIRES="glib"
-GLIB_CFLAGS=`glib-config --cflags glib`
-GLIB_LIBS=`glib-config --libs glib`
-GMODULE_LIBS=`glib-config --libs gmodule`
+GLIB_CFLAGS=`$GLIB_CONFIG --cflags glib`
+GLIB_LIBS=`$GLIB_CONFIG --libs glib`
+GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
@@ -5854,8 +5854,6 @@
save_CPPFLAGS=$CPPFLAGS
save_LIBS=$LIBS
-CPPFLAGS=
-LIBS=
echo $ac_n "checking for poptGetContext in -lpopt""... $ac_c" 1>&6
echo "configure:5862: checking for poptGetContext in -lpopt" >&5

View File

@ -1,28 +0,0 @@
$FreeBSD$
--- ltmain.sh 2001/08/27 09:51:26 1.1
+++ ltmain.sh 2001/08/27 09:51:42
@@ -2408,6 +2408,9 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
+ *-*-freebsd*)
+ # FreeBSD doesn't need this...
+ ;;
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
@@ -4175,10 +4178,12 @@
fi
# Install the pseudo-library for information purposes.
+ if /usr/bin/false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

View File

@ -1,23 +0,0 @@
$FreeBSD$
--- src/libsoup/soup-socket.c 2001/09/28 12:13:58 1.1
+++ src/libsoup/soup-socket.c 2001/09/28 09:15:15
@@ -783,7 +783,7 @@
signal (SIGCHLD, SIG_IGN);
- if (ptrace (PTRACE_ATTACH, getppid (), NULL, NULL) == -1) {
+ if (ptrace (PT_ATTACH, getppid (), NULL, 0) == -1) {
/*
* Attach failed; it's probably already being
* debugged.
@@ -800,7 +800,7 @@
*/
waitpid (getppid (), NULL, 0);
- if (ptrace (PTRACE_DETACH, getppid (), NULL, NULL) == -1)
+ if (ptrace (PT_DETACH, getppid (), NULL, 0) == -1)
g_warning ("ptrace: Detach failed: %s",
strerror(errno));

View File

@ -1,14 +0,0 @@
$FreeBSD$
--- src/libsoup/soup-private.h.orig Tue Sep 18 00:56:04 2001
+++ src/libsoup/soup-private.h Fri Sep 28 12:03:36 2001
@@ -20,6 +20,8 @@
#include <config.h>
#endif
+#include <sys/types.h>
+
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif

View File

@ -9,11 +9,16 @@ include/soup/libsoup/soup-context.h
include/soup/libsoup/soup-dav-server.h
include/soup/libsoup/soup-dav.h
include/soup/libsoup/soup-env.h
include/soup/libsoup/soup-error.h
include/soup/libsoup/soup-fault.h
include/soup/libsoup/soup-headers.h
include/soup/libsoup/soup-message.h
include/soup/libsoup/soup-method.h
include/soup/libsoup/soup-misc.h
include/soup/libsoup/soup-ntlm.h
include/soup/libsoup/soup-parser.h
include/soup/libsoup/soup-serializer.h
include/soup/libsoup/soup-server-auth.h
include/soup/libsoup/soup-server.h
include/soup/libsoup/soup-socket.h
include/soup/libsoup/soup-uri.h
@ -28,13 +33,13 @@ include/soup/libwsdl/wsdl-typecodes.h
include/soup/libwsdl/wsdl.h
lib/libsoup-apache.a
lib/libsoup-apache.so
lib/libsoup-apache.so.2
lib/libsoup-apache.so.5
lib/libsoup.a
lib/libsoup.so
lib/libsoup.so.2
lib/libsoup.so.5
lib/libwsdl.a
lib/libwsdl.so
lib/libwsdl.so.2
lib/libwsdl.so.5
libdata/pkgconfig/soup.pc
share/aclocal/soup.m4
@dirrm share/doc/soup

View File

@ -6,31 +6,27 @@
#
PORTNAME= soup
PORTVERSION= 0.5.1
PORTVERSION= 0.7.4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/soup
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
xml.5:${PORTSDIR}/textproc/libxml
WRKSRC= ${WRKDIR}/${DISTNAME}
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_BZIP2= yes
USE_GNOMENG= yes
USE_GNOME= glib12
USE_GNOME= gnomehack glib12 libxml
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (soup-0.5.1.tar.gz) = 3890d3ea50a61e4eb576b18e60668dc0
MD5 (gnome/soup-0.7.4.tar.bz2) = 848ccf5e7616cd897593bab72bbc9b5a

View File

@ -1,27 +1,26 @@
$FreeBSD$
--- configure.orig Fri Sep 28 11:59:17 2001
+++ configure Fri Sep 28 12:00:34 2001
@@ -5722,9 +5722,9 @@
--- configure.orig Fri Jun 7 18:58:41 2002
+++ configure Sat Jul 20 15:01:54 2002
@@ -6554,6 +6554,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -7460,9 +7461,9 @@
rm -f conf.glibtest
- GLIB_CFLAGS=`glib-config --cflags glib`
- GLIB_LIBS=`glib-config --libs glib`
- GMODULE_LIBS=`glib-config --libs gmodule`
+ GLIB_CFLAGS=`$GLIB_CONFIG --cflags glib`
+ GLIB_LIBS=`$GLIB_CONFIG --libs glib`
+ GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
FAVOUR_LIBXML=1
SOUP_PKGCONFIG_REQUIRES="glib"
-GLIB_CFLAGS=`glib-config --cflags glib`
-GLIB_LIBS=`glib-config --libs glib`
-GMODULE_LIBS=`glib-config --libs gmodule`
+GLIB_CFLAGS=`$GLIB_CONFIG --cflags glib`
+GLIB_LIBS=`$GLIB_CONFIG --libs glib`
+GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
@@ -5854,8 +5854,6 @@
save_CPPFLAGS=$CPPFLAGS
save_LIBS=$LIBS
-CPPFLAGS=
-LIBS=
echo $ac_n "checking for poptGetContext in -lpopt""... $ac_c" 1>&6
echo "configure:5862: checking for poptGetContext in -lpopt" >&5

View File

@ -1,28 +0,0 @@
$FreeBSD$
--- ltmain.sh 2001/08/27 09:51:26 1.1
+++ ltmain.sh 2001/08/27 09:51:42
@@ -2408,6 +2408,9 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
+ *-*-freebsd*)
+ # FreeBSD doesn't need this...
+ ;;
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
@@ -4175,10 +4178,12 @@
fi
# Install the pseudo-library for information purposes.
+ if /usr/bin/false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

View File

@ -1,23 +0,0 @@
$FreeBSD$
--- src/libsoup/soup-socket.c 2001/09/28 12:13:58 1.1
+++ src/libsoup/soup-socket.c 2001/09/28 09:15:15
@@ -783,7 +783,7 @@
signal (SIGCHLD, SIG_IGN);
- if (ptrace (PTRACE_ATTACH, getppid (), NULL, NULL) == -1) {
+ if (ptrace (PT_ATTACH, getppid (), NULL, 0) == -1) {
/*
* Attach failed; it's probably already being
* debugged.
@@ -800,7 +800,7 @@
*/
waitpid (getppid (), NULL, 0);
- if (ptrace (PTRACE_DETACH, getppid (), NULL, NULL) == -1)
+ if (ptrace (PT_DETACH, getppid (), NULL, 0) == -1)
g_warning ("ptrace: Detach failed: %s",
strerror(errno));

View File

@ -1,14 +0,0 @@
$FreeBSD$
--- src/libsoup/soup-private.h.orig Tue Sep 18 00:56:04 2001
+++ src/libsoup/soup-private.h Fri Sep 28 12:03:36 2001
@@ -20,6 +20,8 @@
#include <config.h>
#endif
+#include <sys/types.h>
+
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif

View File

@ -9,11 +9,16 @@ include/soup/libsoup/soup-context.h
include/soup/libsoup/soup-dav-server.h
include/soup/libsoup/soup-dav.h
include/soup/libsoup/soup-env.h
include/soup/libsoup/soup-error.h
include/soup/libsoup/soup-fault.h
include/soup/libsoup/soup-headers.h
include/soup/libsoup/soup-message.h
include/soup/libsoup/soup-method.h
include/soup/libsoup/soup-misc.h
include/soup/libsoup/soup-ntlm.h
include/soup/libsoup/soup-parser.h
include/soup/libsoup/soup-serializer.h
include/soup/libsoup/soup-server-auth.h
include/soup/libsoup/soup-server.h
include/soup/libsoup/soup-socket.h
include/soup/libsoup/soup-uri.h
@ -28,13 +33,13 @@ include/soup/libwsdl/wsdl-typecodes.h
include/soup/libwsdl/wsdl.h
lib/libsoup-apache.a
lib/libsoup-apache.so
lib/libsoup-apache.so.2
lib/libsoup-apache.so.5
lib/libsoup.a
lib/libsoup.so
lib/libsoup.so.2
lib/libsoup.so.5
lib/libwsdl.a
lib/libwsdl.so
lib/libwsdl.so.2
lib/libwsdl.so.5
libdata/pkgconfig/soup.pc
share/aclocal/soup.m4
@dirrm share/doc/soup

View File

@ -6,31 +6,27 @@
#
PORTNAME= soup
PORTVERSION= 0.5.1
PORTVERSION= 0.7.4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/soup
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
xml.5:${PORTSDIR}/textproc/libxml
WRKSRC= ${WRKDIR}/${DISTNAME}
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_BZIP2= yes
USE_GNOMENG= yes
USE_GNOME= glib12
USE_GNOME= gnomehack glib12 libxml
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (soup-0.5.1.tar.gz) = 3890d3ea50a61e4eb576b18e60668dc0
MD5 (gnome/soup-0.7.4.tar.bz2) = 848ccf5e7616cd897593bab72bbc9b5a

View File

@ -1,27 +1,26 @@
$FreeBSD$
--- configure.orig Fri Sep 28 11:59:17 2001
+++ configure Fri Sep 28 12:00:34 2001
@@ -5722,9 +5722,9 @@
--- configure.orig Fri Jun 7 18:58:41 2002
+++ configure Sat Jul 20 15:01:54 2002
@@ -6554,6 +6554,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -7460,9 +7461,9 @@
rm -f conf.glibtest
- GLIB_CFLAGS=`glib-config --cflags glib`
- GLIB_LIBS=`glib-config --libs glib`
- GMODULE_LIBS=`glib-config --libs gmodule`
+ GLIB_CFLAGS=`$GLIB_CONFIG --cflags glib`
+ GLIB_LIBS=`$GLIB_CONFIG --libs glib`
+ GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
FAVOUR_LIBXML=1
SOUP_PKGCONFIG_REQUIRES="glib"
-GLIB_CFLAGS=`glib-config --cflags glib`
-GLIB_LIBS=`glib-config --libs glib`
-GMODULE_LIBS=`glib-config --libs gmodule`
+GLIB_CFLAGS=`$GLIB_CONFIG --cflags glib`
+GLIB_LIBS=`$GLIB_CONFIG --libs glib`
+GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
@@ -5854,8 +5854,6 @@
save_CPPFLAGS=$CPPFLAGS
save_LIBS=$LIBS
-CPPFLAGS=
-LIBS=
echo $ac_n "checking for poptGetContext in -lpopt""... $ac_c" 1>&6
echo "configure:5862: checking for poptGetContext in -lpopt" >&5

View File

@ -1,28 +0,0 @@
$FreeBSD$
--- ltmain.sh 2001/08/27 09:51:26 1.1
+++ ltmain.sh 2001/08/27 09:51:42
@@ -2408,6 +2408,9 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
+ *-*-freebsd*)
+ # FreeBSD doesn't need this...
+ ;;
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
@@ -4175,10 +4178,12 @@
fi
# Install the pseudo-library for information purposes.
+ if /usr/bin/false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

View File

@ -1,23 +0,0 @@
$FreeBSD$
--- src/libsoup/soup-socket.c 2001/09/28 12:13:58 1.1
+++ src/libsoup/soup-socket.c 2001/09/28 09:15:15
@@ -783,7 +783,7 @@
signal (SIGCHLD, SIG_IGN);
- if (ptrace (PTRACE_ATTACH, getppid (), NULL, NULL) == -1) {
+ if (ptrace (PT_ATTACH, getppid (), NULL, 0) == -1) {
/*
* Attach failed; it's probably already being
* debugged.
@@ -800,7 +800,7 @@
*/
waitpid (getppid (), NULL, 0);
- if (ptrace (PTRACE_DETACH, getppid (), NULL, NULL) == -1)
+ if (ptrace (PT_DETACH, getppid (), NULL, 0) == -1)
g_warning ("ptrace: Detach failed: %s",
strerror(errno));

View File

@ -1,14 +0,0 @@
$FreeBSD$
--- src/libsoup/soup-private.h.orig Tue Sep 18 00:56:04 2001
+++ src/libsoup/soup-private.h Fri Sep 28 12:03:36 2001
@@ -20,6 +20,8 @@
#include <config.h>
#endif
+#include <sys/types.h>
+
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif

View File

@ -9,11 +9,16 @@ include/soup/libsoup/soup-context.h
include/soup/libsoup/soup-dav-server.h
include/soup/libsoup/soup-dav.h
include/soup/libsoup/soup-env.h
include/soup/libsoup/soup-error.h
include/soup/libsoup/soup-fault.h
include/soup/libsoup/soup-headers.h
include/soup/libsoup/soup-message.h
include/soup/libsoup/soup-method.h
include/soup/libsoup/soup-misc.h
include/soup/libsoup/soup-ntlm.h
include/soup/libsoup/soup-parser.h
include/soup/libsoup/soup-serializer.h
include/soup/libsoup/soup-server-auth.h
include/soup/libsoup/soup-server.h
include/soup/libsoup/soup-socket.h
include/soup/libsoup/soup-uri.h
@ -28,13 +33,13 @@ include/soup/libwsdl/wsdl-typecodes.h
include/soup/libwsdl/wsdl.h
lib/libsoup-apache.a
lib/libsoup-apache.so
lib/libsoup-apache.so.2
lib/libsoup-apache.so.5
lib/libsoup.a
lib/libsoup.so
lib/libsoup.so.2
lib/libsoup.so.5
lib/libwsdl.a
lib/libwsdl.so
lib/libwsdl.so.2
lib/libwsdl.so.5
libdata/pkgconfig/soup.pc
share/aclocal/soup.m4
@dirrm share/doc/soup