From nobody Sat Feb 17 16:30:50 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TcZ6f4PPGz5BS5X; Sat, 17 Feb 2024 16:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TcZ6f3v5mz4nWn; Sat, 17 Feb 2024 16:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708187450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nX8z8B/6eFUFeMHeEzlsuFdPc9/3Y93PKGQvXRzcPhM=; b=Y7ZcleVqYTmGNLTFuyp7XxHqntXqVP9l4gukQ3Q4vDRouYMe0hfAZLsHxllAaC6krOw07p d9D9skLpLGED0hjVfYnP726cNXTtsGWEdfkqeUrVk2sSyhFJOhN3LcVYzjg1l/zyKpkQ9B fLs4xKn4DXV7ZjD633m0P/8AO9Dd8Pu0F9niRtF1/64YrDDRVYYyVW/PCnCVvdvTZrSrBB FxCtFf5Vg7IkP3bvRlb9uohP4ai0O5WC2SKoRYe3+WlnJTl5h1Oss3Os/Ye12BeCXVXynb pqShG6YjDYJ/ztD3pW/LWSCUbQJPijBU6eyNgctKZS3Q2y6jiO0R/7hl364RXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708187450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nX8z8B/6eFUFeMHeEzlsuFdPc9/3Y93PKGQvXRzcPhM=; b=AQlnYpugB+9fzamW2bwjdUZg6p6ErzYfIS5IjuqhDlvwfZLoYwYeyZ6d7tlrA8EQeEvNL/ yvkUBKPYoSUcINdcHUpiXAvhbQ85cvamIuOW2JmHsX+osi+1x2oYJntLNvO3T8kIinZgCK GkvQsqc+BVi6qku2mrOC/6avo10Bkqg4NZcj0qrxK/8U5bTD23sZt3zMUGnUMw6PcfvfmX Vh6jdZTXI6+YDj6txEiwQrnjFcqsq1K4KZCW9hY1BlB7vXaJnLGxz7Z0FHGMc4t3F2vSCm G9/zzPHoWoZ0m1I4Ceqc0Fz2E42nnzAxyGh6AJwmHk5pfecIDj0iSm6SZLW4mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708187450; a=rsa-sha256; cv=none; b=ySHntEfcPhWtaOInOUn1OX0rs3u/vYmLlRHh/f0rti0/YNNsu1uj+DFHhMY38/1pCX0T2K beMhSCrVw3ohUG3qqpDo+7kgtJzSLguagd33GjnNU8aF/+o6MyVIFr9IXGh5E6Mo9nHu8O nYsN9llMLkzlMeJ2H0NuGN31AzO0pUxvpiK8CsJM0/pEl9AFu0Oti24XqOLntqALbXnwKr Z0nPkRIbrCZ03Q/UuJwUc1WBezAC+OlbjT6Xmqalkvyl2Djrc5yz8U7bBaXpqjmvLnm7hf qDtdm/QeDbh5JTvuXIajlzgoJESLeTFWeAyLsIRSccazWdqIniJSXIHlBxCqqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TcZ6f2tCnzFGY; Sat, 17 Feb 2024 16:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HGUooa011826; Sat, 17 Feb 2024 16:30:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HGUocZ011823; Sat, 17 Feb 2024 16:30:50 GMT (envelope-from git) Date: Sat, 17 Feb 2024 16:30:50 GMT Message-Id: <202402171630.41HGUocZ011823@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: de395fedbf95 - main - astro/xephem: Update to 4.2.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de395fedbf950f682e452d42cd38e334ef7b7b28 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=de395fedbf950f682e452d42cd38e334ef7b7b28 commit de395fedbf950f682e452d42cd38e334ef7b7b28 Author: Nuno Teixeira AuthorDate: 2024-02-17 16:28:32 +0000 Commit: Nuno Teixeira CommitDate: 2024-02-17 16:30:37 +0000 astro/xephem: Update to 4.2.0 - Switch to DISTVERSION - Move manpage to $PREFIX/share/man - Take maintainership ChangeLog: https://xephem.github.io/XEphem/Site/changes.html --- astro/xephem/Makefile | 33 ++++++++++++--------------------- astro/xephem/distinfo | 6 +++--- astro/xephem/files/patch-Makefile | 37 ++----------------------------------- astro/xephem/pkg-plist | 2 +- 4 files changed, 18 insertions(+), 60 deletions(-) diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile index 12c05781f259..3859853c04e5 100644 --- a/astro/xephem/Makefile +++ b/astro/xephem/Makefile @@ -1,37 +1,32 @@ PORTNAME= xephem -PORTVERSION= 4.1.0 -PORTREVISION= 1 +DISTVERSION= 4.2.0 CATEGORIES= astro -MAINTAINER= ports@FreeBSD.org +MAINTAINER= eduardo@FreeBSD.org COMMENT= Interactive astronomical ephemeris program WWW= http://www.clearskyinstitute.com/xephem/xephem.html LICENSE= MIT LICENSE_FILE= ${WRKDIR}/XEphem-${PORTVERSION}/LICENSE -LIB_DEPENDS= libpng.so:graphics/png \ - libfontconfig.so:x11-fonts/fontconfig - -USES= gmake groff jpeg motif tar:tgz ssl xorg -USE_XORG= xt xext xmu x11 xft +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libpng16.so:graphics/png +USES= gmake groff localbase:ldflags motif shebangfix ssl tar:tgz xorg USE_GITHUB= yes GH_PROJECT= XEphem +USE_XORG= x11 xext xft xmu xt -LDFLAGS+= -lfontconfig +SHEBANG_GLOB= *.pl +MAKE_ARGS= CC=${CC} +LDFLAGS+= -lfontconfig WRKSRC_SUBDIR= GUI/xephem -MAKE_JOBS_UNSAFE= yes - post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - -e 's|/usr/X11R6|${LOCALBASE}|g' \ - ${WRKSRC}/Makefile @${FIND} ${WRKSRC}/../.. -name Makefile -type f | \ - ${XARGS} ${REINPLACE_CMD} -e 's|CC = gcc|CC?= ${CC}|g ; \ - s|CFLAGS =|CFLAGS+=|g ; \ + ${XARGS} ${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS+=|g ; \ + s|CFLAGS=|CFLAGS+=|g ; \ s|LDFLAGS =|LDFLAGS+=|g ; \ s|-O2 ||g' @@ -39,14 +34,10 @@ pre-build: @${ECHO_CMD} 'XEphem.ShareDir: ${PREFIX}/lib/X11/xephem' \ > ${WRKSRC}/XEphem.ad -pre-install: - @${FIND} ${WRKSRC}/../.. -name Makefile.bak -type f -delete - @${CP} ${WRKSRC}/xephem.man ${STAGEDIR}${PREFIX}/man/man1/xephem.1 - @${FIND} ${WRKSRC} -name "*.pl" -exec ${SED} -i "" -e 's|/usr/bin/perl|/usr/local/bin/perl|' {} \; - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xephem ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/XEphem.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XEphem + ${INSTALL_MAN} ${WRKSRC}/xephem.man ${STAGEDIR}${PREFIX}/share/man/man1/xephem.1 @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xephem @cd ${WRKSRC}; ${COPYTREE_SHARE} \ "auxil catalogs fifos fits gallery help lo" \ diff --git a/astro/xephem/distinfo b/astro/xephem/distinfo index 564ce9ab3969..2a0323b7ef9b 100644 --- a/astro/xephem/distinfo +++ b/astro/xephem/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651558430 -SHA256 (xephem-XEphem-4.1.0_GH0.tar.gz) = 8ab3670e303bdf209a673d5e091d1cd6e4577a0574da26a3c3d6629825f98241 -SIZE (xephem-XEphem-4.1.0_GH0.tar.gz) = 17213750 +TIMESTAMP = 1708181054 +SHA256 (xephem-XEphem-4.2.0_GH0.tar.gz) = 4d67b923e342e56b2a4a49f574e576fc183f1747edb693bab3709e83c8ad9c1b +SIZE (xephem-XEphem-4.2.0_GH0.tar.gz) = 17317398 diff --git a/astro/xephem/files/patch-Makefile b/astro/xephem/files/patch-Makefile index 494f2fba75e6..abea98c59aff 100644 --- a/astro/xephem/files/patch-Makefile +++ b/astro/xephem/files/patch-Makefile @@ -1,39 +1,6 @@ ---- Makefile.orig 2022-05-03 02:30:02 UTC +--- Makefile.orig 2024-02-13 14:35:36 UTC +++ Makefile -@@ -22,18 +22,18 @@ MOTIFI = $(MOTIF) - MOTIFL = $(MOTIF) - endif - ifndef MOTIFI --MOTIFI = /usr/include -+MOTIFI = %%LOCALBASE%%/include - endif - ifndef MOTIFL --MOTIFL = /usr/lib -+MOTIFL = %%LOCALBASE%%/lib - endif - - # for linux and Apple OS X --CC = gcc --CLDFLAGS = -g --CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/opt/X11/include --LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib --XLIBS = -lXm -lXt -lXext -lXmu -lX11 -+CC? = cc -+CLDFLAGS += -g -+CFLAGS += $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I%%LOCALBASE%%/include -+LDFLAGS += $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L%%LOCALBASE%%/lib -+XLIBS = -lXm -lXt -lXext -lXmu -lX11 -lXft - LIBS = $(XLIBS) $(LIBLIB) -lm -lssl - - # static linking on Apple using X11 libs from ports -@@ -188,18 +188,18 @@ OBJS = \ - all: libs xephem xephem.1 - - xephem: $(INCS) $(OBJS) -- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - xephem.1: xephem.man +@@ -201,12 +201,12 @@ libs: nroff -man $? > $@ libs: diff --git a/astro/xephem/pkg-plist b/astro/xephem/pkg-plist index 5c5997b5473e..595645bcaad2 100644 --- a/astro/xephem/pkg-plist +++ b/astro/xephem/pkg-plist @@ -170,4 +170,4 @@ lib/X11/xephem/help/png/valid-html401.png lib/X11/xephem/help/png/wcssolver.png lib/X11/xephem/help/xephem.html lib/X11/xephem/lo/lodb.xml -man/man1/xephem.1.gz +share/man/man1/xephem.1.gz