5 files changed, 98 insertions, 33 deletions

diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 1f0763d0ffe5..c5ce1977995c 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -6,26 +6,26 @@
 #
 
 PORTNAME=	xephem
-PORTVERSION=	3.6.4
+PORTVERSION=	3.7.1
 CATEGORIES=	astro
 MASTER_SITES=	# http://www.clearskyinstitute.com/xephem/
 
 MAINTAINER=	josh@tcbug.org
 COMMENT=	An interactive astronomical ephemeris program
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_MOTIF=	yes
-USE_IMAKE=	yes
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
 USE_REINPLACE=	yes
-MAN1=		xephem.1
 
-LIBASTROSRC=	${WRKDIR}/${DISTNAME}/libastro
-LIBIPSRC=	${WRKDIR}/${DISTNAME}/libip
-LIBJPEGDSRC=	${WRKDIR}/${DISTNAME}/libjpegd
-LIBLILXMLSRC=	${WRKDIR}/${DISTNAME}/liblilxml
+WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
+
+MAN1=		xephem.1
 
-NO_CDROM=	Personal use only
+NO_CDROM=	"Personal use only"
 
 # XXX needs to be the same as DISTFILES
 XEPHEMSRC=	${PORTNAME}-${PORTVERSION}.tar.gz
@@ -43,22 +43,24 @@ place it in ${DISTDIR} and then run make again.\n
 .endfor
 
 post-patch:
-	@${CHMOD} u+w ${LIBASTROSRC}/Makefile ${LIBIPSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|CC =|CC?=|g ; \
-		 s|CFLAGS=|CFLAGS+=|g ; \
-		 s|-O2 ||g' ${LIBASTROSRC}/Makefile ${LIBIPSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Makefile
+	@${FIND} ${WRKSRC}/../.. -name Makefile -type f | \
+		${XARGS} ${REINPLACE_CMD} -e 's|CC =|CC?=|g ; \
+		s|CFLAGS=|CFLAGS+=|g ; \
+		s|-O2 ||g'
 
 pre-build:
-	@cd ${LIBASTROSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
-	@cd ${LIBIPSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
-	@cd ${LIBJPEGDSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
-	@cd ${LIBLILXMLSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
 	@${ECHO_CMD} 'XEphem.ShareDir: ${PREFIX}/lib/X11/xephem' > ${WRKSRC}/XEphem.ad
 
-post-install:
+pre-install:
+	@${FIND} ${WRKSRC}/../.. -name Makefile.bak -type f | ${XARGS} ${RM} -f
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/xephem ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xephem.1 ${PREFIX}/man/man1 
 	${INSTALL_DATA} ${WRKSRC}/XEphem.ad ${PREFIX}/lib/X11/app-defaults/XEphem
 	@${MKDIR} ${PREFIX}/lib/X11/xephem
-	${TAR} -C ${WRKSRC} -cf - auxil catalogs fits fifos help tools \
+	${TAR} -C ${WRKSRC} -cf - auxil catalogs fifos fits gallery help lo tools \
 		| ${TAR} -C ${PREFIX}/lib/X11/xephem --unlink -xf -
 	@${FIND} ${PREFIX}/lib/X11/xephem | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREMODE}
 	@${FIND} ${PREFIX}/lib/X11/xephem -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
diff --git a/astro/xephem/distinfo b/astro/xephem/distinfo
index b451ba81d73b..b17ba2b8fd6b 100644
--- a/astro/xephem/distinfo
+++ b/astro/xephem/distinfo
@@ -1,2 +1,3 @@
-MD5 (xephem-3.6.4.tar.gz) = f108d27e25cf9d569fbe419c1570e504
-SIZE (xephem-3.6.4.tar.gz) = 10022695
+MD5 (xephem-3.7.1.tar.gz) = a7a89469f1c0681d186344ef96941b8d
+SHA256 (xephem-3.7.1.tar.gz) = f818c54b9533502734402578424a3546d34df91a145dea9f88930293aa348a1a
+SIZE (xephem-3.7.1.tar.gz) = 12986819
diff --git a/astro/xephem/files/patch-Makefile b/astro/xephem/files/patch-Makefile
new file mode 100644
index 000000000000..673b479aa707
--- /dev/null
+++ b/astro/xephem/files/patch-Makefile
@@ -0,0 +1,35 @@
+--- Makefile.orig	Fri Nov 18 16:43:09 2005
++++ Makefile	Mon Dec  5 12:58:21 2005
+@@ -10,9 +10,9 @@
+ # back here and compile and link all the *.c files into one executable, xephem.
+ 
+ # -I and -L flags to find required 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.
+@@ -31,7 +31,7 @@
+ 
+ # for linux and Apple OS X
+ CC = gcc
+-CLDFLAGS = -g
++#CLDFLAGS = -g
+ CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include
+ LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib
+ XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lSM -lICE -lXmu -lX11
+@@ -181,10 +181,7 @@
+ libs:
+ 	cd ../../libastro; make
+ 	cd ../../libip; make
+-	cd ../../libjpegd; make
+ 	cd ../../liblilxml; make
+-	cd ../../libpng; make
+-	cd ../../libz; make
+ 
+ clean:
+ 	touch x.o
diff --git a/astro/xephem/files/patch-aa b/astro/xephem/files/patch-aa
deleted file mode 100644
index 8114dbe128ea..000000000000
--- a/astro/xephem/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Imakefile.orig	Tue Mar 16 09:00:21 1999
-+++ Imakefile	Sun Apr  4 15:06:31 1999
-@@ -63,7 +63,7 @@
- SRCS = 	$(OBJS:.o=.c)
- 
- XCOMM Sometimes you need -lXp after -lXm
--          XMLIB = -lXm
-+          XMLIB = ${MOTIFLIB}
-         DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
-  EXTRA_INCLUDES = -I../../libastro
-   LOCAL_LDFLAGS = -L../../libastro
diff --git a/astro/xephem/pkg-plist b/astro/xephem/pkg-plist
index 732555e702d2..686b03eb1b14 100644
--- a/astro/xephem/pkg-plist
+++ b/astro/xephem/pkg-plist
@@ -1,10 +1,14 @@
 bin/xephem
 lib/X11/app-defaults/XEphem
+lib/X11/xephem/auxil/HAReyfigs.csf
 lib/X11/xephem/auxil/README
 lib/X11/xephem/auxil/SOHO_512_20030809_0719_eit_304.gif
 lib/X11/xephem/auxil/analemma.plt
+lib/X11/xephem/auxil/annotation.ano
 lib/X11/xephem/auxil/astorb2edb.pl
+lib/X11/xephem/auxil/classicfigs.csf
 lib/X11/xephem/auxil/dearth.gif
+lib/X11/xephem/auxil/eyepieces.epl
 lib/X11/xephem/auxil/eyepieces.eyp
 lib/X11/xephem/auxil/favorites.fav
 lib/X11/xephem/auxil/jupiter.9910
@@ -30,7 +34,7 @@ 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/YBS.edb
+lib/X11/xephem/catalogs/SKY2k65.edb
 lib/X11/xephem/fifos/Makefile
 lib/X11/xephem/fifos/README
 lib/X11/xephem/fits/Abell426.fts
@@ -49,6 +53,7 @@ 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
@@ -69,6 +74,7 @@ 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.png
@@ -112,26 +118,56 @@ 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/gallery/1999-41-a-web_print.jpg
+lib/X11/xephem/gallery/arp295_kelly_c1.jpg
+lib/X11/xephem/gallery/gallery.gly
+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/lo/lodb.xml
 lib/X11/xephem/tools/indi/Makefile
 lib/X11/xephem/tools/indi/README
 lib/X11/xephem/tools/indi/cam.c
+lib/X11/xephem/tools/indi/camtest.fts
+lib/X11/xephem/tools/indi/camtest2.fts
+lib/X11/xephem/tools/indi/compiler.c
+lib/X11/xephem/tools/indi/evalINDI.c
+lib/X11/xephem/tools/indi/evalINDI.man
 lib/X11/xephem/tools/indi/eventloop.c
 lib/X11/xephem/tools/indi/eventloop.h
+lib/X11/xephem/tools/indi/fq.c
+lib/X11/xephem/tools/indi/fq.h
 lib/X11/xephem/tools/indi/getINDI.c
+lib/X11/xephem/tools/indi/getINDI.man
 lib/X11/xephem/tools/indi/indiapi.h
 lib/X11/xephem/tools/indi/indidevapi.h
 lib/X11/xephem/tools/indi/indidrivermain.c
 lib/X11/xephem/tools/indi/indiserver.c
+lib/X11/xephem/tools/indi/indiserver.man
 lib/X11/xephem/tools/indi/ota.c
 lib/X11/xephem/tools/indi/security.c
 lib/X11/xephem/tools/indi/setINDI.c
+lib/X11/xephem/tools/indi/setINDI.man
 lib/X11/xephem/tools/indi/tmount.c
 lib/X11/xephem/tools/indi/wx.c
 lib/X11/xephem/tools/lx200xed/LICENSE
@@ -164,6 +200,8 @@ lib/X11/xephem/tools/xephemdbd/xephemdbd.pl
 @dirrm lib/X11/xephem/tools
 @dirrm lib/X11/xephem/help/png
 @dirrm lib/X11/xephem/help
+@dirrm lib/X11/xephem/gallery
+@dirrm lib/X11/xephem/lo
 @dirrm lib/X11/xephem/fits
 @dirrm lib/X11/xephem/fifos
 @dirrm lib/X11/xephem/catalogs