From owner-svn-ports-all@FreeBSD.ORG Thu Nov 21 01:35:37 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6C1E588C; Thu, 21 Nov 2013 01:35:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 42D9827EA; Thu, 21 Nov 2013 01:35:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAL1ZbMF061092; Thu, 21 Nov 2013 01:35:37 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAL1ZaG5061090; Thu, 21 Nov 2013 01:35:36 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201311210135.rAL1ZaG5061090@svn.freebsd.org> From: Cy Schubert Date: Thu, 21 Nov 2013 01:35:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334468 - in head/x11-toolkits/xview: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Nov 2013 01:35:37 -0000 Author: cy Date: Thu Nov 21 01:35:36 2013 New Revision: 334468 URL: http://svnweb.freebsd.org/changeset/ports/334468 Log: Address conflict with x11/xloadimage Modified: head/x11-toolkits/xview/Makefile head/x11-toolkits/xview/files/patch-Imakefile Modified: head/x11-toolkits/xview/Makefile ============================================================================== --- head/x11-toolkits/xview/Makefile Thu Nov 21 00:50:01 2013 (r334467) +++ head/x11-toolkits/xview/Makefile Thu Nov 21 01:35:36 2013 (r334468) @@ -3,6 +3,7 @@ PORTNAME= xview PORTVERSION= 3.2.1.4.19c +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= http://www.physionet.org/physiotools/xview/src/ \ http://komquats.com/distfiles/ \ @@ -29,7 +30,7 @@ ALL_TARGET= World SUB_FILES= pkg-message CFLAGS+= -Wno-return-type -MAN1= xview.1 +MAN1= XView.1 X11BASE2FIX= clients/olwmslave/help_file.c lib/libxview/help/help_file.c \ lib/libxview/misc/gettext.h lib/libxview/textsw/txt_e_menu.c @@ -41,6 +42,9 @@ NO_STAGE= yes CFLAGS+= -DCOMPAT_43TTY .endif +post-extract: + @${MV} ${WRKSRC}/xview.man ${WRKSRC}.XView.man + pre-configure: @${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+;' \ ${WRKSRC}/config/XView.cf Modified: head/x11-toolkits/xview/files/patch-Imakefile ============================================================================== --- head/x11-toolkits/xview/files/patch-Imakefile Thu Nov 21 00:50:01 2013 (r334467) +++ head/x11-toolkits/xview/files/patch-Imakefile Thu Nov 21 01:35:36 2013 (r334468) @@ -1,5 +1,5 @@ --- Imakefile.orig 2005-03-28 06:41:59.000000000 -0800 -+++ Imakefile 2012-02-02 13:40:06.681898858 -0800 ++++ Imakefile 2013-11-20 16:44:43.964144452 -0800 @@ -10,8 +10,8 @@ XCOMM # Top level Imakefile for ProductNameAndRelease XCOMM # @(#)Imakefile 1.7 1/7/92 SMI @@ -28,6 +28,15 @@ XCOMM # even if these SUBDIRS are not included in the general rules, be sure to XCOMM # do a make clean in them. CLEAN_SUBDIRS = clients contrib doc fonts bitmaps images lib misc util config +@@ -52,7 +60,7 @@ + $(MKDIRHIER) $(DESTDIR)$(XVDESTDIR) + #endif + +-InstallManPage(xview,$(MANDIR)) ++InstallManPage(XView,$(MANDIR)) + + World:: + @echo "" @@ -65,11 +73,11 @@ @echo "" @date