- Change upstream to port maintainer's fork

- Update to 1.2
- This version fixes build with clang and does not depend on imake
- Remove pkg-plist in favour of make variables
- Trim Makefile headers

PR:		ports/172143
Submitted by:	Anton Shterenlikht <mexas@bristol.ac.uk>
Feature safe:	yes

4 files changed, 19 insertions, 26 deletions

diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile
index 0daf36c39f7c..3e90d1c6fa0f 100644
--- a/astro/xearth/Makefile
+++ b/astro/xearth/Makefile
@@ -1,34 +1,30 @@
-# New ports collection makefile for:    xearth
-# Date created:         29 October 1994
-# Whom:                 piero
-#
+# Created by: Piero Serini <piero@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xearth
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	1.2
 CATEGORIES=	astro geography
-MASTER_SITES=	XCONTRIB/applications \
-		http://seis.bris.ac.uk/~mexas/ \
-		LOCAL/simon
+MASTER_SITES=	http://seis.bris.ac.uk/~mexas/ \
+		LOCAL/madpilot/xearth
 
 MAINTAINER=	mexas@bristol.ac.uk
 COMMENT=	Set the root window to the image of earth
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
-
 USE_XORG=	x11 xext sm ice xt
+USE_XZ=		yes
 MAN1=		xearth.1
+PLIST_FILES=	bin/xearth \
+		lib/X11/xearth/freebsd.committers.markers \
+		lib/X11/xearth/freebsd.ftp.markers \
+		lib/X11/xearth/freebsd.submitters.markers
+PLIST_DIRS=	lib/X11/xearth
 
-pre-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}
-
-post-install:
-	@${MKDIR} ${PREFIX}/lib/X11/xearth
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/xearth ${PREFIX}/bin
 	@${INSTALL_MAN} ${WRKSRC}/xearth.man ${MANPREFIX}/man/man1/xearth.1
+	@${MKDIR} ${PREFIX}/lib/X11/xearth
 # Copy the list of FreeBSD sites & committers locations
-.for marker in freebsd.committers.markers freebsd.submitters.markers freebsd.ftp.markers
+.for marker in freebsd.committers.markers freebsd.ftp.markers freebsd.submitters.markers
 	@${INSTALL_DATA} ${FILESDIR}/${marker} ${PREFIX}/lib/X11/xearth
 .endfor
 
diff --git a/astro/xearth/distinfo b/astro/xearth/distinfo
index 70ba6b332c68..0468114549f3 100644
--- a/astro/xearth/distinfo
+++ b/astro/xearth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xearth-1.1.tar.gz) = bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c
-SIZE (xearth-1.1.tar.gz) = 157887
+SHA256 (xearth-1.2.tar.xz) = fdbe24111fbb05ef1d554643ae189696a8a7a2c28d69d6be475ad1c39f8b0daf
+SIZE (xearth-1.2.tar.xz) = 241816
diff --git a/astro/xearth/pkg-descr b/astro/xearth/pkg-descr
index 26c1fcc0e8b2..c538d36a1469 100644
--- a/astro/xearth/pkg-descr
+++ b/astro/xearth/pkg-descr
@@ -6,7 +6,9 @@ time between updates can be changed with the -wait option.
 Xearth  can  also  render  directly into PPM and GIF files
 instead of drawing in the root window.
 
-There are two additional marker files installed in
+WWW: http://xearth.org
+
+There are three additional marker files installed in
 /usr/local/lib/X11/xearth which specify the locations of
 various FreeBSD people and places:
 
diff --git a/astro/xearth/pkg-plist b/astro/xearth/pkg-plist
deleted file mode 100644
index 1119adb41c71..000000000000
--- a/astro/xearth/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/xearth
-lib/X11/xearth/freebsd.committers.markers
-lib/X11/xearth/freebsd.submitters.markers
-lib/X11/xearth/freebsd.ftp.markers
-@dirrm lib/X11/xearth