diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile index 12c05781f259..3859853c04e5 100644 --- a/astro/xephem/Makefile +++ b/astro/xephem/Makefile @@ -1,55 +1,46 @@ 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' 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" \ ${STAGEDIR}${PREFIX}/lib/X11/xephem .include 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,54 +1,21 @@ ---- 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: - cd ../../libastro; make - cd ../../libip; make - cd ../../libjpegd; make - cd ../../liblilxml; make - cd ../../libpng; make - cd ../../libz; make + cd ../../libastro; $(MAKE) + cd ../../libip; $(MAKE) + cd ../../libjpegd; $(MAKE) + cd ../../liblilxml; $(MAKE) + cd ../../libpng; $(MAKE) + cd ../../libz; $(MAKE) clean: rm -fr *.o ../../lib*/*.[ao] 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 @@ -1,173 +1,173 @@ bin/xephem lib/X11/app-defaults/XEphem lib/X11/xephem/auxil/HAReyfigs.csf lib/X11/xephem/auxil/README lib/X11/xephem/auxil/SOHO_512_20090703_1900_eit_171.gif lib/X11/xephem/auxil/analemma.plt lib/X11/xephem/auxil/annotation.ano @(,,0755) lib/X11/xephem/auxil/astorb2edb.pl lib/X11/xephem/auxil/classicfigs.csf lib/X11/xephem/auxil/dearth.gif lib/X11/xephem/auxil/favorites.fav lib/X11/xephem/auxil/jupiter.1020 lib/X11/xephem/auxil/jupiter.2040 lib/X11/xephem/auxil/jupiter.9910 lib/X11/xephem/auxil/jupitermap.gif lib/X11/xephem/auxil/logo.gif lib/X11/xephem/auxil/mars.1020 lib/X11/xephem/auxil/mars.2040 lib/X11/xephem/auxil/mars.9910 lib/X11/xephem/auxil/mars_db lib/X11/xephem/auxil/marsmap.jpg lib/X11/xephem/auxil/moon.fts @(,,0755) lib/X11/xephem/auxil/mpcorb2edb.pl lib/X11/xephem/auxil/nearth.gif lib/X11/xephem/auxil/sample.hzn lib/X11/xephem/auxil/saturn00.gif lib/X11/xephem/auxil/saturn04.gif lib/X11/xephem/auxil/saturn10.gif lib/X11/xephem/auxil/saturn16.gif lib/X11/xephem/auxil/saturn20.gif lib/X11/xephem/auxil/saturn24.gif lib/X11/xephem/auxil/saturne.1020 lib/X11/xephem/auxil/saturne.2040 lib/X11/xephem/auxil/saturne.9910 lib/X11/xephem/auxil/starcensus.txt lib/X11/xephem/auxil/uranus.1020 lib/X11/xephem/auxil/uranus.2040 lib/X11/xephem/auxil/uranus.9910 lib/X11/xephem/auxil/wmm.cof lib/X11/xephem/auxil/xephem_sites lib/X11/xephem/auxil/xephem_skyhist lib/X11/xephem/catalogs/Messier.edb lib/X11/xephem/catalogs/SKY2k65.edb lib/X11/xephem/fifos/Makefile lib/X11/xephem/fifos/README lib/X11/xephem/fits/Abell426.fts lib/X11/xephem/fits/horsehead.fts lib/X11/xephem/gallery/1999-41-a-web_print.jpg lib/X11/xephem/gallery/I0059-1.jpg lib/X11/xephem/gallery/I1613-1.jpg lib/X11/xephem/gallery/I1848-1.jpg lib/X11/xephem/gallery/I2118-2.jpg lib/X11/xephem/gallery/M013-2.jpg lib/X11/xephem/gallery/M034-1.jpg lib/X11/xephem/gallery/M053-1.jpg lib/X11/xephem/gallery/N2174-1.jpg lib/X11/xephem/gallery/N6633-1.jpg lib/X11/xephem/gallery/N6791-1.jpg lib/X11/xephem/gallery/N6820-2.jpg lib/X11/xephem/gallery/N6946-1.jpg lib/X11/xephem/gallery/N7023-2.jpg lib/X11/xephem/gallery/N7129-2.jpg lib/X11/xephem/gallery/S115-1.jpg lib/X11/xephem/gallery/abell1656-1.jpg lib/X11/xephem/gallery/abell2151-1.jpg lib/X11/xephem/gallery/arp295_kelly_c1.jpg lib/X11/xephem/gallery/gallery.gly lib/X11/xephem/gallery/hickson68-1.jpg lib/X11/xephem/gallery/ic5146-2002sep12-hall.jpg lib/X11/xephem/gallery/m103-2002sep13-lrgb.jpg lib/X11/xephem/gallery/m29-2002sep05.jpg lib/X11/xephem/gallery/m3-2003may07-ddp.jpg lib/X11/xephem/gallery/m35-11dec01-grgb.jpg lib/X11/xephem/gallery/m76-07dec01-lrgb-nr.jpg lib/X11/xephem/gallery/m82-03apr02-rgb.jpg lib/X11/xephem/gallery/m92-01jun02.jpg lib/X11/xephem/gallery/m97-03apr02-lrgb.jpg lib/X11/xephem/gallery/ngc457-2002sep13-lrgb.jpg lib/X11/xephem/gallery/ngc6819-25aug01-lrgb.jpg lib/X11/xephem/gallery/ngc6888-27jul02-ha.jpg lib/X11/xephem/gallery/ngc869-2002oct06-lrgb.jpg lib/X11/xephem/gallery/pui-17-virgo-anno1000.jpg lib/X11/xephem/help/png/aavso.png lib/X11/xephem/help/png/annotation.png lib/X11/xephem/help/png/close-pairs.png lib/X11/xephem/help/png/coordconv.png lib/X11/xephem/help/png/data-index.png lib/X11/xephem/help/png/data-table-setup.png lib/X11/xephem/help/png/data-table.png lib/X11/xephem/help/png/db.png lib/X11/xephem/help/png/each-control-objects.png lib/X11/xephem/help/png/earth.png lib/X11/xephem/help/png/external-input.png lib/X11/xephem/help/png/favorites.png lib/X11/xephem/help/png/fieldstars.png lib/X11/xephem/help/png/gallery.png lib/X11/xephem/help/png/imreg.png lib/X11/xephem/help/png/indiconfig.png lib/X11/xephem/help/png/indicontrol.png lib/X11/xephem/help/png/internet-update.png lib/X11/xephem/help/png/jupiter-view-more-info.png lib/X11/xephem/help/png/jupiter.png lib/X11/xephem/help/png/listing.png lib/X11/xephem/help/png/lo.png lib/X11/xephem/help/png/logo.png lib/X11/xephem/help/png/main-calendar.png lib/X11/xephem/help/png/main-local.png lib/X11/xephem/help/png/main-looping.png lib/X11/xephem/help/png/main-night.png lib/X11/xephem/help/png/main-time.png lib/X11/xephem/help/png/main.png lib/X11/xephem/help/png/mars-moon-more-info.png lib/X11/xephem/help/png/mars-moons.png lib/X11/xephem/help/png/mars-more-info.png lib/X11/xephem/help/png/mars.png lib/X11/xephem/help/png/moon-more-info.png lib/X11/xephem/help/png/moon.png lib/X11/xephem/help/png/movie.png lib/X11/xephem/help/png/naag.png lib/X11/xephem/help/png/network-setup.png lib/X11/xephem/help/png/obslog-list.png lib/X11/xephem/help/png/obslog.png lib/X11/xephem/help/png/plot-sample.png lib/X11/xephem/help/png/plot.png lib/X11/xephem/help/png/print.png lib/X11/xephem/help/png/saturn-more-info.png lib/X11/xephem/help/png/saturn.png lib/X11/xephem/help/png/save-colors.png lib/X11/xephem/help/png/save-fonts.png lib/X11/xephem/help/png/save-resources.png lib/X11/xephem/help/png/seti@home.png lib/X11/xephem/help/png/sites.png lib/X11/xephem/help/png/sky-binary.png lib/X11/xephem/help/png/sky-control-eyepieces.png lib/X11/xephem/help/png/sky-control-filter.png lib/X11/xephem/help/png/sky-control-horizon.png lib/X11/xephem/help/png/sky-control-list.png lib/X11/xephem/help/png/sky-control-options.png lib/X11/xephem/help/png/sky-history.png lib/X11/xephem/help/png/sky-images-fits.png lib/X11/xephem/help/png/sky-images-ia-contrast-tb.png lib/X11/xephem/help/png/sky-images-ia-contrast.png lib/X11/xephem/help/png/sky-images-ia-gauss-tb.png lib/X11/xephem/help/png/sky-images-ia-gauss.png lib/X11/xephem/help/png/sky-images-ia-glass-tb.png lib/X11/xephem/help/png/sky-images-ia-glass.png lib/X11/xephem/help/png/sky-images-ia-roi-tb.png lib/X11/xephem/help/png/sky-images-ia-roi.png lib/X11/xephem/help/png/sky-images-ia-slice-tb.png lib/X11/xephem/help/png/sky-images-ia-slice.png lib/X11/xephem/help/png/sky-images-ia-snap-tb.png lib/X11/xephem/help/png/sky-popup-menu.png lib/X11/xephem/help/png/sky-upperleft-delta-roaming.png lib/X11/xephem/help/png/sky-upperleft-roaming.png lib/X11/xephem/help/png/sky-upperright-delta-roaming.png lib/X11/xephem/help/png/sky-upperright-roaming.png lib/X11/xephem/help/png/sky-view-how-tb.png lib/X11/xephem/help/png/sky-view-what-tb.png lib/X11/xephem/help/png/sky-view-where-tb.png lib/X11/xephem/help/png/sky-view.png lib/X11/xephem/help/png/solsys.png lib/X11/xephem/help/png/solver.png lib/X11/xephem/help/png/stepsize.png lib/X11/xephem/help/png/sun-view.png lib/X11/xephem/help/png/syslog.png lib/X11/xephem/help/png/trails.png lib/X11/xephem/help/png/uranus-more-info.png lib/X11/xephem/help/png/uranus.png 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