5 files changed, 34 insertions, 69 deletions

diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 602df5ab29f5..5113c93bed75 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	xephem
-PORTVERSION=	3.2.3
+PORTVERSION=	3.4
 CATEGORIES=	astro
-MASTER_SITES=	http://www.clearskyinstitute.com/xephem/xephem/ \
+MASTER_SITES=	http://www.clearskyinstitute.com/xephem/ \
 		ftp://iraf.noao.edu/contrib/xephem/ \
 		ftp://wolf.ifj.edu.pl/mirror/xephem/
 
@@ -17,61 +17,24 @@ MAINTAINER=	ports@FreeBSD.org
 WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
 
 USE_MOTIF=	yes
-USE_XPM=	yes
 USE_IMAKE=	yes
 MAN1=		xephem.1
 
 LIBSRC=		${WRKDIR}/${DISTNAME}/libastro
 
-AUXIL=		README jupiter.9910 logo.gif mars.9910 mars_db marsmap.fts \
-		moon.fts moon_db saturne.9910 uranus.9910 xephem.hlp \
-		xephem_sites
-
-CATALOGS=	ISS.edb Messier.edb NGC.edb README SAC.edb \
-		YBS.edb asteroids.edb comets.edb hickson.edb
-
-TOOLS=		README extract.awk astorb2edb.pl jost2edb.awk mpcorb2edb.pl \
-		tle2edb.pl
-
-GSC=		Makefile README gscload.c support.c
-
-XEPHEMDBD=	INSTALL Makefile README cgi-lib.pl db.c fsfetch.c request.c \
-		stubs.c xephemdbd.c xephemdbd.html xephemdbd.pl
-
 pre-configure:
-	@(cd ${LIBSRC} && ${XMKMF})
+	@(cd ${LIBSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF})
 
 pre-build:
-	@(cd ${LIBSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
-	${SED} -e "s^@PREFIX@^${PREFIX}^" ${WRKSRC}/XEphem.ad > ${WRKSRC}/XEphem.ad.new
+	@(cd ${LIBSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
+	@${ECHO} 'XEphem.ShareDir: ${PREFIX}/lib/X11/xephem' > ${WRKSRC}/XEphem.ad
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/XEphem.ad.new ${PREFIX}/lib/X11/app-defaults/XEphem
-	${MKDIR} ${PREFIX}/lib/X11/xephem
-
-	${MKDIR} ${PREFIX}/lib/X11/xephem/auxil
-.for file in ${AUXIL}
-	${INSTALL_DATA} ${WRKSRC}/auxil/${file} ${PREFIX}/lib/X11/xephem/auxil/${file}
-.endfor
-
-	${MKDIR} ${PREFIX}/lib/X11/xephem/catalogs
-.for file in ${CATALOGS}
-	${INSTALL_DATA} ${WRKSRC}/catalogs/${file} ${PREFIX}/lib/X11/xephem/catalogs/${file}
-.endfor
-
-	${MKDIR} ${PREFIX}/lib/X11/xephem/tools
-.for file in ${TOOLS}
-	${INSTALL_DATA} ${WRKSRC}/tools/${file} ${PREFIX}/lib/X11/xephem/tools/${file}
-.endfor
-
-	${MKDIR} ${PREFIX}/lib/X11/xephem/tools/gsc
-.for file in ${GSC}
-	${INSTALL_DATA} ${WRKSRC}/tools/gsc/${file} ${PREFIX}/lib/X11/xephem/tools/gsc/${file}
-.endfor
-
-	${MKDIR} ${PREFIX}/lib/X11/xephem/tools/xephemdbd
-.for file in ${XEPHEMDBD}
-	${INSTALL_DATA} ${WRKSRC}/tools/xephemdbd/${file} ${PREFIX}/lib/X11/xephem/tools/xephemdbd/${file}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/XEphem.ad ${PREFIX}/lib/X11/app-defaults/XEphem
+	@${MKDIR} ${PREFIX}/lib/X11/xephem
+	${TAR} -C ${WRKSRC} -cf - auxil catalogs fits fifos 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}
 
 .include <bsd.port.mk>
diff --git a/astro/xephem/distinfo b/astro/xephem/distinfo
index 11642fb4f185..c24b81840e51 100644
--- a/astro/xephem/distinfo
+++ b/astro/xephem/distinfo
@@ -1 +1 @@
-MD5 (xephem-3.2.3.tar.gz) = f74362fa797fb7a788d47147f8e0972a
+MD5 (xephem-3.4.tar.gz) = e3525b1ef81f5032dcfad2d8e5d119ac
diff --git a/astro/xephem/files/patch-aa b/astro/xephem/files/patch-aa
index d3acea157fd8..8114dbe128ea 100644
--- a/astro/xephem/files/patch-aa
+++ b/astro/xephem/files/patch-aa
@@ -5,7 +5,7 @@
  
  XCOMM Sometimes you need -lXp after -lXm
 -          XMLIB = -lXm
-+          XMLIB = ${MOTIFLIB} -lXm
++          XMLIB = ${MOTIFLIB}
          DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
   EXTRA_INCLUDES = -I../../libastro
    LOCAL_LDFLAGS = -L../../libastro
diff --git a/astro/xephem/files/patch-ab b/astro/xephem/files/patch-ab
deleted file mode 100644
index e1ec6f802005..000000000000
--- a/astro/xephem/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- XEphem.ad.orig	Wed Mar 10 11:20:24 1999
-+++ XEphem.ad	Wed Mar 10 11:20:50 1999
-@@ -170,7 +170,7 @@
- ! system-wide directory for xephem support files. Shared r-o among all users.
- ! N.B. under this are auxil/, fifos/, fits/, and catalogs/.
- ! N.B. if present, ppm.xe and the gsc base directory must be under catalogs/
--XEphem.ShareDir: .
-+XEphem.ShareDir: @PREFIX@/lib/X11/xephem
- 
- ! *************************************************************************
- ! default FITS info
diff --git a/astro/xephem/pkg-plist b/astro/xephem/pkg-plist
index 28ed8635a1b2..2793ed7e1597 100644
--- a/astro/xephem/pkg-plist
+++ b/astro/xephem/pkg-plist
@@ -1,26 +1,30 @@
 bin/xephem
 lib/X11/app-defaults/XEphem
 lib/X11/xephem/auxil/README
+lib/X11/xephem/auxil/analemma.plt
 lib/X11/xephem/auxil/jupiter.9910
+lib/X11/xephem/auxil/jupitermap.gif
 lib/X11/xephem/auxil/logo.gif
 lib/X11/xephem/auxil/mars.9910
 lib/X11/xephem/auxil/mars_db
 lib/X11/xephem/auxil/marsmap.fts
 lib/X11/xephem/auxil/moon.fts
 lib/X11/xephem/auxil/moon_db
+lib/X11/xephem/auxil/sample.hzn
 lib/X11/xephem/auxil/saturne.9910
+lib/X11/xephem/auxil/starcensus.txt
 lib/X11/xephem/auxil/uranus.9910
 lib/X11/xephem/auxil/xephem.hlp
-lib/X11/xephem/auxil/xephem_sites
+lib/X11/xephem/auxil/xephem.sit
+lib/X11/xephem/auxil/xephem_skyhist
 lib/X11/xephem/catalogs/ISS.edb
 lib/X11/xephem/catalogs/Messier.edb
 lib/X11/xephem/catalogs/NGC.edb
 lib/X11/xephem/catalogs/README
-lib/X11/xephem/catalogs/SAC.edb
 lib/X11/xephem/catalogs/YBS.edb
-lib/X11/xephem/catalogs/asteroids.edb
-lib/X11/xephem/catalogs/comets.edb
-lib/X11/xephem/catalogs/hickson.edb
+lib/X11/xephem/fifos/Makefile
+lib/X11/xephem/fifos/README
+lib/X11/xephem/fits/Abell426.fts
 lib/X11/xephem/tools/README
 lib/X11/xephem/tools/astorb2edb.pl
 lib/X11/xephem/tools/extract.awk
@@ -29,6 +33,12 @@ lib/X11/xephem/tools/gsc/README
 lib/X11/xephem/tools/gsc/gscload.c
 lib/X11/xephem/tools/gsc/support.c
 lib/X11/xephem/tools/jost2edb.awk
+lib/X11/xephem/tools/lx200xed/GPL
+lib/X11/xephem/tools/lx200xed/Makefile
+lib/X11/xephem/tools/lx200xed/README
+lib/X11/xephem/tools/lx200xed/liblx200.c
+lib/X11/xephem/tools/lx200xed/liblx200.h
+lib/X11/xephem/tools/lx200xed/lx200xed.c
 lib/X11/xephem/tools/mpcorb2edb.pl
 lib/X11/xephem/tools/tle2edb.pl
 lib/X11/xephem/tools/xephemdbd/INSTALL
@@ -42,9 +52,12 @@ lib/X11/xephem/tools/xephemdbd/stubs.c
 lib/X11/xephem/tools/xephemdbd/xephemdbd.c
 lib/X11/xephem/tools/xephemdbd/xephemdbd.html
 lib/X11/xephem/tools/xephemdbd/xephemdbd.pl
-@dirrm lib/X11/xephem/auxil
-@dirrm lib/X11/xephem/catalogs
-@dirrm lib/X11/xephem/tools/gsc
 @dirrm lib/X11/xephem/tools/xephemdbd
+@dirrm lib/X11/xephem/tools/lx200xed
+@dirrm lib/X11/xephem/tools/gsc
 @dirrm lib/X11/xephem/tools
+@dirrm lib/X11/xephem/fits
+@dirrm lib/X11/xephem/fifos
+@dirrm lib/X11/xephem/catalogs
+@dirrm lib/X11/xephem/auxil
 @dirrm lib/X11/xephem