3 files changed, 68 insertions, 68 deletions

diff --git a/finance/mybudget/Makefile b/finance/mybudget/Makefile
index 6fd507354439..bb6a1f683eca 100644
--- a/finance/mybudget/Makefile
+++ b/finance/mybudget/Makefile
@@ -3,23 +3,48 @@
 
 PORTNAME=	myBudget
 PORTVERSION=	0.60
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	finance gnome
 MASTER_SITES=	http://www.abisource.com/~msevior/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gtk+-2 finance manager
 
+LICENSE=	LGPL21
+
+NO_ARCH=	yes
 NO_BUILD=	yes
-USE_PYTHON=	yes
 USE_GNOME=	pygnome2
+INSTALL_ICONS=	yes
+
+USES=		python shebangfix
+SHEBANG_FILES=	myBudget.py
+python_CMD=	${PYTHON_CMD}
+
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e 's|gobject.so|_gobject.so|' \
-	    ${WRKSRC}/install.py
+	@${REINPLACE_CMD} -e \
+		"/^sPREFIX/s|=.*| = '${PREFIX}/share'|" ${WRKSRC}/myBudget.py
 
 do-install:
-	cd ${WRKSRC} && ${PYTHON_CMD} ./install.py ${PREFIX}
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} myBudget.py \
+		${STAGEDIR}${PREFIX}/bin/myBudget)
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} *.myb *.png *.txt \
+		${STAGEDIR}${DATADIR})
+	@${MKDIR} ${STAGEDIR}${DATADIR}/glade
+	(cd ${WRKSRC}/glade && ${INSTALL_DATA} *.* \
+		${STAGEDIR}${DATADIR}/glade)
+	@${MKDIR} ${STAGEDIR}${DATADIR}/po
+	(cd ${WRKSRC}/po && ${INSTALL_DATA} *.po \
+		${STAGEDIR}${DATADIR}/po)
+	(cd ${WRKSRC} && ${INSTALL_DATA} *.desktop \
+		${STAGEDIR}${PREFIX}/share/applications)
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
+	(cd ${WRKSRC} && ${INSTALL_DATA} *.svg \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/finance/mybudget/pkg-descr b/finance/mybudget/pkg-descr
index c17fb954807d..d7fd64b8509f 100644
--- a/finance/mybudget/pkg-descr
+++ b/finance/mybudget/pkg-descr
@@ -1,27 +1,4 @@
 The aim of the program is to make it as easy as possible for people to
-do their own personal budgets and keep track of their finances. Using
-this program you can:
-
-	* Create a budget and organize budget items into categories.
-	* Nominate budget items to be paid from either a cash account or
-	  via a "Direct Debit" account which allows you to save for big
-	  ticket items and ensure timely payment of scheduled bills.
-	* Automatically calculates how much money you must put aside
-	  each fortnight to meet all your "Direct Debit" obligations.
-	* Automatically tells you how much money you must have in Direct
-	  Debit account to meet your obligatory payments on any
-	  particular date.
-	* Record and save expenses against each of your budget categories.
-	* Track how your expenses relate to your budget so you can
-	  determine if you are over or under-spending in any of your
-	  categories.
-	* Sort your records into categories or by date.
-	* Comes with realistic example to show how things work.
-	* Allows you to export any of your reports, records, budget and
-	  Direct Debit status to the Gnumeric Spreadsheet program where
-	  they can be either printed or used for more detailed analysis.
-	* Allows you to export any of your reports, records, budget and
-	  Direct Debit status to the AbiWord WordProcessor program where
-	  they can be printed or incorporated into a report.
+do their own personal budgets and keep track of their finances.
 
 WWW: http://www.abisource.com/~msevior/index.html
diff --git a/finance/mybudget/pkg-plist b/finance/mybudget/pkg-plist
index 88628a3f28da..bd9a967b2ac9 100644
--- a/finance/mybudget/pkg-plist
+++ b/finance/mybudget/pkg-plist
@@ -1,38 +1,39 @@
 bin/myBudget
+share/applications/myBudget.desktop
+%%PORTDOCS%%%%DOCSDIR%%/DirectDebitPane.png
+%%PORTDOCS%%%%DOCSDIR%%/ExportAbiWord.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/1.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/addButton_0.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/deleteButton_0.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/deleteButton_1.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/gnumericButton_0.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/gnumericButton_1.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/gnumericButton_2.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/myBudget-1_0.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/myBudget-2_0.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/mybudget-3_0.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/quitButton_0.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/replaceButton_0.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/replaceButton_1.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/sortCategoriesButton_0.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/sortDatesButton_0.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.html_files/sortItem_0.png
+%%PORTDOCS%%%%DOCSDIR%%/MyBudget.zabw
+%%PORTDOCS%%%%DOCSDIR%%/addButton.png
+%%PORTDOCS%%%%DOCSDIR%%/applyButton.png
+%%PORTDOCS%%%%DOCSDIR%%/deleteButton.png
+%%PORTDOCS%%%%DOCSDIR%%/gnumericButton.png
+%%PORTDOCS%%%%DOCSDIR%%/myBudget-1.png
+%%PORTDOCS%%%%DOCSDIR%%/myBudget-2.png
+%%PORTDOCS%%%%DOCSDIR%%/mybudget-3.png
+%%PORTDOCS%%%%DOCSDIR%%/quitButton.png
+%%PORTDOCS%%%%DOCSDIR%%/replaceButton.png
+%%PORTDOCS%%%%DOCSDIR%%/sortCategoriesButton.png
+%%PORTDOCS%%%%DOCSDIR%%/sortDatesButton.png
+%%PORTDOCS%%%%DOCSDIR%%/sortItem.png
+share/icons/hicolor/scalable/apps/myBudget-icon.svg
 %%DATADIR%%/abiword_head.txt
-%%DATADIR%%/applications/myBudget.desktop
-%%DATADIR%%/docs/DirectDebitPane.png
-%%DATADIR%%/docs/ExportAbiWord.png
-%%DATADIR%%/docs/MyBudget.html
-%%DATADIR%%/docs/MyBudget.html_files/1.png
-%%DATADIR%%/docs/MyBudget.html_files/addButton_0.png
-%%DATADIR%%/docs/MyBudget.html_files/deleteButton_0.png
-%%DATADIR%%/docs/MyBudget.html_files/deleteButton_1.png
-%%DATADIR%%/docs/MyBudget.html_files/gnumericButton_0.png
-%%DATADIR%%/docs/MyBudget.html_files/gnumericButton_1.png
-%%DATADIR%%/docs/MyBudget.html_files/gnumericButton_2.png
-%%DATADIR%%/docs/MyBudget.html_files/myBudget-1_0.png
-%%DATADIR%%/docs/MyBudget.html_files/myBudget-2_0.png
-%%DATADIR%%/docs/MyBudget.html_files/mybudget-3_0.png
-%%DATADIR%%/docs/MyBudget.html_files/quitButton_0.png
-%%DATADIR%%/docs/MyBudget.html_files/replaceButton_0.png
-%%DATADIR%%/docs/MyBudget.html_files/replaceButton_1.png
-%%DATADIR%%/docs/MyBudget.html_files/sortCategoriesButton_0.png
-%%DATADIR%%/docs/MyBudget.html_files/sortDatesButton_0.png
-%%DATADIR%%/docs/MyBudget.html_files/sortItem_0.png
-%%DATADIR%%/docs/MyBudget.zabw
-%%DATADIR%%/docs/addButton.png
-%%DATADIR%%/docs/applyButton.png
-%%DATADIR%%/docs/deleteButton.png
-%%DATADIR%%/docs/gnumericButton.png
-%%DATADIR%%/docs/myBudget-1.png
-%%DATADIR%%/docs/myBudget-2.png
-%%DATADIR%%/docs/mybudget-3.png
-%%DATADIR%%/docs/quitButton.png
-%%DATADIR%%/docs/replaceButton.png
-%%DATADIR%%/docs/sortCategoriesButton.png
-%%DATADIR%%/docs/sortDatesButton.png
-%%DATADIR%%/docs/sortItem.png
 %%DATADIR%%/example.myb
 %%DATADIR%%/generic-budget.txt
 %%DATADIR%%/glade/icon.svg
@@ -40,13 +41,10 @@ bin/myBudget
 %%DATADIR%%/glade/mybudget.gladep
 %%DATADIR%%/gnumeric_foot.txt
 %%DATADIR%%/gnumeric_head.txt
-%%DATADIR%%/pixmaps/myBudget-icon.svg
 %%DATADIR%%/po/myBudget.po
 %%DATADIR%%/splashscreen.png
 @dirrm %%DATADIR%%/po
-@dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/docs/MyBudget.html_files
-@dirrm %%DATADIR%%/docs
-@dirrm %%DATADIR%%/applications
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/MyBudget.html_files
+%%PORTDOCS%%@dirrm %%DOCSDIR%%