Index: head/astro/xephem/Makefile =================================================================== --- head/astro/xephem/Makefile (revision 396901) +++ head/astro/xephem/Makefile (revision 396902) @@ -1,63 +1,62 @@ # Created by: erich@FreeBSD.org # $FreeBSD$ PORTNAME= xephem -PORTVERSION= 3.7.6 -PORTREVISION= 2 +PORTVERSION= 3.7.7 CATEGORIES= astro MASTER_SITES= # http://www.clearskyinstitute.com/xephem/ MAINTAINER= jpaetzel@FreeBSD.org COMMENT= Interactive astronomical ephemeris program LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png USES= gmake jpeg motif LDFLAGS+= -lfontconfig USE_XORG= xp xt xext xmu x11 xft MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/GUI/xephem RESTRICTED= Personal use only # XXX needs to be the same as DISTFILES XEPHEMSRC= ${PORTNAME}-${PORTVERSION}.tar.gz .include .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 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 ; \ 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 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xephem ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/XEphem.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XEphem @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xephem @cd ${WRKSRC}; ${COPYTREE_SHARE} \ "auxil catalogs fifos fits gallery help lo" \ ${STAGEDIR}${PREFIX}/lib/X11/xephem .include Index: head/astro/xephem/distinfo =================================================================== --- head/astro/xephem/distinfo (revision 396901) +++ head/astro/xephem/distinfo (revision 396902) @@ -1,2 +1,2 @@ -SHA256 (xephem-3.7.6.tar.gz) = 2080b628d80d52d9ff7148787e3093eb56f21fef5fba404f123b6198b2d64d05 -SIZE (xephem-3.7.6.tar.gz) = 17975496 +SHA256 (xephem-3.7.7.tar.gz) = 8bee7ed8361e0e11a386ef4f05101e60bdb607e09a9823eec6ed20edbd230376 +SIZE (xephem-3.7.7.tar.gz) = 38010880 Index: head/astro/xephem/files/patch-Makefile =================================================================== --- head/astro/xephem/files/patch-Makefile (revision 396901) +++ head/astro/xephem/files/patch-Makefile (revision 396902) @@ -1,63 +1,52 @@ ---- Makefile.orig 2013-01-20 04:42:02.000000000 +0100 -+++ Makefile 2013-10-20 13:58:27.000000000 +0200 -@@ -10,9 +10,9 @@ - # one executable, xephem. - - # These -I and -L flags point to the supporting XEphem libraries --LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz --LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz --LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz -+LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I%%LOCALBASE%%/include -+LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L%%LOCALBASE%%/lib -+LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz - - # MOTIFI is the directory containing the Xm directory of include files. - # MOTIFL is the directory containing the libXm.a library. -@@ -24,19 +24,19 @@ +--- Makefile.orig 2015-09-14 09:37:09.737810488 -0500 ++++ Makefile 2015-09-14 09:45:54.470774555 -0500 +@@ -23,18 +23,18 @@ MOTIFL = $(MOTIF) endif ifndef MOTIFI --MOTIFI = /usr/X11R6/include +-MOTIFI = /usr/include +MOTIFI = %%LOCALBASE%%/include endif ifndef MOTIFL --MOTIFL = /usr/X11R6/lib -+MOTIFL = %%LOCALBASE%%/lib +-MOTIFL = /usr/lib ++MOTIFL = %%/LOCALBASE%%/lib endif # for linux and Apple OS X - # some systems now use just /usr/X11 (not /usr/X11R6) CC = gcc CLDFLAGS = -g --CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include --LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib +-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 +CFLAGS = $(LIBINC) $(CLDFLAGS) -Wall -I$(MOTIFI) -I%%LOCALBASE%%/include +LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L%%LOCALBASE%%/lib +XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11 -lXft LIBS = $(XLIBS) $(LIBLIB) -lm - # for ppc Apple OS X to make universal (i386 and ppc binary), requires -@@ -181,18 +181,15 @@ + # static linking on Apple using X11 libs from ports +@@ -189,18 +189,18 @@ all: libs xephem xephem.1 xephem: $(INCS) $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) xephem.1: xephem.man 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]