From owner-svn-ports-head@freebsd.org Thu Jan 11 11:50:08 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C7A3E9A3F0; Thu, 11 Jan 2018 11:50:08 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EAE1A6B687; Thu, 11 Jan 2018 11:50:07 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2AAE414659; Thu, 11 Jan 2018 11:50:07 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0BBo6Xg086437; Thu, 11 Jan 2018 11:50:06 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0BBo6Dw086435; Thu, 11 Jan 2018 11:50:06 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201801111150.w0BBo6Dw086435@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 11 Jan 2018 11:50:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458721 - in head/astro/xmoontool: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/astro/xmoontool: . files X-SVN-Commit-Revision: 458721 X-SVN-Commit-Repository: ports 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.25 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: Thu, 11 Jan 2018 11:50:08 -0000 Author: danfe Date: Thu Jan 11 11:50:06 2018 New Revision: 458721 URL: https://svnweb.freebsd.org/changeset/ports/458721 Log: - Unbreak the build with LIBNOVA option disabled (we do not have /usr/X11R6 for quite a long time) - Move the options block lower within the Makefile - Add missing USE_XORG as reported by `stage-qa' - Provide sensible description for LIBNOVA option - Remove MONOCHROME option: the program does not run properly with it ("Fatal Error! No visuals that we can use") and monochrome mode can be enabled by launching it with `-m' switch - Convert to option helpers, use INSTALL_DATA for installing documentation files, not INSTALL_MAN Modified: head/astro/xmoontool/Makefile head/astro/xmoontool/files/patch-Makefile Modified: head/astro/xmoontool/Makefile ============================================================================== --- head/astro/xmoontool/Makefile Thu Jan 11 11:12:33 2018 (r458720) +++ head/astro/xmoontool/Makefile Thu Jan 11 11:50:06 2018 (r458721) @@ -10,26 +10,25 @@ MASTER_SITES= http://www.senax.net/xmoontool/ MAINTAINER= frank@dynamical-systems.org COMMENT= Version of John Walker's classical moontool for X11/Motif -OPTIONS_DEFINE= DOCS LIBNOVA MONOCHROME -OPTIONS_DEFAULT= LIBNOVA -LIBNOVA_DESC= libnova support -MONOCHROME_DESC= Use monochrome display - USES= motif +USE_XORG= x11 xt -PORTDOCS= NOTES PLIST_FILES= bin/xmoontool man/man1/xmoontool.1.gz +PORTDOCS= NOTES +OPTIONS_DEFINE= DOCS LIBNOVA +OPTIONS_DEFAULT= LIBNOVA + +LIBNOVA_DESC= High-accuracy astronomical model (libnova) LIBNOVA_MAKE_ENV_OFF= WITHOUT_LIBNOVA=yes LIBNOVA_LIB_DEPENDS= libnova.so:astro/libnova -MONOCHROME_MAKE_ENV= DEFINES="" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xmoontool ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/xmoontool.1 ${STAGEDIR}${PREFIX}/man/man1 + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in ${PORTDOCS} - ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} -.endfor + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Modified: head/astro/xmoontool/files/patch-Makefile ============================================================================== --- head/astro/xmoontool/files/patch-Makefile Thu Jan 11 11:12:33 2018 (r458720) +++ head/astro/xmoontool/files/patch-Makefile Thu Jan 11 11:50:06 2018 (r458721) @@ -1,8 +1,11 @@ --- Makefile.orig 2006-02-24 22:00:24 UTC +++ Makefile -@@ -8,9 +8,9 @@ INSTALL?= install +@@ -6,11 +6,11 @@ + RMCMD?= rm -f + INSTALL?= install LOCALBASE?= /usr/local - X11BASE?= /usr/X11R6 +-X11BASE?= /usr/X11R6 ++X11BASE?= $(LOCALBASE) -CC= gcc -CFLAGS= -O2 -Wall