astro/xephem: Update to 4.1.0

Update LICENSE

astro/xephem/Makefile

@@ -1,44 +1,29 @@
 # Created by: erich@FreeBSD.org
 
 PORTNAME=	xephem
-PORTVERSION=	3.7.7
-PORTREVISION=	5
+PORTVERSION=	4.1.0
 CATEGORIES=	astro
-MASTER_SITES=	http://www.clearskyinstitute.com/xephem/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive astronomical ephemeris program
 
-# Converted from RESTRICTED
-LICENSE=	XEPHEM
-LICENSE_NAME=	Xephem
-LICENSE_TEXT=	Personal use only
-LICENSE_PERMS=	auto-accept
+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
 
-LDFLAGS+=	-lfontconfig
-
-MAKE_JOBS_UNSAFE=	yes
+USE_GITHUB=	yes
+GH_PROJECT=	XEphem
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
-
-# XXX needs to be the same as DISTFILES
-XEPHEMSRC=	${PORTNAME}-${PORTVERSION}.tgz
+LDFLAGS+=	-lfontconfig
 
-.include <bsd.port.pre.mk>
+WRKSRC_SUBDIR=	GUI/xephem
 
-.for file in ${XEPHEMSRC}
-.if !exists(${DISTDIR}/${file})
-IGNORE=	because of licensing restrictions, you must manually fetch ${file}\
-	from http://www.clearskyinstitute.com/xephem/,\
-	place it in ${DISTDIR} and then run make again
-.endif
-.endfor
+MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
@@ -67,4 +52,4 @@ do-install:
 		"auxil catalogs fifos fits gallery help lo" \
 		${STAGEDIR}${PREFIX}/lib/X11/xephem
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

astro/xephem/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1495658161
-SHA256 (xephem-3.7.7.tgz) = fb0b889218322c1cc0b994da7125e624e4f0112d9da1c468936600d1179e55de
-SIZE (xephem-3.7.7.tgz) = 18128521
+TIMESTAMP = 1651558430
+SHA256 (xephem-XEphem-4.1.0_GH0.tar.gz) = 8ab3670e303bdf209a673d5e091d1cd6e4577a0574da26a3c3d6629825f98241
+SIZE (xephem-XEphem-4.1.0_GH0.tar.gz) = 17213750

astro/xephem/files/patch-Makefile

@@ -1,119 +1,32 @@
---- Makefile.orig	2015-08-09 21:36:50 UTC
+--- Makefile.orig	2022-05-03 02:30:02 UTC
 +++ Makefile
-@@ -23,44 +23,44 @@ MOTIFI = $(MOTIF)
+@@ -22,18 +22,18 @@ MOTIFI = $(MOTIF)
  MOTIFL = $(MOTIF)
  endif
  ifndef MOTIFI
 -MOTIFI = /usr/include
-+MOTIFI = /usr/local/include
++MOTIFI = %%LOCALBASE%%/include
  endif
  ifndef MOTIFL
 -MOTIFL = /usr/lib
-+MOTIFL = %%/LOCALBASE%%/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 -lXp -lXt -lXext -lXmu -lX11
--LIBS = $(XLIBS) $(LIBLIB) -lm
-+CC?= cc
-+CLDFLAGS+= -g
-+CFLAGS+= $(LIBINC) $(CLDFLAGS) -Wall -I$(MOTIFI) -I/usr/local/include
-+LDFLAGS+= $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/local/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
+ LIBS = $(XLIBS) $(LIBLIB) -lm -lssl
 
  # static linking on Apple using X11 libs from ports
--# CC = gcc
-+# CC?= cc
- # OLI = /opt/local/include
- # OLL = /opt/local/lib
--# CLDFLAGS = -g
--# CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I$(OLI)
--# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L$(OLL)
-+# CLDFLAGS+= -g
-+# CFLAGS+= $(LIBINC) $(CLDFLAGS) -Wall -I$(MOTIFI) -I$(OLI)
-+# LDFLAGS+= $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L$(OLL)
- # XLIBS = -lXm $(OLL)/libXp.a $(OLL)/libXt.a $(OLL)/libSM.a $(OLL)/libICE.a $(OLL)/libXext.a $(OLL)/libXmu.a $(OLL)/libX11.a $(OLL)/libxcb.a $(OLL)/libXau.a $(OLL)/libXdmcp.a
- # LIBS = $(XLIBS) $(LIBLIB) -lm
-
- # for ppc Apple OS X to make universal (i386 and ppc binary), requires
- # Xcode 2.2, /Developers/SDK/MacOSX10.4u.sdk and all libs, including libXm,
- # built similarly
--# CLDFLAGS = -arch i386 -arch ppc
--# CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -isysroot /Developer/SDKs/MacOSX10.4u.sdk -I$(MOTIFI) -I/usr/X11R6/include
--# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -L$(MOTIFL) -L/usr/X11R6/lib
-+# CLDFLAGS+= -arch i386 -arch ppc
-+# CFLAGS+= $(LIBINC) $(CLDFLAGS) -Wall -isysroot /Developer/SDKs/MacOSX10.4u.sdk -I$(MOTIFI) -I/usr/local/include
-+# LDFLAGS+= $(LIBLNK) $(CLDFLAGS) -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -L$(MOTIFL) -L/usr/local/lib
-
- # MKS Enterprise toolkit
- # MOTIFI = -I/usr/include
- # MOTIFL = -L/usr/lib
- # CC = cc
--# CLDFLAGS =
--# CFLAGS = $(LIBINC) $(CLDFLAGS) -O -I$(MOTIFI)
--# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -W/subsystem:windows -s
-+# CLDFLAGS+=
-+# CFLAGS+= $(LIBINC) $(CLDFLAGS) -O -I$(MOTIFI)
-+# LDFLAGS+= $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -W/subsystem:windows -s
- # XLIBS = -lXm -lXt -lX11
- # LIBS = $(XLIBS) $(LIBLIB) -lm
-
-@@ -68,9 +68,9 @@ LIBS = $(XLIBS) $(LIBLIB) -lm
- # MOTIFI = -I/usr/include
- # MOTIFL = -L/usr/lib
- # CC = cc
--# CLDFLAGS = 
--# CFLAGS = $(LIBINC) $(CLDFLAGS) -O -I$(MOTIFI)
--# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) 
-+# CLDFLAGS+= 
-+# CFLAGS+= $(LIBINC) $(CLDFLAGS) -O -I$(MOTIFI)
-+# LDFLAGS+= $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) 
- # XLIBS = -lXm -lXt -lX11
- # LIBS = $(XLIBS) $(LIBLIB) -lsocket -lnsl -lc -lm /usr/ucblib/libucb.a
- # Note: if you get regex undefined, add -lgen to the end of LIBS.
-@@ -81,9 +81,9 @@ LIBS = $(XLIBS) $(LIBLIB) -lm
- # MOTIFI = -I/usr/dt/include
- # MOTIFL = -L/usr/dt/lib -R/usr/dt/lib
- # CC = cc
--# CLDFLAGS =
--# CFLAGS = $(LIBINC) $(CLDFLAGS) -O -I$(MOTIFI) -I/usr/openwin/include
--# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/openwin/lib
-+# CLDFLAGS+=
-+# CFLAGS+= $(LIBINC) $(CLDFLAGS) -O -I$(MOTIFI) -I/usr/openwin/include
-+# LDFLAGS+= $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/openwin/lib
- # XLIBS = -lXm -lXt -lX11
- # LIBS = $(XLIBS) $(LIBLIB) -lm -lsocket -lnsl
-
-@@ -91,17 +91,17 @@ LIBS = $(XLIBS) $(LIBLIB) -lm
- # MOTIFI = -I/usr/include
- # MOTIFL = -L/usr/lib
- # CC = cc
--# CLDFLAGS =
--# CFLAGS = $(LIBINC) $(CLDFLAGS) -Aa -fast -I$(MOTIFI)
--# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL)
-+# CLDFLAGS+=
-+# CFLAGS+= $(LIBINC) $(CLDFLAGS) -Aa -fast -I$(MOTIFI)
-+# LDFLAGS+= $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL)
-
- # AIX
- # MOTIFI = -I/usr/include
- # MOTIFL = -L/usr/lib
- # CC = xlc
--# CLDFLAGS =
--# CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -qlanglvl=ansi -qarch=com -qmaxmem=16384 -I$(MOTIFI)
--# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL)
-+# CLDFLAGS+=
-+# CFLAGS+= $(LIBINC) $(CLDFLAGS) -qlanglvl=ansi -qarch=com -qmaxmem=16384 -I$(MOTIFI)
-+# LDFLAGS+= $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL)
-
- .PRECIOUS:	xephem
-
-@@ -189,18 +189,18 @@ OBJS =			\
+@@ -188,18 +188,18 @@ OBJS =			\
  all: libs xephem xephem.1
 
  xephem: $(INCS) $(OBJS)