diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile
index 7d57fdfd8209..6bc68ab31abe 100644
--- a/astro/sunclock/Makefile
+++ b/astro/sunclock/Makefile
@@ -1,72 +1,70 @@
 # Created by: torstenb
 
 PORTNAME=	sunclock
 PORTVERSION=	3.57
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro x11-clocks
 MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shows which portion of the Earth's surface is illuminated by the Sun
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USES=		jpeg xorg
+USES=		jpeg localbase xorg
 USE_XORG=	xpm
 
 CPPFLAGS+=	$$(libpng-config --I_opts) \
-		-I${LOCALBASE}/include \
 		-DEMXBINDIR=\\\"${PREFIX}/bin\\\" \
 		-DDOCDIR=\\\"${PREFIX}/lib/X11/doc\\\"
-LDFLAGS+=	$$(libpng-config --L_opts) \
-		-L${LOCALBASE}/lib
+LDFLAGS+=	$$(libpng-config --L_opts)
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 post-patch:
 	@cd ${WRKSRC} && ${SED} -e \
 		'/^DESTDIR/s|=.*|=${PREFIX}| ; \
 		 s|/X11R6/man|$$(DESTDIR)/man| ; \
 		 s|bin/X11|bin| ; \
 		 s|^CC=|CC?=| ; \
 		 s|^CFLAGS=|CFLAGS+=| ; \
 		 s|-I/usr/include/X11|$${CPPFLAGS}| ; \
 		 s|-L/usr/X11R6/lib|$${LDFLAGS}| ; \
 		 s| make | $$(MAKE) | ; \
 		 s|$$(SHAREDIR)/bin|$$(DESTDIR)/bin| ; \
 		 s|$$(SHAREDIR)/editkit|$$(DESTDIR)/share/sunclock/editkit|' \
 			< Makefile.noimake > Makefile
 	@${LN} -sf sunclock.man ${WRKSRC}/sunclock.1
 	@${REINPLACE_CMD} -e \
 		's|= -O2|+= $${CPPFLAGS}| ; \
 		 s|-L/usr/X11R6/lib|$${LDFLAGS}| ; \
 		 s|gcc |$$(CC) |' ${WRKSRC}/editkit/Makefile.kit
 	@${LN} -sf rc.example ${WRKSRC}/editkit/emxrc
 	@${REINPLACE_CMD} -e \
 		's|gzFile \* fd;|gzFile fd;|' ${WRKSRC}/readvmf.c
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} sunclock \
 		${STAGEDIR}${PREFIX}/bin)
 	(cd ${WRKSRC} && ${INSTALL_MAN} sunclock.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} Sunclockrc \
 		${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${DATADIR}/earthmaps/vmf
 	(cd ${WRKSRC}/vmf && ${INSTALL_DATA} *.vmf \
 		${STAGEDIR}${DATADIR}/earthmaps/vmf)
 	@${GZIP_CMD} ${STAGEDIR}${DATADIR}/earthmaps/vmf/*.vmf
 	@${MKDIR} ${STAGEDIR}${DATADIR}/i18n
 	(cd ${WRKSRC}/i18n && ${INSTALL_DATA} Sunclock.?? \
 		${STAGEDIR}${DATADIR}/i18n)
 	(cd ${WRKSRC}/editkit && ${INSTALL_PROGRAM} emx \
 		${STAGEDIR}${PREFIX}/bin)
 	@${MKDIR} ${STAGEDIR}${DATADIR}/editkit
 	(cd ${WRKSRC}/editkit && ${INSTALL_DATA} MANUAL.emacs README emxrc \
 		${STAGEDIR}${DATADIR}/editkit)
 
 .include <bsd.port.mk>
diff --git a/astro/sunclock/pkg-descr b/astro/sunclock/pkg-descr
index bf67bf4f7d21..ad4fff32607d 100644
--- a/astro/sunclock/pkg-descr
+++ b/astro/sunclock/pkg-descr
@@ -1,19 +1,19 @@
 Sunclock is an X11 application that displays a map of the Earth and
 shows the illuminated portion of the globe. In addition to providing
 local time for the default timezone, it also displays GMT time,
 legal and solar time of major cities, their latitude and longitude,
 the mutual distances of arbitrary locations on Earth, the position
 at zenith of Sun and Moon. Sunclock can display meridians, parallels,
 tropics and arctic circles. It has builtin functions that accelerate
 the speed of time and show the evolution of seasons. Sunclock can
 be internationalized for various western languages. It is possible
 to customize the app-default file and enter additional city entries.
 
 Sunclock can commute between two states, the "clock window" and the
 "map window". The clock window displays a small map of the Earth
 and therefore occupies little space on the screen, while the "map
 window" displays a large map and offers more advanced functions.
 The Sunclock package includes a resizable and zoomable vector map.
 External Earth maps can also be loaded.
 
-WWW: http://www.arvernes.com/wiki/index.php/Sunclock
+WWW: https://github.com/nongiach/Sunclock