svn commit: r458721 - in head/astro/xmoontool: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Thu Jan 11 11:50:08 UTC 2018
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 at 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 <bsd.port.mk>
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
More information about the svn-ports-head
mailing list