- Update to 0.9.0

4 files changed, 69 insertions, 9 deletions

diff --git a/graphics/tiled/Makefile b/graphics/tiled/Makefile
index 9ace4a926223..a04620461705 100644
--- a/graphics/tiled/Makefile
+++ b/graphics/tiled/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	tiled
-# Date created:		03 May 2011
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	tiled
-PORTVERSION=	0.8.1
+PORTVERSION=	0.9.0
 CATEGORIES=	graphics editors games
 MASTER_SITES=	SF/tiled/tiled-qt/${PORTVERSION}
 DISTNAME=	tiled-qt-${PORTVERSION}
@@ -19,6 +15,8 @@ USE_QT4=	corelib gui opengl \
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
+MAN1=		tiled.1 tmxrasterizer.1 tmxviewer.1
+
 PORTDOCS=	*
 
 post-patch:
@@ -26,12 +24,16 @@ post-patch:
 		${WRKSRC}/translations/translations.pro
 	@${REINPLACE_CMD} -e 's|.*\(QT += opengl\)|\1|' \
 		${WRKSRC}/src/tiled/tiled.pro
+	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/docs/tiled.desktop
+	@${FIND} ${WRKSRC} -name "*.pro" -exec ${REINPLACE_CMD} -e 's|share/man|man|' {} \;
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} ${QMAKEFLAGS} PREFIX="${PREFIX}" tiled.pro
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${DOCSDIR}/
diff --git a/graphics/tiled/distinfo b/graphics/tiled/distinfo
index f2901f877902..df673c246fb5 100644
--- a/graphics/tiled/distinfo
+++ b/graphics/tiled/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.8.1.tar.gz) = e5be7c38ceb24fbe0043648e8bc639804f3df5a60beb313eb039b2bcd56ad76c
-SIZE (tiled-qt-0.8.1.tar.gz) = 822180
+SHA256 (tiled-qt-0.9.0.tar.gz) = ffc8831be72eede7a2fca64909560124452370457214d811d6c7030e057a1a33
+SIZE (tiled-qt-0.9.0.tar.gz) = 1432489
diff --git a/graphics/tiled/files/patch-lib-conflicts b/graphics/tiled/files/patch-lib-conflicts
new file mode 100644
index 000000000000..c893df9c10de
--- /dev/null
+++ b/graphics/tiled/files/patch-lib-conflicts
@@ -0,0 +1,52 @@
+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 7662707623b5..9545585ebe10 100644
--- a/graphics/tiled/pkg-plist
+++ b/graphics/tiled/pkg-plist
@@ -1,4 +1,5 @@
 bin/tiled
+bin/tmxrasterizer
 bin/tmxviewer
 lib/libtiled.so
 lib/libtiled.so.1
@@ -8,8 +9,11 @@ lib/tiled/plugins/libdroidcraft.so
 lib/tiled/plugins/libflare.so
 lib/tiled/plugins/libjson.so
 lib/tiled/plugins/liblua.so
+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
 %%DATADIR%%/translations/tiled_cs.qm
 %%DATADIR%%/translations/tiled_de.qm
 %%DATADIR%%/translations/tiled_en.qm
@@ -25,6 +29,8 @@ lib/tiled/plugins/libtmw.so
 %%DATADIR%%/translations/tiled_ru.qm
 %%DATADIR%%/translations/tiled_zh.qm
 @dirrm %%DATADIR%%/translations
+@dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrm lib/tiled/plugins
 @dirrm lib/tiled