From owner-freebsd-ports Sun May 9 6: 0: 4 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id C391214EAA for ; Sun, 9 May 1999 06:00:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id GAA28051; Sun, 9 May 1999 06:00:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D4448156F0; Sun, 9 May 1999 05:53:14 -0700 (PDT) Message-Id: <19990509125314.D4448156F0@hub.freebsd.org> Date: Sun, 9 May 1999 05:53:14 -0700 (PDT) From: pfgiffun@bachue.usc.unal.edu.co To: freebsd-gnats-submit@freebsd.org X-Send-Pr-Version: www-1.0 Subject: ports/11606: Unbreaking the w3c-httpd port Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 11606 >Category: ports >Synopsis: Unbreaking the w3c-httpd port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun May 9 06:00:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Pedro F. Giffuni >Release: 3.1-Release >Organization: U. Nacional de Colombia >Environment: >Description: w3c-httpd doesn't seem to be broken under ELF, it even build with egcs. >How-To-Repeat: Here is a patch that includes a fix provided by Graham Wheeler some time ago (sorry for the delay) >Fix: diff -rNu w3c-httpd.old/Makefile w3c-httpd/Makefile --- w3c-httpd.old/Makefile Fri May 7 20:33:18 1999 +++ w3c-httpd/Makefile Sat May 8 17:45:00 1999 @@ -11,11 +11,9 @@ MASTER_SITES= ftp://ftp.w3.org/pub/httpd/ \ ftp://ftp-eu.w3.org/pub/httpd/ -MAINTAINER= giffunip@asme.org +MAINTAINER= ports@FreeBSD.org NO_WRKSUBDIR= yes - -BROKEN_ELF= yes WWW_ROOT= ${PREFIX}/www diff -rNu w3c-httpd.old/patches/patch-SSL w3c-httpd/patches/patch-SSL --- w3c-httpd.old/patches/patch-SSL Fri May 7 20:33:18 1999 +++ w3c-httpd/patches/patch-SSL Sat May 8 14:18:35 1999 @@ -363,19 +363,19 @@ + fd_set rd_fds, wr_fds; + int status; + -+ memset(&rd_fds, 0, sizeof(rd_fds)); -+ memset(&wr_fds, 0, sizeof(wr_fds)); -+ + if (initial && *initial) { + strcpy(b1, initial); + c1 = strlen(initial); + } + + while (1) { -+ FD_SET(sd1, &rd_fds); -+ FD_SET(sd2, &rd_fds); -+ FD_SET(sd1, &wr_fds); -+ FD_SET(sd2, &wr_fds); ++ FD_ZERO(&rd_fds); ++ FD_ZERO(&wr_fds); ++ /* Only set the FDs that are relevant - 10/12/98 gram@cdsec.com */ ++ if (!c1) FD_SET(sd2, &rd_fds); ++ else FD_SET(sd1, &wr_fds); ++ if (!c2) FD_SET(sd1, &rd_fds); ++ else FD_SET(sd2, &wr_fds); + + if (!(status = select(n_fds, &rd_fds, &wr_fds, NULL, NULL))) + { @@ -404,12 +404,12 @@ + if (shove_buffer(sd2, b2, &i2, &c2) == -1) + closed2 = 1; + } -+ if (r1 && !c2) ++ if (r1) + { + if (!drag_buffer(sd1, b2, &i2, &c2)) + closed1 = 1; + } -+ if (r2 && !c1) ++ if (r2) + { + if (!drag_buffer(sd2, b1, &i1, &c1)) + closed2 = 1; diff -rNu w3c-httpd.old/patches/patch-bb w3c-httpd/patches/patch-bb --- w3c-httpd.old/patches/patch-bb Fri May 7 20:33:18 1999 +++ w3c-httpd/patches/patch-bb Sun May 9 07:48:10 1999 @@ -1,19 +1,44 @@ -*** All/freebsd/Makefile.include.orig Mon Dec 30 17:18:49 1996 ---- All/freebsd/Makefile.include Mon Dec 30 17:19:46 1996 +*** All/freebsd/Makefile.include.orig Wed Jan 10 20:07:31 1996 +--- All/freebsd/Makefile.include Sat May 8 12:30:11 1999 *************** -*** 5,11 **** +*** 4,14 **** + # For W3 distribution, machine type for subdirectories WWW_MACH = freebsd - CFLAGS += -DDEBUG -D__BSD__ +! CFLAGS += -DDEBUG -D__BSD__ ! LFLAGS = # Directory for installed binary: - BINDIR = /usr/local/bin ---- 5,11 ---- +! BINDIR = /usr/local/bin + + # Where is the W3 object library to be installed (not normally done)? + LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) +--- 4,14 ---- + # For W3 distribution, machine type for subdirectories WWW_MACH = freebsd - CFLAGS += -DDEBUG -D__BSD__ -! LFLAGS = -lcrypt +! CFLAGS += -D__BSD__ +! LFLAGS += -lcrypt # Directory for installed binary: - BINDIR = /usr/local/bin +! BINDIR = $(PREFIX)/bin + + # Where is the W3 object library to be installed (not normally done)? + LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) +*************** +*** 25,31 **** + # + # Uncomment these six lines (and edit them, if necessary). + # +! # WAIS = ../../../freeWAIS + # WAISLIB = $(WAIS)/bin/client.a $(WAIS)/bin/wais.a + # MATHLIB = -lm + # WAISINC = -I$(WAIS)/include +--- 25,31 ---- + # + # Uncomment these six lines (and edit them, if necessary). + # +! # WAIS = ${PORTSDIR}/net/wais/work/freeWAIS-0.5/src + # WAISLIB = $(WAIS)/bin/client.a $(WAIS)/bin/wais.a + # MATHLIB = -lm + # WAISINC = -I$(WAIS)/include >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message