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

switch branch from 1.1 to 2.0

Browse Source
This commit is contained in:
jolan 2003-07-25 06:42:05 +00:00
parent 03feeb8ee3
commit f132a6380b
9 changed files with 70 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/gnet/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.2 2003/07/07 21:03:09 pvalchev Exp $
# $OpenBSD: Makefile,v 1.3 2003/07/25 06:42:05 jolan Exp $
COMMENT= "simple network library"
DISTNAME= gnet-1.1.9
DISTNAME= gnet-2.0.3
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}src/
@ -24,8 +24,9 @@ LIB_DEPENDS= glib-2.0.0.0,gthread-2.0.0.0::devel/glib2
PATCH_LIST= gcc-* patch-*
.endif
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--enable-glib2 --enable-threadsafe-gethostbyname
CONFIGURE_ARGS+=${CONFIGURE_SHARED}
AUTOCONF_VERSION=2.52
CONFIGURE_STYLE=autoconf
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--enable-threadsafe-getaddrinfo --enable-threadsafe-gethostbyname
.include <bsd.port.mk>

6
net/gnet/distinfo
View File

@ -1,3 +1,3 @@
MD5 (gnet-1.1.9.tar.gz) = 381b5c6d4031806fc4c3e6b28dc752ec
RMD160 (gnet-1.1.9.tar.gz) = 485cf7b3f03dbe274e0c39b5d6257c99e94e8dfb
SHA1 (gnet-1.1.9.tar.gz) = ba11b517af06e84f710527d29a047f8a2603d4b3
MD5 (gnet-2.0.3.tar.gz) = 547e36985eabcd931d8ee63449bd04ad
RMD160 (gnet-2.0.3.tar.gz) = 94197779e8adf2e59785b602b673bcd7c2d9c19e
SHA1 (gnet-2.0.3.tar.gz) = 8f4ac2e7d8fea19098185c2670c53149a126be12

8
net/gnet/patches/gcc-patch-src_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: gcc-patch-src_Makefile_in,v 1.1.1.1 2003/05/23 21:26:46 jolan Exp $
--- src/Makefile.in.orig Tue Apr 29 12:56:59 2003
+++ src/Makefile.in Wed May 21 17:36:31 2003
@@ -177,6 +177,9 @@ uninstall-libLTLIBRARIES:
$OpenBSD: gcc-patch-src_Makefile_in,v 1.2 2003/07/25 06:42:05 jolan Exp $
--- src/Makefile.in.orig Tue May 13 20:23:08 2003
+++ src/Makefile.in Wed May 21 18:47:31 2003
@@ -184,6 +184,9 @@ uninstall-libLTLIBRARIES:
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done

12
net/gnet/patches/patch-Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2003/05/23 21:26:46 jolan Exp $
--- Makefile.in.orig Tue Apr 29 12:56:59 2003
+++ Makefile.in Tue May 20 19:30:12 2003
@@ -95,7 +95,7 @@ STRIP = @STRIP@
$OpenBSD: patch-Makefile_in,v 1.2 2003/07/25 06:42:05 jolan Exp $
--- Makefile.in.orig Tue May 13 20:23:08 2003
+++ Makefile.in Fri Jul 25 00:44:14 2003
@@ -101,7 +101,7 @@ RANLIB = @RANLIB@
STRIP = @STRIP@
VERSION = @VERSION@
pthread_libs = @pthread_libs@
-SUBDIRS = src examples tests doc
+SUBDIRS = src examples tests
EXTRA_DIST = TODO HACKING BUGS README.macosx gnetconfig.h.in README.win32 GNET.DSP config.h.win32 gnet.def gnet.m4 gnet.spec gnet.spec.in gnet.pc.in examples/makefile.mingw src/makefile.mingw src/gnet-private.h src/socks-private.h tests/makefile.mingw
EXTRA_DIST = TODO HACKING BUGS README.macosx gnetconfig.h.in README.win32 GNET.DSP config.h.win32 gnet.def gnet.spec gnet.spec.in examples/makefile.mingw src/makefile.mingw src/gnet-private.h src/socks-private.h src/usagi_ifaddrs.h tests/makefile.mingw tests/testfile tests/client_server_test.pl tests/dns_test.pl gnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).m4 gnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).pc.in

47
net/gnet/patches/patch-configure
View File

@ -1,47 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2003/05/23 21:26:46 jolan Exp $
--- configure.orig Mon Apr 28 20:00:52 2003
+++ configure Fri May 23 10:40:48 2003
@@ -5909,7 +5909,7 @@ else
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
export_dynamic_flag_spec='${wl}-E'
else
case "$host_os" in
@@ -5919,7 +5919,7 @@ else
;;
*)
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
;;
esac
fi
@@ -8117,13 +8117,13 @@ fi;
if test "x${enable_pthreads}" = "xyes"; then
pthread_libs=""
- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -8172,7 +8172,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
if test $ac_cv_lib_pthread_pthread_create = yes; then
- pthread_libs="-lpthread"
+ pthread_libs="-pthread"
fi
echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5

22
net/gnet/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-configure_ac,v 1.1 2003/07/25 06:42:05 jolan Exp $
--- configure.ac.orig Tue May 13 20:17:59 2003
+++ configure.ac Wed May 21 22:43:21 2003
@@ -152,18 +152,6 @@ if test "x${enable_pthreads}" = "xyes";
AC_MSG_RESULT(no)])
])
LIBS="$gnet_save_LIBS $dash_pthread"
-
- AC_CHECK_LIB([pthread],
- [pthread_create],
- [PTHREAD_LIBS="-lpthread"])
- AC_CHECK_LIB([c_r],
- [pthread_create],
- [PTHREAD_LIBS="-lc_r $PTHREAD_LIBS"])
- if test "x$PTHREAD_LIBS" != "x"; then
- AC_DEFINE(HAVE_LIBPTHREAD, 1,
- [Define if pthreads library is available])
- LIBS="$PTHREAD_LIBS $LIBS"
- fi
fi

6
net/gnet/pkg/DESCR
View File

@ -1,4 +1,2 @@
GNet is a simple network library. It is written in C, object-oriented,
and built upon GLib.
WWW: ${HOMEPAGE}
GNet2 is a simple network library. It is written in C, object-oriented,
and built upon GLib2.

4
net/gnet/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2003/05/23 21:26:46 jolan Exp $
lib/libgnet.so.7.2
@comment $OpenBSD: PFRAG.shared,v 1.2 2003/07/25 06:42:05 jolan Exp $
lib/libgnet-2.0.so.0.3
DYNLIBDIR(%D/lib)

49
net/gnet/pkg/PLIST
View File

@ -1,27 +1,28 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2003/05/23 21:26:46 jolan Exp $
bin/gnet-config
include/gnet/conn.h
include/gnet/gnet.h
include/gnet/inetaddr.h
include/gnet/iochannel.h
include/gnet/mcast.h
include/gnet/md5.h
include/gnet/pack.h
include/gnet/server.h
include/gnet/sha.h
include/gnet/socks.h
include/gnet/tcp.h
include/gnet/udp.h
include/gnet/unix.h
include/gnet/url.h
lib/gnet/include/gnetconfig.h
lib/libgnet.a
lib/libgnet.la
lib/pkgconfig/gnet.pc
share/aclocal/gnet.m4
@comment $OpenBSD: PLIST,v 1.2 2003/07/25 06:42:05 jolan Exp $
include/gnet-2.0/base64.h
include/gnet-2.0/conn.h
include/gnet-2.0/gnet.h
include/gnet-2.0/inetaddr.h
include/gnet-2.0/iochannel.h
include/gnet-2.0/ipv6.h
include/gnet-2.0/mcast.h
include/gnet-2.0/md5.h
include/gnet-2.0/pack.h
include/gnet-2.0/server.h
include/gnet-2.0/sha.h
include/gnet-2.0/socks.h
include/gnet-2.0/tcp.h
include/gnet-2.0/udp.h
include/gnet-2.0/unix.h
include/gnet-2.0/uri.h
lib/gnet-2.0/include/gnetconfig.h
lib/libgnet-2.0.a
lib/libgnet-2.0.la
lib/pkgconfig/gnet-2.0.pc
share/aclocal/gnet-2.0.m4
%%SHARED%%
@comment @dirrm share/aclocal
@comment @dirrm lib/pkgconfig
@dirrm lib/gnet/include
@dirrm lib/gnet
@dirrm include/gnet
@dirrm lib/gnet-2.0/include
@dirrm lib/gnet-2.0
@dirrm include/gnet-2.0