From 44b93c4e1fbd678b5fa05ba5d7c3d19b923d8f8f Mon Sep 17 00:00:00 2001 From: Christian Weisgerber Date: Mon, 22 Jul 2002 18:52:50 +0000 Subject: * Update to 1.0.13. PR: 40849 Submitted by: Tilman Linneweh * Requires perl to build. * Don't overwrite optimization level passed in CFLAGS. * Fix build with gcc3.1 (-CURRENT). Reviewed by: Tilman Linneweh * There are serious LP64 issues; only build on i386. --- net/slirp/Makefile | 18 +++++++++++++++--- net/slirp/distinfo | 2 +- net/slirp/files/patch-aa | 16 ---------------- net/slirp/files/patch-ab | 32 +++++++++----------------------- net/slirp/files/patch-configure | 17 +++++++++++++++++ net/slirp/files/patch-mkpro | 15 +++++++++++++++ 6 files changed, 57 insertions(+), 43 deletions(-) delete mode 100644 net/slirp/files/patch-aa create mode 100644 net/slirp/files/patch-configure create mode 100644 net/slirp/files/patch-mkpro diff --git a/net/slirp/Makefile b/net/slirp/Makefile index 6fb067f1cd50..58eeb804df39 100644 --- a/net/slirp/Makefile +++ b/net/slirp/Makefile @@ -6,14 +6,26 @@ # PORTNAME= slirp -PORTVERSION= 1.0c +PORTVERSION= 1.0.13 +PORTEPOCH= 1 CATEGORIES= net -MASTER_SITES= ftp://blitzen.canberra.edu.au/pub/slirp/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR=slirp MAINTAINER= ports@FreeBSD.Org -WRKSRC= ${WRKDIR}/slirp-1.0c/src +BUILD_DEPENDS= perl:${PORTSDIR}/lang/perl5 + +# serious LP64 issues +ONLY_FOR_ARCHS= i386 + +WRKSRC= ${WRKDIR}/${DISTNAME}/src GNU_CONFIGURE= yes + MAN1= slirp.1 +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/slirp ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/slirp.man ${PREFIX}/man/man1/slirp.1 + .include diff --git a/net/slirp/distinfo b/net/slirp/distinfo index 74ab479cc450..9748e9014a76 100644 --- a/net/slirp/distinfo +++ b/net/slirp/distinfo @@ -1 +1 @@ -MD5 (slirp-1.0c.tar.gz) = 62aad016f16b51cbdef4c8e34454f31a +MD5 (slirp-1.0.13.tar.gz) = aaa37a0e6433d177f09ba10145c7d8d3 diff --git a/net/slirp/files/patch-aa b/net/slirp/files/patch-aa deleted file mode 100644 index 7dbd8ab19205..000000000000 --- a/net/slirp/files/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.in~ Wed Dec 11 21:13:24 1996 -+++ Makefile.in Wed Dec 11 21:14:20 1996 -@@ -45,11 +45,10 @@ - $(CC) @LDFLAGS@ -o slirp $(OBJ) $(LIBS) - - install: slirp install.man -- strip slirp -- cp slirp $(BINDIR) -+ install -c -s -m 755 slirp $(BINDIR) - - install.man: -- cp slirp.man $(MANDIR)/slirp.$(MANEXT) -+ install -c -m 644 slirp.man $(MANDIR)/slirp.$(MANEXT) - - objclean: - rm -f $(OBJ) diff --git a/net/slirp/files/patch-ab b/net/slirp/files/patch-ab index 1b114247ead0..dc7b2a00867b 100644 --- a/net/slirp/files/patch-ab +++ b/net/slirp/files/patch-ab @@ -1,34 +1,20 @@ ---- tcp_subr.c.orig Fri Dec 29 15:45:51 1995 -+++ tcp_subr.c Fri Apr 16 09:03:57 1999 -@@ -238,14 +238,14 @@ +--- tcp_subr.c.orig Sun Jul 21 19:23:18 2002 ++++ tcp_subr.c Sun Jul 21 19:25:12 2002 +@@ -241,7 +241,7 @@ * then send a RST to peer. */ struct tcpcb * --tcp_drop(tp, errno) -+tcp_drop(tp, err) +-tcp_drop(struct tcpcb *tp, int errno) { ++tcp_drop(struct tcpcb *tp, int err) { + /* tcp_drop(tp, errno) register struct tcpcb *tp; -- int errno; -+ int err; - { + int errno; +@@ -250,7 +250,7 @@ DEBUG_CALL("tcp_drop"); DEBUG_ARG("tp = %lx", (long)tp); - DEBUG_ARG("errno = %d", errno); -+ DEBUG_ARG("err = %d", err); ++ DEBUG_ARG("errno = %d", err); if (TCPS_HAVERCVDSYN(tp->t_state)) { tp->t_state = TCPS_CLOSED; -@@ -253,10 +253,10 @@ - tcpstat.tcps_drops++; - } else - tcpstat.tcps_conndrops++; --/* if (errno == ETIMEDOUT && tp->t_softerror) -- * errno = tp->t_softerror; -+/* if (err == ETIMEDOUT && tp->t_softerror) -+ * err = tp->t_softerror; - */ --/* so->so_error = errno; */ -+/* so->so_error = err; */ - return (tcp_close(tp)); - } - diff --git a/net/slirp/files/patch-configure b/net/slirp/files/patch-configure new file mode 100644 index 000000000000..ab7a3e96efdd --- /dev/null +++ b/net/slirp/files/patch-configure @@ -0,0 +1,17 @@ + +$FreeBSD$ + +--- configure.orig Mon Jul 22 00:48:09 2002 ++++ configure Mon Jul 22 00:48:28 2002 +@@ -846,9 +846,9 @@ + echo "$ac_t""$CPP" 1>&6 + + if test x$GCC = xyes; then +- CFLAGS2="-O2 -Wall -Wno-implicit -Wmissing-prototypes" ++ CFLAGS2="" + else +- CFLAGS2="-O" ++ CFLAGS2="" + echo "WARNING: Not using GCC to compile may be hazzardous to your health." + echo " If you can get Slirp to compile and run w/o GCC, notify us so" + echo " we can test for which compiler you're using. RedWolf recommends" diff --git a/net/slirp/files/patch-mkpro b/net/slirp/files/patch-mkpro new file mode 100644 index 000000000000..1c4fe24a2b8d --- /dev/null +++ b/net/slirp/files/patch-mkpro @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- mkpro.orig Mon Jul 22 02:52:35 2002 ++++ mkpro Mon Jul 22 02:54:36 2002 +@@ -42,6 +42,9 @@ + + # Ignore blank lines + (/^[ \t]*$/) && next WHILE; ++ ++ # Skip remaining pre-processor directives ++ (/^#/) && next WHILE; + + # C comments and pre-processor directives are already removed + -- cgit v1.2.3