- Update to 0.924

5 files changed, 188 insertions, 48 deletions

diff --git a/graphics/nathive/Makefile b/graphics/nathive/Makefile
index 717199163702..0055cc42fe6c 100644
--- a/graphics/nathive/Makefile
+++ b/graphics/nathive/Makefile
@@ -2,28 +2,37 @@
 # $FreeBSD$
 
 PORTNAME=	nathive
-PORTVERSION=	0.813
-PORTREVISION=	5
+PORTVERSION=	0.924
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.nathive.org/packages/ \
+MASTER_SITES=	http://www.nathive.org/dl/ \
 		http://mirror.amdmi3.ru/distfiles/
-DISTNAME=	${PORTNAME}_${PORTVERSION}_source
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Lightweight image editor
 
-USES=		pkgconfig
-USE_GNOME=	glib20 gtk20
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
+
+USES=		gmake
+USE_PYTHON=	yes
+MAKEFILE=	makefile
 ALL_TARGET=	default
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-patch:
-	@${REINPLACE_CMD} -e '/define.*PATH/ s|".*"|"${DATADIR}/"|' \
-		${WRKSRC}/main.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nathive ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && \
-		${COPYTREE_SHARE} "cfg img lang palettes text" ${DATADIR}
+	@${REINPLACE_CMD} -e '/BASE =/ s|=.*|= ${PREFIX}/|; \
+		s|cp -r \([^ ]*\)/|cp -R \1|' ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's|/usr/share/nathive|${DATADIR}|' \
+		${WRKSRC}/${PORTNAME}.desktop
+.if ! ${PORT_OPTIONS:MDOCS}
+	@${REINPLACE_CMD} -e '/install.*DOC/ d' ${WRKSRC}/${MAKEFILE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/nathive/distinfo b/graphics/nathive/distinfo
index 9209f8947f33..858800975d53 100644
--- a/graphics/nathive/distinfo
+++ b/graphics/nathive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nathive_0.813_source.tar.gz) = 80281689d87e8fe03361bc6d3ed8ebfd3e6ececa20d1aaead5c832a8d15d2547
-SIZE (nathive_0.813_source.tar.gz) = 70182
+SHA256 (nathive-0.924.tgz) = a8d5d209c34c5f3ee247d7b33610f0af4b9baa9ac6ddfdbccb9a098cf23e8c4b
+SIZE (nathive-0.924.tgz) = 126886
diff --git a/graphics/nathive/files/patch-Makefile b/graphics/nathive/files/patch-Makefile
deleted file mode 100644
index ad81b2b5cab8..000000000000
--- a/graphics/nathive/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2009-01-07 07:19:36.000000000 +0300
-+++ Makefile	2009-01-19 12:16:19.000000000 +0300
-@@ -1,7 +1,6 @@
- #!/bin/bash
- 
--CC = gcc
--CFLAGS = `pkg-config --cflags --libs gtk+-2.0`
-+CFLAGS += `pkg-config --cflags --libs gtk+-2.0`
- 
- default: compile
- 
diff --git a/graphics/nathive/files/patch-makefile b/graphics/nathive/files/patch-makefile
new file mode 100644
index 000000000000..8a4727a1151b
--- /dev/null
+++ b/graphics/nathive/files/patch-makefile
@@ -0,0 +1,23 @@
+--- makefile.orig	2010-10-12 23:16:42.000000000 +0400
++++ makefile	2013-08-30 20:24:54.366229703 +0400
+@@ -84,10 +84,7 @@
+ 	@rm -rf doc/build/html/_sources
+ 
+ root:
+-ifneq ($(shell whoami), root)
+-	@echo "\n**** ERROR: You must be root\n"
+-	@exit 1
+-endif
++	true
+ 
+ 
+ dirs:
+@@ -113,7 +110,7 @@
+ 	# Exclude source files.
+ 	find $(BASE)$(APP) -name "*.c" -delete
+ 	# Binary and launcher.
+-	install -m 755 -T nathive.sh      $(BASE)$(BIN)/nathive
++	install -m 755    nathive.sh      $(BASE)$(BIN)/nathive
+ 	install -m 644    nathive.desktop $(BASE)$(LAUNCH)
+ 	# Documentation.
+ 	install -m 644 AUTHORS $(BASE)$(DOC)
diff --git a/graphics/nathive/pkg-plist b/graphics/nathive/pkg-plist
index 633d48d46600..5235a40cfc9c 100644
--- a/graphics/nathive/pkg-plist
+++ b/graphics/nathive/pkg-plist
@@ -1,31 +1,150 @@
 bin/nathive
-%%DATADIR%%/cfg/cfg.xml
+share/applications/nathive.desktop
+%%DATADIR%%/AUTHORS
+%%DATADIR%%/COPYING
+%%DATADIR%%/COPYING-BRIEF
+%%DATADIR%%/META
+%%DATADIR%%/cfg/default.cfg
+%%DATADIR%%/cfg/presets/new/Cover (CD).cfg
+%%DATADIR%%/cfg/presets/new/Cover (DVD slim).cfg
+%%DATADIR%%/cfg/presets/new/Cover (DVD).cfg
+%%DATADIR%%/cfg/presets/new/DIN A3.cfg
+%%DATADIR%%/cfg/presets/new/DIN A4.cfg
+%%DATADIR%%/cfg/presets/new/DIN A5.cfg
 %%DATADIR%%/img/about.png
-%%DATADIR%%/img/brush.png
 %%DATADIR%%/img/circle.png
+%%DATADIR%%/img/hud-ok.png
+%%DATADIR%%/img/hud-rotate.png
+%%DATADIR%%/img/hud-scale.png
 %%DATADIR%%/img/icon.png
 %%DATADIR%%/img/mask.png
-%%DATADIR%%/img/picker.png
-%%DATADIR%%/img/select.png
+%%DATADIR%%/img/pattern.png
 %%DATADIR%%/img/square.png
-%%DATADIR%%/img/visual.png
-%%DATADIR%%/img/visual_rotate.png
-%%DATADIR%%/img/visual_scale.png
-%%DATADIR%%/lang/chinese.xml
-%%DATADIR%%/lang/english.xml
-%%DATADIR%%/lang/french.xml
-%%DATADIR%%/lang/german.xml
-%%DATADIR%%/lang/hungarian.xml
-%%DATADIR%%/lang/polish.xml
-%%DATADIR%%/lang/spanish.xml
-%%DATADIR%%/lang/swedish.xml
-%%DATADIR%%/palettes/01.xml
-%%DATADIR%%/palettes/02.xml
-%%DATADIR%%/text/credits
-%%DATADIR%%/text/license
-@dirrm %%DATADIR%%/text
+%%DATADIR%%/img/tool-brush.png
+%%DATADIR%%/img/tool-crop.png
+%%DATADIR%%/img/tool-eraser.png
+%%DATADIR%%/img/tool-picker.png
+%%DATADIR%%/img/tool-select.png
+%%DATADIR%%/nathive.py
+%%DATADIR%%/nathive/__init__.py
+%%DATADIR%%/nathive/gui/__init__.py
+%%DATADIR%%/nathive/gui/canvas.py
+%%DATADIR%%/nathive/gui/colorbar.py
+%%DATADIR%%/nathive/gui/cursor.py
+%%DATADIR%%/nathive/gui/headbar.py
+%%DATADIR%%/nathive/gui/hud.py
+%%DATADIR%%/nathive/gui/main.py
+%%DATADIR%%/nathive/gui/menubar.py
+%%DATADIR%%/nathive/gui/multiwidget/__init__.py
+%%DATADIR%%/nathive/gui/multiwidget/buttons.py
+%%DATADIR%%/nathive/gui/multiwidget/clear.py
+%%DATADIR%%/nathive/gui/multiwidget/combo.py
+%%DATADIR%%/nathive/gui/multiwidget/entry.py
+%%DATADIR%%/nathive/gui/multiwidget/group.py
+%%DATADIR%%/nathive/gui/multiwidget/message.py
+%%DATADIR%%/nathive/gui/multiwidget/presets.py
+%%DATADIR%%/nathive/gui/multiwidget/spin.py
+%%DATADIR%%/nathive/gui/multiwidget/toggle.py
+%%DATADIR%%/nathive/gui/sandbox.py
+%%DATADIR%%/nathive/gui/sidebar.py
+%%DATADIR%%/nathive/gui/sidebar_color.py
+%%DATADIR%%/nathive/gui/sidebar_layers.py
+%%DATADIR%%/nathive/gui/statusbar.py
+%%DATADIR%%/nathive/gui/tabs.py
+%%DATADIR%%/nathive/gui/toolbar.py
+%%DATADIR%%/nathive/gui/utils.py
+%%DATADIR%%/nathive/lib/__init__.py
+%%DATADIR%%/nathive/lib/action/__init__.py
+%%DATADIR%%/nathive/lib/action/docresize.py
+%%DATADIR%%/nathive/lib/action/layercontent.py
+%%DATADIR%%/nathive/lib/action/layercreate.py
+%%DATADIR%%/nathive/lib/action/layermodify.py
+%%DATADIR%%/nathive/lib/action/layermove.py
+%%DATADIR%%/nathive/lib/action/layerremove.py
+%%DATADIR%%/nathive/lib/actions.py
+%%DATADIR%%/nathive/lib/buftools.cy
+%%DATADIR%%/nathive/lib/clipboard.py
+%%DATADIR%%/nathive/lib/color.py
+%%DATADIR%%/nathive/lib/config.py
+%%DATADIR%%/nathive/lib/convert.py
+%%DATADIR%%/nathive/lib/core.cy
+%%DATADIR%%/nathive/lib/document.py
+%%DATADIR%%/nathive/lib/documents.py
+%%DATADIR%%/nathive/lib/language.py
+%%DATADIR%%/nathive/lib/layer.py
+%%DATADIR%%/nathive/lib/layers.py
+%%DATADIR%%/nathive/lib/log.py
+%%DATADIR%%/nathive/lib/openraster.py
+%%DATADIR%%/nathive/lib/plugin.py
+%%DATADIR%%/nathive/lib/plugins.py
+%%DATADIR%%/nathive/lib/presets.py
+%%DATADIR%%/nathive/lib/rgbhsv.cy
+%%DATADIR%%/nathive/lib/shortcuts.py
+%%DATADIR%%/nathive/libc/__init__.py
+%%DATADIR%%/nathive/libc/brush.so
+%%DATADIR%%/nathive/libc/core.so
+%%DATADIR%%/nathive/libc/picker.so
+%%DATADIR%%/nathive/libc/select.so
+%%DATADIR%%/nathive/plugins/__init__.py
+%%DATADIR%%/nathive/plugins/about.py
+%%DATADIR%%/nathive/plugins/brush.cy
+%%DATADIR%%/nathive/plugins/brush.py
+%%DATADIR%%/nathive/plugins/clip-copy.py
+%%DATADIR%%/nathive/plugins/clip-cut.py
+%%DATADIR%%/nathive/plugins/clip-paste.py
+%%DATADIR%%/nathive/plugins/close.py
+%%DATADIR%%/nathive/plugins/console.py
+%%DATADIR%%/nathive/plugins/crop.py
+%%DATADIR%%/nathive/plugins/eraser.py
+%%DATADIR%%/nathive/plugins/home.py
+%%DATADIR%%/nathive/plugins/new.py
+%%DATADIR%%/nathive/plugins/open.py
+%%DATADIR%%/nathive/plugins/paste-file.py
+%%DATADIR%%/nathive/plugins/picker.cy
+%%DATADIR%%/nathive/plugins/picker.py
+%%DATADIR%%/nathive/plugins/preferences.py
+%%DATADIR%%/nathive/plugins/preset-manager.py
+%%DATADIR%%/nathive/plugins/quit.py
+%%DATADIR%%/nathive/plugins/redo.py
+%%DATADIR%%/nathive/plugins/save.py
+%%DATADIR%%/nathive/plugins/saveas.py
+%%DATADIR%%/nathive/plugins/select.cy
+%%DATADIR%%/nathive/plugins/select.py
+%%DATADIR%%/nathive/plugins/undo.py
+%%DATADIR%%/nathive/plugins/view-colorbar.py
+%%DATADIR%%/nathive/plugins/view-fullscreen.py
+%%DATADIR%%/nathive/plugins/view-headbar.py
+%%DATADIR%%/nathive/plugins/view-sidebar.py
+%%DATADIR%%/palettes/default.pal
+%%DATADIR%%/po/de.po
+%%DATADIR%%/po/es.po
+%%DATADIR%%/po/fr.po
+%%DATADIR%%/po/hu.po
+%%DATADIR%%/po/it.po
+%%DATADIR%%/po/pl.po
+%%DATADIR%%/po/pt.po
+%%DATADIR%%/po/pt_BR.po
+%%DATADIR%%/po/ru.po
+%%DATADIR%%/po/se.po
+%%DATADIR%%/po/zh_CN.po
+@dirrm %%DATADIR%%/po
 @dirrm %%DATADIR%%/palettes
-@dirrm %%DATADIR%%/lang
+@dirrm %%DATADIR%%/nathive/plugins
+@dirrm %%DATADIR%%/nathive/libc
+@dirrm %%DATADIR%%/nathive/lib/action
+@dirrm %%DATADIR%%/nathive/lib
+@dirrm %%DATADIR%%/nathive/gui/multiwidget
+@dirrm %%DATADIR%%/nathive/gui
+@dirrm %%DATADIR%%/nathive
 @dirrm %%DATADIR%%/img
+@dirrm %%DATADIR%%/cfg/presets/select
+@dirrm %%DATADIR%%/cfg/presets/picker
+@dirrm %%DATADIR%%/cfg/presets/new
+@dirrm %%DATADIR%%/cfg/presets/eraser
+@dirrm %%DATADIR%%/cfg/presets/crop
+@dirrm %%DATADIR%%/cfg/presets/brush
+@dirrm %%DATADIR%%/cfg/presets
+@dirrm %%DATADIR%%/cfg/console
 @dirrm %%DATADIR%%/cfg
 @dirrm %%DATADIR%%
+@dirrmtry share/applications