From owner-cvs-all@FreeBSD.ORG  Fri Mar 12 09:05:45 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id C843A16A511; Fri, 12 Mar 2004 09:05:45 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id AA92B43D46; Fri, 12 Mar 2004 09:05:45 -0800 (PST)
	(envelope-from trevor@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2CH5jGe030426;
	Fri, 12 Mar 2004 09:05:45 -0800 (PST)
	(envelope-from trevor@repoman.freebsd.org)
Received: (from trevor@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CH5jdR030425;
	Fri, 12 Mar 2004 09:05:45 -0800 (PST)
	(envelope-from trevor)
Message-Id: <200403121705.i2CH5jdR030425@repoman.freebsd.org>
From: Trevor Johnson <trevor@FreeBSD.org>
Date: Fri, 12 Mar 2004 09:05:45 -0800 (PST)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/x11-toolkits/jx Makefile distinfo
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Mar 2004 17:05:46 -0000

trevor      2004/03/12 09:05:45 PST

  FreeBSD ports repository

  Modified files:
    x11-toolkits/jx      Makefile distinfo 
  Log:
  Only one of the Linuxberg sites (as it happens, the Brazilian one)
  has the original distfile.  A slightly different distfile is available
  from Sunsite:
  
  diff -burN linuxberg/include/make/jx_config_common sunsite/include/make/jx_config_common
  --- linuxberg/include/make/jx_config_common     Sat Sep 25 19:25:40 1999
  +++ sunsite/include/make/jx_config_common       Wed Sep  1 02:18:53 1999
  @@ -7,14 +7,14 @@
  
   ifeq ($(findstring g++,$(CXX)),g++)
     ifeq ($(CXX),g++)
  -    JX_HAS_GNUG_PRE_2_8 := $(shell \
  -        if { $(CXX) --version | egrep '^(cygnus-)?2\.[0-7]' > /dev/null; } \
  -        then { echo 1; } \
  -        else { echo 0; } fi)
  -    JX_HAS_GNUG_2_95 := $(shell \
  -        if { $(CXX) --version | egrep '^(cygnus-)?2\.95' > /dev/null; } \
  -        then { echo 1; } \
  -        else { echo 0; } fi)
  +    JX_HAS_GNUG_PRE_2_8 := \
  +      $(shell \
  +        if $(CXX) --version | egrep '^(cygnus-)?2\.[0-7]' > /dev/null; then \
  +        echo 1; else echo 0; fi)
  +    JX_HAS_GNUG_2_95 := \
  +      $(shell \
  +        if $(CXX) --version | egrep '^(cygnus-)?2\.95' > /dev/null; then \
  +        echo 1; else echo 0; fi)
     else  # ! g++
     ifeq (eg++,$(findstring eg++,$(CXX)))
       # Assume that eg++ is egcs.
  diff -burN linuxberg/include/make/jx_constants sunsite/include/make/jx_constants
  --- linuxberg/include/make/jx_constants Sat Sep 25 19:25:30 1999
  +++ sunsite/include/make/jx_constants   Tue Sep 21 20:31:57 1999
  @@ -23,9 +23,9 @@
  
   ifdef JX_INSTALL_ROOT
     override JX_INSTALL_ROOT := \
  -    ${shell if { test -d ${JX_INSTALL_ROOT} -a -w ${JX_INSTALL_ROOT}; } \
  -            then { echo ${JX_INSTALL_ROOT}; } \
  -            else { echo; } fi }
  +    ${shell if { test -d ${JX_INSTALL_ROOT} -a -w ${JX_INSTALL_ROOT} } \
  +            then { echo ${JX_INSTALL_ROOT} } \
  +            else { echo } fi; }
   endif
  
   ifndef JX_INSTALL_ROOT
  @@ -33,10 +33,10 @@
       override JX_INSTALL_ROOT := ${JX_ROOT_BIN_DIRECTORY}
     else
       override JX_INSTALL_ROOT := \
  -      ${shell if { test -d ${HOME}/bin -a -w ${HOME}/bin; } \
  -              then { echo ${HOME}/bin; } \
  +      ${shell if { test -d ${HOME}/bin -a -w ${HOME}/bin } \
  +              then { echo ${HOME}/bin } \
                 else { test -d ${JX_ROOT}/bin || mkdir ${JX_ROOT}/bin; \
  -                     echo ${JX_ROOT}/bin; } fi }
  +                     echo ${JX_ROOT}/bin } fi; }
     endif
   endif
  
  diff -burN linuxberg/libjx/code/jXUtil.cc sunsite/libjx/code/jXUtil.cc
  --- linuxberg/libjx/code/jXUtil.cc      Mon Sep 27 20:59:37 1999
  +++ sunsite/libjx/code/jXUtil.cc        Thu Aug 26 20:22:57 1999
  @@ -392,7 +392,7 @@
          for (JIndex i=newCount; i>origCount; i--)
                  {
                  const JString* url = fileNameList->NthElement(i);
  -               if (url->IsEmpty() || url->GetFirstCharacter() == kURICommentMarker)
  +               if (url->GetFirstCharacter() == kURICommentMarker)
                          {
                          fileNameList->DeleteElement(i);
                          }
  
  Revision  Changes    Path
  1.25      +3 -5      ports/x11-toolkits/jx/Makefile
  1.3       +1 -1      ports/x11-toolkits/jx/distinfo