- Update to 0.95.5

PR:		123865
Submitted by:	Ports Fury

5 files changed, 57 insertions, 46 deletions

diff --git a/astro/starplot/Makefile b/astro/starplot/Makefile
index a4f4025fd3bb..a7e359790420 100644
--- a/astro/starplot/Makefile
+++ b/astro/starplot/Makefile
@@ -6,30 +6,24 @@
 #
 
 PORTNAME=	starplot
-PORTVERSION=	0.95.4
-PORTREVISION=	1
+PORTVERSION=	0.95.5
 CATEGORIES=	astro
 MASTER_SITES=	http://starplot.org/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3-dimensional viewer for star charts
 
-USE_GNOME=	gnometarget gtk20
-USE_ICONV=	yes
+USE_GNOME=	gnomehack gnometarget gtk20
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_ENV=	DOCSDIR="${DOCSDIR}" EXAMPLESDIR="${EXAMPLESDIR}"
 
 MAN1=		starconvert.1 starpkg.1 starplot.1
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$$(docdir)/examples|${EXAMPLESDIR}|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/astro/starplot/distinfo b/astro/starplot/distinfo
index cf9373518bae..9113db90f345 100644
--- a/astro/starplot/distinfo
+++ b/astro/starplot/distinfo
@@ -1,3 +1,3 @@
-MD5 (starplot-0.95.4.tar.gz) = 59a6c8fe7167d2b5efa824e6ebac9d6f
-SHA256 (starplot-0.95.4.tar.gz) = 7e0de4132e634a1d5a3552f42a85022428b4933834ec36f424af6a6488d1352f
-SIZE (starplot-0.95.4.tar.gz) = 470863
+MD5 (starplot-0.95.5.tar.gz) = ff51981f48240b234f24448510ed089c
+SHA256 (starplot-0.95.5.tar.gz) = e320f141b736b3a6468e7d0c08a93961db6615e9eb4d533d554eea31c3fa845a
+SIZE (starplot-0.95.5.tar.gz) = 892878
diff --git a/astro/starplot/files/patch-configure b/astro/starplot/files/patch-configure
deleted file mode 100644
index fb1ee9dbdd66..000000000000
--- a/astro/starplot/files/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig	Mon Aug 30 09:02:54 2004
-+++ configure	Thu Dec 23 16:04:03 2004
-@@ -9827,11 +9827,11 @@
- 
- 
- 
--docdir='${prefix}/doc'
-+docdir='$(DOCSDIR)'
- 
--pkgdocdir='$(docdir)/'${PACKAGE_NAME}
-+pkgdocdir='$(DOCSDIR)'
- 
--exampledir='$(pkgdocdir)/examples'
-+exampledir='$(EXAMPLESDIR)'
- 
- htmldir='$(pkgdocdir)/html'
- 
diff --git a/astro/starplot/files/patch-src-classes-strings.cc b/astro/starplot/files/patch-src-classes-strings.cc
deleted file mode 100644
index b1d9026d96da..000000000000
--- a/astro/starplot/files/patch-src-classes-strings.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/classes/strings.cc.orig	Tue Oct  3 18:28:35 2006
-+++ src/classes/strings.cc	Tue Oct  3 18:28:44 2006
-@@ -127,7 +127,7 @@
-   // return the number of bytes that would have been written even if not
-   // all of them are.  Hope this is true...
-   va_start(args, format);
--  size_t size = std::vsnprintf(test, 2, format, args);
-+  size_t size = vsnprintf(test, 2, format, args);
-   va_end(args);
- 
-   // Write the result to a string
diff --git a/astro/starplot/pkg-plist b/astro/starplot/pkg-plist
index 615a7923b64f..370b8fcba8db 100644
--- a/astro/starplot/pkg-plist
+++ b/astro/starplot/pkg-plist
@@ -1,21 +1,65 @@
 bin/starconvert
 bin/starpkg
 bin/starplot
+share/applications/starplot.desktop
+%%DOCSDIR%%/html/ch0.html
 %%DOCSDIR%%/html/ch1.html
+%%DOCSDIR%%/html/ch2.html
+%%DOCSDIR%%/html/ch3.html
+%%DOCSDIR%%/html/ch4.html
+%%DOCSDIR%%/html/ch5.html
 %%DOCSDIR%%/html/images/bayerdes.png
+%%DOCSDIR%%/html/images/button-brighter.png
+%%DOCSDIR%%/html/images/button-ccw.png
+%%DOCSDIR%%/html/images/button-cw.png
+%%DOCSDIR%%/html/images/button-dimmer.png
+%%DOCSDIR%%/html/images/button-down.png
+%%DOCSDIR%%/html/images/button-earthview.png
+%%DOCSDIR%%/html/images/button-open.png
+%%DOCSDIR%%/html/images/button-up.png
+%%DOCSDIR%%/html/images/button-zoomin.png
+%%DOCSDIR%%/html/images/button-zoomout.png
 %%DOCSDIR%%/html/images/coords.png
+%%DOCSDIR%%/html/images/dialog-define-chart.png
+%%DOCSDIR%%/html/images/dialog-file-open.png
+%%DOCSDIR%%/html/images/dialog-search.png
+%%DOCSDIR%%/html/images/filebar.png
 %%DOCSDIR%%/html/images/gcoords.png
 %%DOCSDIR%%/html/images/hrdiagram.png
+%%DOCSDIR%%/html/images/legend.png
+%%DOCSDIR%%/html/images/menu-chart.png
+%%DOCSDIR%%/html/images/menu-file.png
+%%DOCSDIR%%/html/images/star-parts.png
+%%DOCSDIR%%/html/images/star-popup.png
+%%DOCSDIR%%/html/images/starplot-png.png
+%%DOCSDIR%%/html/images/status.png
+%%DOCSDIR%%/html/images/tour-40ly-reddwarfs.png
+%%DOCSDIR%%/html/images/tour-40ly.png
+%%DOCSDIR%%/html/images/tour-arcturus.png
+%%DOCSDIR%%/html/images/tour-first.png
+%%DOCSDIR%%/html/images/tour-galplane.png
+%%DOCSDIR%%/html/images/tour-hr-diagram.png
+%%DOCSDIR%%/html/images/tour-hyades.png
+%%DOCSDIR%%/html/images/tour-legend-sun.png
+%%DOCSDIR%%/html/images/tour-scocen.png
+%%DOCSDIR%%/html/images/tour-sunlike-info.png
+%%DOCSDIR%%/html/images/tour-sunlike.png
+%%DOCSDIR%%/html/images/ui-parts.png
 %%DOCSDIR%%/html/index.html
+%%DOCSDIR%%/html/parfiles/galplane.par
+%%DOCSDIR%%/html/parfiles/hyades.par
+%%DOCSDIR%%/html/parfiles/scocen.par
 %%DOCSDIR%%/html/starplot.css
 %%EXAMPLESDIR%%/example.spec
-%%NLS%%share/locale/en@boldquot/LC_MESSAGES/starplot.mo
-%%NLS%%share/locale/en@quot/LC_MESSAGES/starplot.mo
-%%NLS%%share/locale/es/LC_MESSAGES/starplot.mo
+share/locale/en@boldquot/LC_MESSAGES/starplot.mo
+share/locale/en@quot/LC_MESSAGES/starplot.mo
+share/locale/es/LC_MESSAGES/starplot.mo
+share/pixmaps/starplot32x32.xpm
 %%DATADIR%%/sample.stars
 %%DATADIR%%/test.stars
 @dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%
+@dirrm %%DOCSDIR%%/html/parfiles
 @dirrm %%DOCSDIR%%/html/images
 @dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%
@@ -23,3 +67,4 @@ bin/starplot
 @dirrmtry share/locale/en@boldquot
 @dirrmtry share/locale/en@quot/LC_MESSAGES
 @dirrmtry share/locale/en@quot
+@dirrmtry share/applications