Index: head/astro/xephem/Makefile
===================================================================
--- head/astro/xephem/Makefile	(revision 513047)
+++ head/astro/xephem/Makefile	(revision 513048)
@@ -1,69 +1,67 @@
 # Created by: erich@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	xephem
 PORTVERSION=	3.7.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro
 MASTER_SITES=	http://www.clearskyinstitute.com/xephem/
 
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	Interactive astronomical ephemeris program
-
-DEPRECATED=	Depends on deprecated libXp
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		gmake groff jpeg motif tar:tgz ssl xorg
 USE_XORG=	xp xt xext xmu x11 xft
 
 LDFLAGS+=	-lfontconfig
 
 MAKE_JOBS_UNSAFE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
 
 RESTRICTED=	Personal use only
 
 # XXX needs to be the same as DISTFILES
 XEPHEMSRC=	${PORTNAME}-${PORTVERSION}.tgz
 
 .include <bsd.port.pre.mk>
 
 .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
 	@${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
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xephem
 	@cd ${WRKSRC}; ${COPYTREE_SHARE} \
 		"auxil catalogs fifos fits gallery help lo" \
 		${STAGEDIR}${PREFIX}/lib/X11/xephem
 
 .include <bsd.port.post.mk>
Index: head/astro/xephem/files/patch-Makefile
===================================================================
--- head/astro/xephem/files/patch-Makefile	(revision 513047)
+++ head/astro/xephem/files/patch-Makefile	(revision 513048)
@@ -1,141 +1,141 @@
 --- Makefile.orig	2015-08-09 21:36:50 UTC
 +++ Makefile
 @@ -23,44 +23,44 @@ MOTIFI = $(MOTIF)
  MOTIFL = $(MOTIF)
  endif
  ifndef MOTIFI
 -MOTIFI = /usr/include
 +MOTIFI = /usr/local/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 -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 -lXp -lXt -lXext -lXmu -lX11 -lXft
++XLIBS = -lXm -lXt -lXext -lXmu -lX11 -lXft
 +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 =			\
  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]