From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 18 15:10:23 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D9C8516A45B for ; Mon, 18 Jul 2005 15:10:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 716D743D48 for ; Mon, 18 Jul 2005 15:10:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6IFANSx037396 for ; Mon, 18 Jul 2005 15:10:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6IFAN1W037395; Mon, 18 Jul 2005 15:10:23 GMT (envelope-from gnats) Resent-Date: Mon, 18 Jul 2005 15:10:23 GMT Resent-Message-Id: <200507181510.j6IFAN1W037395@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Morozovsky Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 14FFF16A41C for ; Mon, 18 Jul 2005 15:08:53 +0000 (GMT) (envelope-from marck@woozle.rinet.ru) Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7355243D45 for ; Mon, 18 Jul 2005 15:08:52 +0000 (GMT) (envelope-from marck@woozle.rinet.ru) Received: from woozle.rinet.ru (localhost [127.0.0.1]) by woozle.rinet.ru (8.13.3/8.13.3) with ESMTP id j6IF8oRr054075 for ; Mon, 18 Jul 2005 19:08:50 +0400 (MSD) (envelope-from marck@woozle.rinet.ru) Received: (from marck@localhost) by woozle.rinet.ru (8.13.3/8.13.3/Submit) id j6IF8o2f054074; Mon, 18 Jul 2005 19:08:50 +0400 (MSD) (envelope-from marck) Message-Id: <200507181508.j6IF8o2f054074@woozle.rinet.ru> Date: Mon, 18 Jul 2005 19:08:50 +0400 (MSD) From: Dmitry Morozovsky To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/83675: [maintainer] www/oops patch for 7-current X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Morozovsky List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jul 2005 15:10:24 -0000 >Number: 83675 >Category: ports >Synopsis: [maintainer] www/oops patch for 7-current >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jul 18 15:10:23 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Dmitry Morozovsky >Release: FreeBSD 4-STABLE i386 >Organization: Cronyx Plus LLC (RiNet ISP) >Environment: System: FreeBSD 7-CURRENT >Description: change for oops for newly created 7-current. Also, fix build for releases 5.[012]* >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/oops/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- Makefile 30 May 2005 21:20:39 -0000 1.37 +++ Makefile 18 Jul 2005 15:07:56 -0000 @@ -7,7 +7,7 @@ PORTNAME= oops PORTVERSION= ${OOPSVERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://oops-cache.org/ DISTNAME= ${PORTNAME}-${OOPSVERSION} Index: files/patch-configure.in =================================================================== RCS file: /home/ncvs/ports/www/oops/files/patch-configure.in,v retrieving revision 1.10 diff -u -r1.10 patch-configure.in --- files/patch-configure.in 5 Feb 2005 18:33:40 -0000 1.10 +++ files/patch-configure.in 18 Jul 2005 15:07:56 -0000 @@ -1,9 +1,9 @@ -$FreeBSD: ports/www/oops/files/patch-configure.in,v 1.10 2005/02/05 18:33:40 pav Exp $ +$FreeBSD$ --- configure.in.orig +++ configure.in -@@ -328,14 +328,20 @@ +@@ -328,14 +328,17 @@ rel=`uname -r` case "$rel" in 4*) @@ -16,13 +16,10 @@ - *) - CFLAGS="$CFLAGS -pthread" - LIBS="-lc_r $LEXLIB $LIBS" -+ 5.[012]*) ++ 5.[[012]]*) + LIBS="$PTHREAD_LIBS $LEXLIB $LIBS" + ;; -+ 5*) -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS" -+ ;; -+ 6*) ++ [[567]]*) + CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS" + ;; + *) @@ -31,7 +28,7 @@ ;; esac RPATH_OPTION="-rpath" -@@ -430,10 +436,10 @@ +@@ -430,10 +433,10 @@ esac if test "X$MYSQL_PATH" != "X" ; then >Release-Note: >Audit-Trail: >Unformatted: