- Update to 0.9.1

4 files changed, 20 insertions, 60 deletions

diff --git a/graphics/tiled/Makefile b/graphics/tiled/Makefile
index 301fba75552a..f8653b7409dc 100644
--- a/graphics/tiled/Makefile
+++ b/graphics/tiled/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tiled
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.1
 CATEGORIES=	graphics editors games
 MASTER_SITES=	SF/tiled/tiled-qt/${PORTVERSION}
 DISTNAME=	tiled-qt-${PORTVERSION}
@@ -14,10 +14,14 @@ USE_QT4=	corelib gui opengl \
 		linguist_build qmake_build moc_build uic_build rcc_build
 USE_LDCONFIG=	yes
 
-MAN1=		tiled.1 tmxrasterizer.1 tmxviewer.1
+MAN1=		automappingconverter.1 tiled.1 tmxrasterizer.1 tmxviewer.1
 
 PORTDOCS=	*
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|lrelease|&-qt4|' \
 		${WRKSRC}/translations/translations.pro
@@ -30,8 +34,6 @@ do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} ${QMAKEFLAGS} PREFIX="${PREFIX}" tiled.pro
 
-.include <bsd.port.options.mk>
-
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${DOCSDIR}
diff --git a/graphics/tiled/distinfo b/graphics/tiled/distinfo
index df673c246fb5..682fa78fe069 100644
--- a/graphics/tiled/distinfo
+++ b/graphics/tiled/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.0.tar.gz) = ffc8831be72eede7a2fca64909560124452370457214d811d6c7030e057a1a33
-SIZE (tiled-qt-0.9.0.tar.gz) = 1432489
+SHA256 (tiled-qt-0.9.1.tar.gz) = 6868f8333b8c66835301792051a76e7fc68467619b6e97a85b587f537c36b527
+SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
diff --git a/graphics/tiled/files/patch-lib-conflicts b/graphics/tiled/files/patch-lib-conflicts
deleted file mode 100644
index c893df9c10de..000000000000
--- a/graphics/tiled/files/patch-lib-conflicts
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git src/automappingconverter/automappingconverter.pro src/automappingconverter/automappingconverter.pro
-index c469b60..0535caa 100644
---- src/automappingconverter/automappingconverter.pro
-+++ src/automappingconverter/automappingconverter.pro
-@@ -12,7 +12,7 @@ macx {
- } else:win32 {
-     LIBS += -L$$OUT_PWD/../../lib
- } else {
--    QMAKE_LIBDIR += $$OUT_PWD/../../lib
-+    QMAKE_LIBDIR = $$OUT_PWD/../../lib $$QMAKE_LIBDIR
- }
- 
- # Make sure the executable can find libtiled
-diff --git src/tiled/tiled.pro src/tiled/tiled.pro
-index 878cce9..3bdd600 100644
---- src/tiled/tiled.pro
-+++ src/tiled/tiled.pro
-@@ -25,7 +25,7 @@ macx {
- } else:win32 {
-     LIBS += -L$$OUT_PWD/../../lib
- } else {
--    QMAKE_LIBDIR += $$OUT_PWD/../../lib
-+    QMAKE_LIBDIR = $$OUT_PWD/../../lib $$QMAKE_LIBDIR
- }
- 
- # Make sure the Tiled executable can find libtiled
-diff --git src/tmxrasterizer/tmxrasterizer.pro src/tmxrasterizer/tmxrasterizer.pro
-index 4d4e801..cc6a993 100644
---- src/tmxrasterizer/tmxrasterizer.pro
-+++ src/tmxrasterizer/tmxrasterizer.pro
-@@ -22,7 +22,7 @@ macx {
- } else:win32 {
-     LIBS += -L$$OUT_PWD/../../lib
- } else {
--    QMAKE_LIBDIR += $$OUT_PWD/../../lib
-+    QMAKE_LIBDIR = $$OUT_PWD/../../lib $$QMAKE_LIBDIR
- }
- 
- # Make sure the executable can find libtiled
-diff --git src/tmxviewer/tmxviewer.pro src/tmxviewer/tmxviewer.pro
-index 2aea63a..c67a0f1 100644
---- src/tmxviewer/tmxviewer.pro
-+++ src/tmxviewer/tmxviewer.pro
-@@ -22,7 +22,7 @@ macx {
- } else:win32 {
-     LIBS += -L$$OUT_PWD/../../lib
- } else {
--    QMAKE_LIBDIR += $$OUT_PWD/../../lib
-+    QMAKE_LIBDIR = $$OUT_PWD/../../lib $$QMAKE_LIBDIR
- }
- 
- # Make sure the executable can find libtiled
diff --git a/graphics/tiled/pkg-plist b/graphics/tiled/pkg-plist
index 9545585ebe10..bffd2102c27c 100644
--- a/graphics/tiled/pkg-plist
+++ b/graphics/tiled/pkg-plist
@@ -1,3 +1,4 @@
+bin/automappingconverter
 bin/tiled
 bin/tmxrasterizer
 bin/tmxviewer
@@ -13,7 +14,9 @@ lib/tiled/plugins/libreplicaisland.so
 lib/tiled/plugins/libtengine.so
 lib/tiled/plugins/libtmw.so
 share/applications/tiled.desktop
-%%DATADIR%%/images/tiled-icon-32.png
+share/icons/hicolor/16x16/apps/tiled.png
+share/icons/hicolor/32x32/apps/tiled.png
+share/icons/hicolor/scalable/apps/tiled.svg
 %%DATADIR%%/translations/tiled_cs.qm
 %%DATADIR%%/translations/tiled_de.qm
 %%DATADIR%%/translations/tiled_en.qm
@@ -29,8 +32,15 @@ share/applications/tiled.desktop
 %%DATADIR%%/translations/tiled_ru.qm
 %%DATADIR%%/translations/tiled_zh.qm
 @dirrm %%DATADIR%%/translations
-@dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrmtry share/applications
 @dirrm lib/tiled/plugins
 @dirrm lib/tiled