- Update to version 0.1.7

PR:		ports/61955
Submitted by:	Ports Fury

5 files changed, 48 insertions, 56 deletions

diff --git a/misc/gonvert/Makefile b/misc/gonvert/Makefile
index ca70072a7998..d32b58f0eac9 100644
--- a/misc/gonvert/Makefile
+++ b/misc/gonvert/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gonvert
-PORTVERSION=	0.1.5
-PORTREVISION=	0
+PORTVERSION=	0.1.7
 CATEGORIES=	misc python gnome
 MASTER_SITES=	http://www.unihedron.com/projects/gonvert/downloads/
 
@@ -17,16 +16,27 @@ COMMENT=	A conversion utility that allows conversion between many units
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
 
-USE_REINPLACE=	yes
-USE_PYTHON=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehier
+USE_PYTHON=	yes
 USE_GMAKE=	yes
 NO_BUILD=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,/usr/bin/python,${PYTHON_CMD},g" ${WRKSRC}/${PORTNAME}
-	@${REINPLACE_CMD} -e "s,gnome-config,${GNOME_CONFIG},g ; \
-		s,--directory,-d --mode=755,g ; \
-		s,install ,install -c ,g" ${WRKSRC}/Makefile
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/gonvert ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/gonvert.desktop \
+		${PREFIX}/share/gnome/apps/Utilities
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/gonvert_icon.png \
+		${PREFIX}/share/gnome/pixmaps
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/gonvert.glade ${DATADIR}
+	@${MKDIR} ${DATADIR}/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.png ${DATADIR}/pixmaps
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in README CHANGELOG FAQ README THANKS TODO
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/misc/gonvert/distinfo b/misc/gonvert/distinfo
index 13083d2687e1..db8386a28b02 100644
--- a/misc/gonvert/distinfo
+++ b/misc/gonvert/distinfo
@@ -1 +1 @@
-MD5 (gonvert-0.1.5.tar.gz) = 290b92e0219156b80fe5db5cb2659974
+MD5 (gonvert-0.1.7.tar.gz) = 87f7d95ab46ba715b46db401872fc05c
diff --git a/misc/gonvert/files/patch-Makefile b/misc/gonvert/files/patch-Makefile
deleted file mode 100644
index 34bbb9957d77..000000000000
--- a/misc/gonvert/files/patch-Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
---- Makefile.orig	Wed Feb 26 21:18:18 2003
-+++ Makefile	Thu Feb 27 00:24:14 2003
-@@ -4,31 +4,31 @@
- VERSION=$(shell head -2 $(NAME) | grep version | cut -d\" -f2)
- 
- #DESTDIR can be defined when calling make ie. make install DESTDIR=$RPM_BUILD_ROOT
--BASEDIR  = $(DESTDIR)/usr
-+BASEDIR  = $(DESTDIR)/${PREFIX}
- BINDIR   = $(BASEDIR)/bin
- LIBDIR   = $(BASEDIR)/lib
- DOCDIR   = $(BASEDIR)/doc
- 
--MYLIBDIR = $(LIBDIR)/$(NAME)-$(VERSION)
-+MYLIBDIR = $(BASEDIR)/share/gnome/$(NAME)
- MYDOCDIR = $(DOCDIR)/$(NAME)-$(VERSION)
- 
- all:
- 
- 
- install:
--	install -D --mode=755 $(NAME) $(BINDIR)/$(NAME)				#put the main program into the bin directory
-+	install --mode=755 $(NAME) $(BINDIR)/$(NAME)				#put the main program into the bin directory
- 	rm -rf $(LIBDIR)/gonvert-*						#remove old lib directories
- 	install --directory $(MYLIBDIR)						#create directory to hold project files
- 	install --mode=644 $(NAME).glade $(MYLIBDIR)/$(NAME).glade		#copy glade file over
- 	install --directory $(MYLIBDIR)/pixmaps					#create pixmap directory to hold project pictures
- 	install --mode=644 pixmaps/*.png $(MYLIBDIR)/pixmaps			#copy project specific pictures over
--	install --directory $(BASEDIR)/share/pixmaps				#create pixmap directory to hold gnome icon
--	install --mode=644 pixmaps/$(NAME)_icon.png $(BASEDIR)/share/pixmaps	#copy gnome pictures over
-+	install --directory $(BASEDIR)/share/gnome/pixmaps				#create pixmap directory to hold gnome icon
-+	install --mode=644 pixmaps/$(NAME)_icon.png $(BASEDIR)/share/gnome/pixmaps	#copy gnome pictures over
- 	install --directory $(BASEDIR)/share/gnome/apps/Utilities		#create directory to hold gnome menu description
- 	install --mode=644 $(NAME).desktop $(BASEDIR)/share/gnome/apps/Utilities #copy the gnome menu description
- 	rm -rf $(DOCDIR)/gonvert-*						#remove old doc directories
--	install --directory $(MYDOCDIR) 					#create a directory that holds project documentation
--	install --mode=644 doc/* $(MYDOCDIR)					#copy project documentation
-+	#install --directory $(MYDOCDIR) 					#create a directory that holds project documentation
-+	#install --mode=644 doc/* $(MYDOCDIR)					#copy project documentation
- 
- 
- uninstall:
diff --git a/misc/gonvert/files/patch-gonvert b/misc/gonvert/files/patch-gonvert
new file mode 100644
index 000000000000..5d4c3260f449
--- /dev/null
+++ b/misc/gonvert/files/patch-gonvert
@@ -0,0 +1,17 @@
+--- gonvert.orig	Mon Jan 26 02:22:42 2004
++++ gonvert	Mon Jan 26 13:22:52 2004
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ # -*- coding: UTF8 -*-
+ version = "0.1.7"   # keep version information here since Makefile needs it
+ 
+@@ -655,7 +655,7 @@
+ 	homepath=''
+ else:
+ 	#look for it in the installed directory
+-	homepath=sys.path[0] + '/../lib/gonvert-'+version + "/"
++	homepath=sys.path[0] + '/../share/gonvert' "/"
+ 
+ gladefile=homepath+'gonvert.glade'
+ 
diff --git a/misc/gonvert/pkg-plist b/misc/gonvert/pkg-plist
index b0858a9ad36c..5f1fe0dd5ad9 100644
--- a/misc/gonvert/pkg-plist
+++ b/misc/gonvert/pkg-plist
@@ -1,8 +1,14 @@
 bin/gonvert
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/apps/Utilities/gonvert.desktop
-share/gnome/gonvert/gonvert.glade
-share/gnome/gonvert/pixmaps/gonvert.png
-share/gnome/gonvert/pixmaps/gonvert_icon.png
 share/gnome/pixmaps/gonvert_icon.png
-@dirrm share/gnome/gonvert/pixmaps
-@dirrm share/gnome/gonvert
+%%DATADIR%%/gonvert.glade
+%%DATADIR%%/pixmaps/gonvert.png
+%%DATADIR%%/pixmaps/gonvert_icon.png
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%