From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 2 17:00:32 2006 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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CE1E216A4C8 for ; Sat, 2 Dec 2006 17:00:32 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F33C43CAE for ; Sat, 2 Dec 2006 17:00:08 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kB2H0TYs053709 for ; Sat, 2 Dec 2006 17:00:29 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kB2H0TWo053708; Sat, 2 Dec 2006 17:00:29 GMT (envelope-from gnats) Resent-Date: Sat, 2 Dec 2006 17:00:29 GMT Resent-Message-Id: <200612021700.kB2H0TWo053708@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, Rong-En Fan Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4BCE316A55B; Sat, 2 Dec 2006 16:53:02 +0000 (UTC) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: from svm.csie.ntu.edu.tw (svm.csie.ntu.edu.tw [140.112.90.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71D1043CA5; Sat, 2 Dec 2006 16:52:40 +0000 (GMT) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: from svm.csie.ntu.edu.tw (localhost [127.0.0.1]) by svm.csie.ntu.edu.tw (8.13.8/8.13.8) with ESMTP id kB2Gr0Hh046513; Sun, 3 Dec 2006 00:53:00 +0800 (CST) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: (from rafan@localhost) by svm.csie.ntu.edu.tw (8.13.8/8.13.8/Submit) id kB2Gr0AO021454; Sun, 3 Dec 2006 00:53:00 +0800 (CST) (envelope-from rafan) Message-Id: <200612021653.kB2Gr0AO021454@svm.csie.ntu.edu.tw> Date: Sun, 3 Dec 2006 00:53:00 +0800 (CST) From: Rong-En Fan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: brooks@FreeBSD.org Subject: ports/106226: [PATCH] sysutils/sge: Respect X11BASE X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Dec 2006 17:00:33 -0000 >Number: 106226 >Category: ports >Synopsis: [PATCH] sysutils/sge: Respect X11BASE >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 02 17:00:28 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Rong-En Fan >Release: FreeBSD 6.2-PRERELEASE amd64 >Organization: NTU CSIE >Environment: >Description: - Respect X11BASE - pet portlint(1) a bit Port maintainer (brooks@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/sge/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- Makefile 7 Aug 2006 07:08:21 -0000 1.20 +++ Makefile 2 Dec 2006 16:50:32 -0000 @@ -102,9 +102,9 @@ .if ${OSVERSION} < 503000 .if ${OSVERSION} < 500000 -BROKEN= "does not build without libpthread" +BROKEN= "does not build without libpthread" .else -IGNORE= is not supported for FreeBSD < 5.3 +IGNORE= is not supported for FreeBSD < 5.3 .endif .endif @@ -147,7 +147,8 @@ -e "s|%%X11BASE%%|${X11BASE}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/dist/util/arch_variables \ - ${WRKSRC}/dist/pvm/src/aimk + ${WRKSRC}/dist/pvm/src/aimk \ + ${WRKSRC}/aimk @${REINPLACE_CMD} -e "s|%%CC%%|${CC}|g" -e "s|%%CXX%%|${CXX}|g" \ -e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%CXXFLAGS%%|${CXXFLAGS}|g" \ ${WRKSRC}/aimk \ Index: files/patch-aimk =================================================================== RCS file: /home/pcvs/ports/sysutils/sge/files/patch-aimk,v retrieving revision 1.2 diff -u -r1.2 patch-aimk --- files/patch-aimk 29 Jul 2005 02:13:32 -0000 1.2 +++ files/patch-aimk 2 Dec 2006 16:50:32 -0000 @@ -12,7 +12,7 @@ endif # Default build targets for which we have seperate make files -@@ -1171,8 +1171,8 @@ +@@ -1180,12 +1180,12 @@ set MAKE = gmake set OFLAG = "-O" set ARFLAGS = rcv @@ -23,7 +23,17 @@ set DLLIB = "" set DEPEND_FLAGS = "$CFLAGS $XMTINCD" set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT" -@@ -1191,7 +1191,7 @@ +- set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include" ++ set CFLAGS = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I%%X11BASE%%/include" + set NOERR_CFLAG = "-Wno-error" + set LFLAGS = "$DEBUG_FLAG $LFLAGS" + set LIBS = "$LIBS -lkvm" +@@ -1196,11 +1196,11 @@ + set XMTDEF = "" + set XINCD = "$XMTINCD $XINCD -I/usr/X11/include" + set XCFLAGS = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD" +- set XLIBD = "-L/usr/X11R6/lib" ++ set XLIBD = "-L%%X11BASE%%/lib" set XLFLAGS = "$XLIBD" set XLIBS = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp" set RM = "rm -f" >Release-Note: >Audit-Trail: >Unformatted: