Date: Mon, 18 Jul 2005 19:08:50 +0400 (MSD) From: Dmitry Morozovsky <marck@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/83675: [maintainer] www/oops patch for 7-current Message-ID: <200507181508.j6IF8o2f054074@woozle.rinet.ru> Resent-Message-ID: <200507181510.j6IFAN1W037395@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507181508.j6IF8o2f054074>