From owner-svn-ports-head@FreeBSD.ORG Fri Feb 28 07:09:08 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D153661B; Fri, 28 Feb 2014 07:09:08 +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 B2DC91816; Fri, 28 Feb 2014 07:09:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1S798CP038623; Fri, 28 Feb 2014 07:09:08 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1S798oJ038620; Fri, 28 Feb 2014 07:09:08 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201402280709.s1S798oJ038620@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 28 Feb 2014 07:09:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346436 - in head/x11/xdtm: . 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2014 07:09:09 -0000 Author: bapt Date: Fri Feb 28 07:09:07 2014 New Revision: 346436 URL: http://svnweb.freebsd.org/changeset/ports/346436 QAT: https://qat.redports.org/buildarchive/r346436/ Log: Support stage Fix support for DESTDIR Added: head/x11/xdtm/files/patch-Imakefile (contents, props changed) Deleted: head/x11/xdtm/files/patch-aa Modified: head/x11/xdtm/Makefile head/x11/xdtm/pkg-plist Modified: head/x11/xdtm/Makefile ============================================================================== --- head/x11/xdtm/Makefile Fri Feb 28 07:05:15 2014 (r346435) +++ head/x11/xdtm/Makefile Fri Feb 28 07:09:07 2014 (r346436) @@ -16,7 +16,4 @@ USE_XORG= xaw USES= imake MAKE_JOBS_UNSAFE= yes -MAN1= xdtm.1 - -NO_STAGE= yes .include Added: head/x11/xdtm/files/patch-Imakefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/xdtm/files/patch-Imakefile Fri Feb 28 07:09:07 2014 (r346436) @@ -0,0 +1,52 @@ +--- ./Imakefile.orig 1996-03-14 14:02:00.000000000 +0100 ++++ ./Imakefile 2014-02-28 08:07:51.884434658 +0100 +@@ -147,6 +147,11 @@ + XDTMOPTIONS = -DHAS_STRSTR -DUSE_CWD -DECHO_N -DUSE_TERMIOS + #endif + ++#ifdef FreeBSDArchitecture ++ LOCAL_LDFLAGS = ++ XDTMOPTIONS = -DHAS_STRSTR -DUSE_CWD -DECHO_N -DUSE_TERMIOS ++#endif ++ + #if SystemV4 /* SVR4 is mostly POSIX */ + XDTMOPTIONS = -DHAS_STRSTR -DUSE_CWD -DUSE_TERMIOS + #endif +@@ -241,27 +246,28 @@ + sed -e 's^\"{icon dir}\"^\"$(XDTMDIR)/icons\"^' \ + xdtmrc.orig > xdtmrc + sed -e 's^iconfile^$(XDTMDIR)/new_xdtm.xbm^' Xdtm.ad.tmpl > Xdtm.ad ++ cp xdtm.sh xdtm.sh.script + + XCOMM Install the xdtm execute script file, used to prevent xterms closing + XCOMM when the inferier process dies. +-InstallProgram(xdtm.sh, $(BINDIR)) ++InstallScript(xdtm.sh,$(BINDIR)) + + XCOMM Install the helpfile, system xdtmrc, icon bitmaps and the default + XCOMM application defaults. + +-MakeDirectories(install, $(XDTMDIR)) +-InstallNonExec(help, $(XDTMDIR)) +-InstallNonExec(perm.help, $(XDTMDIR)) +-InstallNonExec(xdtmrc, $(XDTMDIR)) +-InstallNonExec(bitmaps/new_xdtm.xbm, $(XDTMDIR)) +-MakeDirectories(install, $(XDTMDIR)/icons) ++MakeDirectories(install,$(XDTMDIR)) ++InstallNonExec(help,$(XDTMDIR)) ++InstallNonExec(perm.help,$(XDTMDIR)) ++InstallNonExec(xdtmrc,$(XDTMDIR)) ++InstallNonExec(bitmaps/new_xdtm.xbm,$(XDTMDIR)) ++MakeDirectories(install,$(XDTMDIR)/icons) + InstallAppDefaults(Xdtm) + + install:: +- $(CP) icons$(PATHSEP)*$(PATHSEP)*.icon $(XDTMDIR)/icons ++ $(CP) icons$(PATHSEP)*$(PATHSEP)*.icon $(DESTDIR)$(XDTMDIR)/icons + $(RM) xdtmrc + $(MV) xdtmrc.orig xdtmrc +- chmod -R a+r $(XDTMDIR) ++ chmod -R a+r $(DESTDIR)$(XDTMDIR) + + XCOMM Make the emacs TAGS file + Modified: head/x11/xdtm/pkg-plist ============================================================================== --- head/x11/xdtm/pkg-plist Fri Feb 28 07:05:15 2014 (r346435) +++ head/x11/xdtm/pkg-plist Fri Feb 28 07:09:07 2014 (r346436) @@ -53,5 +53,6 @@ lib/X11/xdtm/icons/x.icon lib/X11/xdtm/icons/xdtm.icon lib/X11/xdtm/icons/ycode.icon lib/X11/xdtm/icons/z.icon +man/man1/xdtm.1.gz @dirrm lib/X11/xdtm/icons @dirrm lib/X11/xdtm