Re: UPDATE: editors/tiled

2020-02-21 Thread Jeremie Courreges-Anglas 
On Fri, Feb 21 2020, Rafael Sadowski  wrote:
> On Fri Feb 21, 2020 at 06:17:20PM +0100, Jeremie Courreges-Anglas wrote:
>> On Fri, Feb 21 2020, Rafael Sadowski  wrote:
>> > Update tiled to 1.3.1 (Qt4 to Qt5).
>> >
>> > Notable changes:
>> >
>> > - Move to GH_*
>> > - s/http/https/
>> > - Tests are no longer build. I didn't get a good look at it. tiled works
>> >   fine for me in a simple run-time test.
>> > - Set MODPY_DEFAULT_VERSION_3
>> >
>> > OK?
>> 
>> I only played with tiles and tiled for a uni course (!) years ago, but
>> figured I'd give this a try anyway.  Runtime looks good after I install
>> qtdeclarative, because of a missing dep on libQt5Qml.so.
>> 
>> --8<--
>> ritchie ~$ tiled
>> ld.so: tiled: can't load library 'libQt5Qml.so.2.2'
>> Killed
>> -->8--
>> 
>> --8<--
>> russell /usr/ports/editors/tiled$ make port-lib-depends-check
>> 
>> tiled-1.3.1(editors/tiled):
>> Missing lib: Qt5Qml.2 (/usr/local/bin/tiled) (NOT REACHABLE)
>> *** Error 1 in target 'port-lib-depends-check' (ignored)
>> -->8--
>> 
>> This needs adjusting, portcheck also says:
>> 
>>   missing RDEP on misc/shared-mime-info
>> 
>> and...
>> 
>
> Thanks for the input here is a new diff which converts all your points.
> I also reorder the DPB_PROPERTIES and indented GH;
>
> OK to nuke the creepy Qt4 stuff?

Should qtquickcontrols be added to BUILD_DEPENDS as well?  Other ports
using that in RUN_DEPENDS also seem to add it to BUILD_DEPENDS (though
not all of them).

If it's not needed, ok jca@

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: UPDATE: editors/tiled

2020-02-21 Thread Rafael Sadowski 
On Fri Feb 21, 2020 at 06:17:20PM +0100, Jeremie Courreges-Anglas wrote:
> On Fri, Feb 21 2020, Rafael Sadowski  wrote:
> > Update tiled to 1.3.1 (Qt4 to Qt5).
> >
> > Notable changes:
> >
> > - Move to GH_*
> > - s/http/https/
> > - Tests are no longer build. I didn't get a good look at it. tiled works
> >   fine for me in a simple run-time test.
> > - Set MODPY_DEFAULT_VERSION_3
> >
> > OK?
> 
> I only played with tiles and tiled for a uni course (!) years ago, but
> figured I'd give this a try anyway.  Runtime looks good after I install
> qtdeclarative, because of a missing dep on libQt5Qml.so.
> 
> --8<--
> ritchie ~$ tiled
> ld.so: tiled: can't load library 'libQt5Qml.so.2.2'
> Killed
> -->8--
> 
> --8<--
> russell /usr/ports/editors/tiled$ make port-lib-depends-check
> 
> tiled-1.3.1(editors/tiled):
> Missing lib: Qt5Qml.2 (/usr/local/bin/tiled) (NOT REACHABLE)
> *** Error 1 in target 'port-lib-depends-check' (ignored)
> -->8--
> 
> This needs adjusting, portcheck also says:
> 
>   missing RDEP on misc/shared-mime-info
> 
> and...
> 

Thanks for the input here is a new diff which converts all your points.
I also reorder the DPB_PROPERTIES and indented GH;

OK to nuke the creepy Qt4 stuff?

RS

Index: Makefile
===
RCS file: /cvs/ports/editors/tiled/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:46:06 -  1.15
+++ Makefile21 Feb 2020 19:13:44 -
@@ -1,37 +1,39 @@
 # $OpenBSD: Makefile,v 1.15 2019/07/12 20:46:06 sthen Exp $
 
+# XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
+DPB_PROPERTIES =   nojunk
+
 COMMENT =  tile map editor
 
-V =0.9.1
-DISTNAME = tiled-qt-${V}
-PKGNAME =  tiled-${V}
-REVISION = 6
+GH_ACCOUNT =   bjorn
+GH_PROJECT =   tiled
+GH_TAGNAME =   v1.3.1
 
-SHARED_LIBS += tiled 0.0 # 1.0
+SHARED_LIBS += tiled 1.0 # 1.0
 
 CATEGORIES =   editors games
 
-HOMEPAGE = http://www.mapeditor.org/
+HOMEPAGE = https://www.mapeditor.org/
 
 # GPLv2+
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
-WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Qml
+WANTLIB += Qt5Widgets c m ${MODPY_WANTLIB} z
 
-COMPILER = base-clang ports-gcc base-gcc
+MODULES =  devel/qmake \
+   lang/python \
+   x11/qt5
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/}
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
-RUN_DEPENDS =  devel/desktop-file-utils \
-   x11/gtk+3,-guic
-MODULES =  devel/qmake x11/qt4
+LIB_DEPENDS =  x11/qt5/qtdeclarative
 
-# XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
-DPB_PROPERTIES =   nojunk
+RUN_DEPENDS =  devel/desktop-file-utils \
+   misc/shared-mime-info \
+   x11/gtk+3,-guic \
+   x11/qt5/qtquickcontrols
 
-do-test:
-   cd ${WRKSRC}/tests/staggeredrenderer && ./staggeredrenderer && \
-   cd ${WRKSRC}/tests/mapreader && ./mapreader
+NO_TEST=   Yes
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/editors/tiled/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo28 Apr 2014 09:48:54 -  1.2
+++ distinfo21 Feb 2020 19:13:44 -
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
-SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
+SHA256 (tiled-1.3.1.tar.gz) = s3Mh41vdt7yW+QaO3AYmiz8OuGMv5iBq7ilsjWw7pyI=
+SIZE (tiled-1.3.1.tar.gz) = 15728903
Index: patches/patch-src_automappingconverter_automappingconverter_pro
===
RCS file: patches/patch-src_automappingconverter_automappingconverter_pro
diff -N patches/patch-src_automappingconverter_automappingconverter_pro
--- patches/patch-src_automappingconverter_automappingconverter_pro 28 Apr 
2014 09:48:54 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_automappingconverter_automappingconverter_pro,v 1.1 
2014/04/28 09:48:54 bentley Exp $
 src/automappingconverter/automappingconverter.pro.orig Mon Apr 28 
02:32:11 2014
-+++ src/automappingconverter/automappingconverter.pro  Mon Apr 28 02:32:17 2014
-@@ -48,7 +48,7 @@ HEADERS  += \
- FORMS+= \
- converterwindow.ui
- 
--manpage.path = $${PREFIX}/share/man/man1/
-+manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/automappingconverter.1
- INSTALLS += manpage
- 
Index: patches/patch-src_tiled_tiled_pro

Re: UPDATE: editors/tiled

2020-02-21 Thread Jeremie Courreges-Anglas 
On Fri, Feb 21 2020, Rafael Sadowski  wrote:
> Update tiled to 1.3.1 (Qt4 to Qt5).
>
> Notable changes:
>
> - Move to GH_*
> - s/http/https/
> - Tests are no longer build. I didn't get a good look at it. tiled works
>   fine for me in a simple run-time test.
> - Set MODPY_DEFAULT_VERSION_3
>
> OK?

I only played with tiles and tiled for a uni course (!) years ago, but
figured I'd give this a try anyway.  Runtime looks good after I install
qtdeclarative, because of a missing dep on libQt5Qml.so.

--8<--
ritchie ~$ tiled
ld.so: tiled: can't load library 'libQt5Qml.so.2.2'
Killed
-->8--

--8<--
russell /usr/ports/editors/tiled$ make port-lib-depends-check

tiled-1.3.1(editors/tiled):
Missing lib: Qt5Qml.2 (/usr/local/bin/tiled) (NOT REACHABLE)
*** Error 1 in target 'port-lib-depends-check' (ignored)
-->8--

This needs adjusting, portcheck also says:

  missing RDEP on misc/shared-mime-info

and...

> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/tiled/Makefile,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 Makefile
> --- Makefile  12 Jul 2019 20:46:06 -  1.15
> +++ Makefile  21 Feb 2020 07:10:16 -
> @@ -2,36 +2,32 @@
>  
>  COMMENT =tile map editor
>  
> -V =  0.9.1
> -DISTNAME =   tiled-qt-${V}
> -PKGNAME =tiled-${V}
> -REVISION =   6
> +GH_ACCOUNT = bjorn
> +GH_PROJECT = tiled
> +GH_TAGNAME = v1.3.1
>  
> -SHARED_LIBS +=   tiled 0.0 # 1.0
> +SHARED_LIBS +=   tiled 1.0 # 1.0
>  
>  CATEGORIES = editors games
>  
> -HOMEPAGE =   http://www.mapeditor.org/
> +HOMEPAGE =   https://www.mapeditor.org/
>  
>  # GPLv2+
>  PERMIT_PACKAGE = Yes
>  
> -WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
> -WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
> +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Widgets
> +WANTLIB += c m ${MODPY_WANTLIB} z
>  
> -COMPILER =   base-clang ports-gcc base-gcc
> +MODULES =devel/qmake \
> + lang/python \
> + x11/qt5
>  
> -MASTER_SITES =   ${MASTER_SITE_SOURCEFORGE:=tiled/}
> +MODPY_VERSION =  ${MODPY_DEFAULT_VERSION_3}
>  
>  RUN_DEPENDS =devel/desktop-file-utils \
>   x11/gtk+3,-guic
> -MODULES =devel/qmake x11/qt4
>  
>  # XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
>  DPB_PROPERTIES = nojunk
> -
> -do-test:
> - cd ${WRKSRC}/tests/staggeredrenderer && ./staggeredrenderer && \
> - cd ${WRKSRC}/tests/mapreader && ./mapreader

... make test now spews:

  ===>  Regression tests for tiled-1.3.1
  make: don't know how to make test
  Stop in /usr/ports/pobj/tiled-1.3.1/tiled-1.3.1/build-amd64

So this needs an updated test target or NO_TEST=Yes.

>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/editors/tiled/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- distinfo  28 Apr 2014 09:48:54 -  1.2
> +++ distinfo  21 Feb 2020 07:10:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
> -SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
> +SHA256 (tiled-1.3.1.tar.gz) = s3Mh41vdt7yW+QaO3AYmiz8OuGMv5iBq7ilsjWw7pyI=
> +SIZE (tiled-1.3.1.tar.gz) = 15728903
> Index: patches/patch-src_automappingconverter_automappingconverter_pro
> ===
> RCS file: patches/patch-src_automappingconverter_automappingconverter_pro
> diff -N patches/patch-src_automappingconverter_automappingconverter_pro
> --- patches/patch-src_automappingconverter_automappingconverter_pro   28 Apr 
> 2014 09:48:54 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-src_automappingconverter_automappingconverter_pro,v 1.1 
> 2014/04/28 09:48:54 bentley Exp $
>  src/automappingconverter/automappingconverter.pro.orig   Mon Apr 28 
> 02:32:11 2014
> -+++ src/automappingconverter/automappingconverter.proMon Apr 28 
> 02:32:17 2014
> -@@ -48,7 +48,7 @@ HEADERS  += \
> - FORMS+= \
> - converterwindow.ui
> - 
> --manpage.path = $${PREFIX}/share/man/man1/
> -+manpage.path = $${PREFIX}/man/man1/
> - manpage.files += ../../docs/automappingconverter.1
> - INSTALLS += manpage
> - 
> Index: patches/patch-src_tiled_tiled_pro
> ===
> RCS file: /cvs/ports/editors/tiled/patches/patch-src_tiled_tiled_pro,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-src_tiled_tiled_pro
> --- patches/patch-src_tiled_tiled_pro 28 Apr 2014 09:48:54 -  1.2
> +++ patches/patch-src_tiled_tiled_pro 21 Feb 2020 07:10:16 -
> @@ -1,12 +1,13 @@
>  $OpenBSD:

UPDATE: editors/tiled

2020-02-20 Thread Rafael Sadowski 
Update tiled to 1.3.1 (Qt4 to Qt5).

Notable changes:

- Move to GH_*
- s/http/https/
- Tests are no longer build. I didn't get a good look at it. tiled works
  fine for me in a simple run-time test.
- Set MODPY_DEFAULT_VERSION_3

OK?

Index: Makefile
===
RCS file: /cvs/ports/editors/tiled/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:46:06 -  1.15
+++ Makefile21 Feb 2020 07:10:16 -
@@ -2,36 +2,32 @@
 
 COMMENT =  tile map editor
 
-V =0.9.1
-DISTNAME = tiled-qt-${V}
-PKGNAME =  tiled-${V}
-REVISION = 6
+GH_ACCOUNT =   bjorn
+GH_PROJECT =   tiled
+GH_TAGNAME =   v1.3.1
 
-SHARED_LIBS += tiled 0.0 # 1.0
+SHARED_LIBS += tiled 1.0 # 1.0
 
 CATEGORIES =   editors games
 
-HOMEPAGE = http://www.mapeditor.org/
+HOMEPAGE = https://www.mapeditor.org/
 
 # GPLv2+
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
-WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Widgets
+WANTLIB += c m ${MODPY_WANTLIB} z
 
-COMPILER = base-clang ports-gcc base-gcc
+MODULES =  devel/qmake \
+   lang/python \
+   x11/qt5
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/}
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
-MODULES =  devel/qmake x11/qt4
 
 # XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
 DPB_PROPERTIES =   nojunk
-
-do-test:
-   cd ${WRKSRC}/tests/staggeredrenderer && ./staggeredrenderer && \
-   cd ${WRKSRC}/tests/mapreader && ./mapreader
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/editors/tiled/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo28 Apr 2014 09:48:54 -  1.2
+++ distinfo21 Feb 2020 07:10:16 -
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
-SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
+SHA256 (tiled-1.3.1.tar.gz) = s3Mh41vdt7yW+QaO3AYmiz8OuGMv5iBq7ilsjWw7pyI=
+SIZE (tiled-1.3.1.tar.gz) = 15728903
Index: patches/patch-src_automappingconverter_automappingconverter_pro
===
RCS file: patches/patch-src_automappingconverter_automappingconverter_pro
diff -N patches/patch-src_automappingconverter_automappingconverter_pro
--- patches/patch-src_automappingconverter_automappingconverter_pro 28 Apr 
2014 09:48:54 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_automappingconverter_automappingconverter_pro,v 1.1 
2014/04/28 09:48:54 bentley Exp $
 src/automappingconverter/automappingconverter.pro.orig Mon Apr 28 
02:32:11 2014
-+++ src/automappingconverter/automappingconverter.pro  Mon Apr 28 02:32:17 2014
-@@ -48,7 +48,7 @@ HEADERS  += \
- FORMS+= \
- converterwindow.ui
- 
--manpage.path = $${PREFIX}/share/man/man1/
-+manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/automappingconverter.1
- INSTALLS += manpage
- 
Index: patches/patch-src_tiled_tiled_pro
===
RCS file: /cvs/ports/editors/tiled/patches/patch-src_tiled_tiled_pro,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_tiled_tiled_pro
--- patches/patch-src_tiled_tiled_pro   28 Apr 2014 09:48:54 -  1.2
+++ patches/patch-src_tiled_tiled_pro   21 Feb 2020 07:10:16 -
@@ -1,12 +1,13 @@
 $OpenBSD: patch-src_tiled_tiled_pro,v 1.2 2014/04/28 09:48:54 bentley Exp $
 src/tiled/tiled.pro.orig   Sat Jul 27 14:34:23 2013
-+++ src/tiled/tiled.proMon Apr 28 01:48:23 2014
-@@ -286,7 +286,7 @@ desktopfile.path = $${PREFIX}/share/applications/
- desktopfile.files += ../../docs/tiled.desktop
- INSTALLS += desktopfile
+Index: src/tiled/tiled.pro
+--- src/tiled/tiled.pro.orig
 src/tiled/tiled.pro
+@@ -552,7 +552,7 @@ appdatafile.path = $${PREFIX}/share/metainfo/
+ appdatafile.files += ../../org.mapeditor.Tiled.appdata.xml
+ INSTALLS += appdatafile
  
 -manpage.path = $${PREFIX}/share/man/man1/
 +manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/tiled.1
+ manpage.files += ../../man/tiled.1
  INSTALLS += manpage
  
Index: patches/patch-src_tmxrasterizer_tmxrasterizer_pro
===
RCS file: 
/cvs/ports/editors/tiled/patches/patch-src_tmxrasterizer_tmxrasterizer_pro,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_tmxrasterizer_tmxrasterizer_pro
---

Re: [Update] editors/tiled 1.2.1

2018-12-29 Thread Max Fillinger 
Fixed some comments sent off-list by Rafael Sadowski.  (Thanks for
pointing me to /usr/src/lib/check_sym!)

* Major version bump for shared library libtiled.  (No change to the
  comment because the version wasn't bumped by tiled itself.)
* Homepage uses https now.
* "COMPILER = ..." is unnecessary with the QT5 module.


Index: editors/tiled/Makefile
===
RCS file: /cvs/ports/editors/tiled/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- editors/tiled/Makefile  24 Oct 2018 14:28:01 -  1.14
+++ editors/tiled/Makefile  29 Dec 2018 22:59:08 -
@@ -2,30 +2,26 @@
 
 COMMENT =  tile map editor
 
-V =0.9.1
-DISTNAME = tiled-qt-${V}
-PKGNAME =  tiled-${V}
-REVISION = 6
+V =1.2.1
+GH_ACCOUNT =   bjorn
+GH_PROJECT =   tiled
+GH_TAGNAME =   v${V}
 
-SHARED_LIBS += tiled 0.0 # 1.0
+SHARED_LIBS += tiled 1.0 # 1.0
 
 CATEGORIES =   editors games
 
-HOMEPAGE = http://www.mapeditor.org/
+HOMEPAGE = https://www.mapeditor.org/
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
+WANTLIB += GL ICE Qt5Gui Qt5OpenGL SM X11 Xext Xi Xinerama Xrender
 WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
 
-COMPILER = base-clang ports-gcc base-gcc
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/}
-
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
-MODULES =  devel/qmake x11/qt4
+MODULES =  devel/qmake x11/qt5
 
 # XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
 DPB_PROPERTIES =   nojunk
Index: editors/tiled/distinfo
===
RCS file: /cvs/ports/editors/tiled/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- editors/tiled/distinfo  28 Apr 2014 09:48:54 -  1.2
+++ editors/tiled/distinfo  29 Dec 2018 22:59:08 -
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
-SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
+SHA256 (tiled-1.2.1.tar.gz) = MpLBHC29reK/TVRyNEGIKnfhI7deel+K3D9BUI+fJug=
+SIZE (tiled-1.2.1.tar.gz) = 16773680
Index: 
editors/tiled/patches/patch-src_automappingconverter_automappingconverter_pro
===
RCS file: 
/cvs/ports/editors/tiled/patches/patch-src_automappingconverter_automappingconverter_pro,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_automappingconverter_automappingconverter_pro
--- 
editors/tiled/patches/patch-src_automappingconverter_automappingconverter_pro   
28 Apr 2014 09:48:54 -  1.1
+++ 
editors/tiled/patches/patch-src_automappingconverter_automappingconverter_pro   
29 Dec 2018 22:59:08 -
@@ -1,12 +1,11 @@
-$OpenBSD: patch-src_automappingconverter_automappingconverter_pro,v 1.1 
2014/04/28 09:48:54 bentley Exp $
 src/automappingconverter/automappingconverter.pro.orig Mon Apr 28 
02:32:11 2014
-+++ src/automappingconverter/automappingconverter.pro  Mon Apr 28 02:32:17 2014
-@@ -48,7 +48,7 @@ HEADERS  += \
+--- src/automappingconverter/automappingconverter.pro.orig Mon Nov 26 
23:01:27 2018
 src/automappingconverter/automappingconverter.pro  Mon Nov 26 23:01:56 2018
+@@ -46,7 +46,7 @@ HEADERS  += \
  FORMS+= \
  converterwindow.ui
  
 -manpage.path = $${PREFIX}/share/man/man1/
 +manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/automappingconverter.1
+ manpage.files += ../../man/automappingconverter.1
  INSTALLS += manpage
  
Index: editors/tiled/patches/patch-src_tiled_tiled_pro
===
RCS file: /cvs/ports/editors/tiled/patches/patch-src_tiled_tiled_pro,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_tiled_tiled_pro
--- editors/tiled/patches/patch-src_tiled_tiled_pro 28 Apr 2014 09:48:54 
-  1.2
+++ editors/tiled/patches/patch-src_tiled_tiled_pro 29 Dec 2018 22:59:08 
-
@@ -1,12 +1,11 @@
-$OpenBSD: patch-src_tiled_tiled_pro,v 1.2 2014/04/28 09:48:54 bentley Exp $
 src/tiled/tiled.pro.orig   Sat Jul 27 14:34:23 2013
-+++ src/tiled/tiled.proMon Apr 28 01:48:23 2014
-@@ -286,7 +286,7 @@ desktopfile.path = $${PREFIX}/share/applications/
- desktopfile.files += ../../docs/tiled.desktop
- INSTALLS += desktopfile
+--- src/tiled/tiled.pro.orig   Mon Nov 26 23:15:41 2018
 src/tiled/tiled.proMon Nov 26 23:16:00 2018
+@@ -524,7 +524,7 @@ appdatafile.path = $${PREFIX}/share/metainfo/
+ appdatafile.files += ../../org.mapeditor.Tiled.appdata.xml
+ INSTALLS += appdatafile
  
 -manpage.path = $${PREFIX}/share/man/man1/
 +manpage.path = $${PREFIX}/man/man1/
- manpage.files +=

[Update] editors/tiled 1.2.1

2018-12-29 Thread Max Fillinger 
Here's an update to version 1.2.1 for the map editor tiled.  The main
change for the Makefile is that the project is hosted on Github now.



Index: editors/tiled//Makefile
===
RCS file: /cvs/ports/editors/tiled/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- editors/tiled//Makefile 24 Oct 2018 14:28:01 -  1.14
+++ editors/tiled//Makefile 29 Dec 2018 16:08:25 -
@@ -2,10 +2,10 @@
 
 COMMENT =  tile map editor
 
-V =0.9.1
-DISTNAME = tiled-qt-${V}
-PKGNAME =  tiled-${V}
-REVISION = 6
+V =1.2.1
+GH_ACCOUNT =   bjorn
+GH_PROJECT =   tiled
+GH_TAGNAME =   v${V}
 
 SHARED_LIBS += tiled 0.0 # 1.0
 
@@ -16,16 +16,14 @@ HOMEPAGE =  http://www.mapeditor.org/
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
+WANTLIB += GL ICE Qt5Gui Qt5OpenGL SM X11 Xext Xi Xinerama Xrender
 WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
 
 COMPILER = base-clang ports-gcc base-gcc
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/}
-
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
-MODULES =  devel/qmake x11/qt4
+MODULES =  devel/qmake x11/qt5
 
 # XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
 DPB_PROPERTIES =   nojunk
Index: editors/tiled//distinfo
===
RCS file: /cvs/ports/editors/tiled/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- editors/tiled//distinfo 28 Apr 2014 09:48:54 -  1.2
+++ editors/tiled//distinfo 29 Dec 2018 16:08:25 -
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
-SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
+SHA256 (tiled-1.2.1.tar.gz) = MpLBHC29reK/TVRyNEGIKnfhI7deel+K3D9BUI+fJug=
+SIZE (tiled-1.2.1.tar.gz) = 16773680
Index: 
editors/tiled//patches/patch-src_automappingconverter_automappingconverter_pro
===
RCS file: 
/cvs/ports/editors/tiled/patches/patch-src_automappingconverter_automappingconverter_pro,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_automappingconverter_automappingconverter_pro
--- 
editors/tiled//patches/patch-src_automappingconverter_automappingconverter_pro  
28 Apr 2014 09:48:54 -  1.1
+++ 
editors/tiled//patches/patch-src_automappingconverter_automappingconverter_pro  
29 Dec 2018 16:08:25 -
@@ -1,12 +1,11 @@
-$OpenBSD: patch-src_automappingconverter_automappingconverter_pro,v 1.1 
2014/04/28 09:48:54 bentley Exp $
 src/automappingconverter/automappingconverter.pro.orig Mon Apr 28 
02:32:11 2014
-+++ src/automappingconverter/automappingconverter.pro  Mon Apr 28 02:32:17 2014
-@@ -48,7 +48,7 @@ HEADERS  += \
+--- src/automappingconverter/automappingconverter.pro.orig Mon Nov 26 
23:01:27 2018
 src/automappingconverter/automappingconverter.pro  Mon Nov 26 23:01:56 2018
+@@ -46,7 +46,7 @@ HEADERS  += \
  FORMS+= \
  converterwindow.ui
  
 -manpage.path = $${PREFIX}/share/man/man1/
 +manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/automappingconverter.1
+ manpage.files += ../../man/automappingconverter.1
  INSTALLS += manpage
  
Index: editors/tiled//patches/patch-src_tiled_tiled_pro
===
RCS file: /cvs/ports/editors/tiled/patches/patch-src_tiled_tiled_pro,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_tiled_tiled_pro
--- editors/tiled//patches/patch-src_tiled_tiled_pro28 Apr 2014 09:48:54 
-  1.2
+++ editors/tiled//patches/patch-src_tiled_tiled_pro29 Dec 2018 16:08:25 
-
@@ -1,12 +1,11 @@
-$OpenBSD: patch-src_tiled_tiled_pro,v 1.2 2014/04/28 09:48:54 bentley Exp $
 src/tiled/tiled.pro.orig   Sat Jul 27 14:34:23 2013
-+++ src/tiled/tiled.proMon Apr 28 01:48:23 2014
-@@ -286,7 +286,7 @@ desktopfile.path = $${PREFIX}/share/applications/
- desktopfile.files += ../../docs/tiled.desktop
- INSTALLS += desktopfile
+--- src/tiled/tiled.pro.orig   Mon Nov 26 23:15:41 2018
 src/tiled/tiled.proMon Nov 26 23:16:00 2018
+@@ -524,7 +524,7 @@ appdatafile.path = $${PREFIX}/share/metainfo/
+ appdatafile.files += ../../org.mapeditor.Tiled.appdata.xml
+ INSTALLS += appdatafile
  
 -manpage.path = $${PREFIX}/share/man/man1/
 +manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/tiled.1
+ manpage.files += ../../man/tiled.1
  INSTALLS += manpage
  
Index: editors/tiled//pkg/PLIST
===
RCS file: /cvs/ports/editors/tiled/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- editors/tiled//pkg/PLIST29 Jun 2018

UPDATE: editors/tiled

2014-10-13 Thread Anthony J. Bentley 
Hi,

Here is an update to tiled-0.10.1. Tested on i386/amd64.

Release notes at:
http://blog.mapeditor.org/2014/09/tiled-010-released.html

ok?


Index: Makefile
===
RCS file: /cvs/ports/editors/tiled/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile28 Apr 2014 09:48:54 -  1.3
+++ Makefile13 Oct 2014 12:46:11 -
@@ -2,7 +2,7 @@
 
 COMMENT =  tile map editor
 
-V =0.9.1
+V =0.10.1
 DISTNAME = tiled-qt-${V}
 PKGNAME =  tiled-${V}
 
@@ -16,13 +16,18 @@ HOMEPAGE =  http://www.mapeditor.org/
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
-WANTLIB += c fontconfig freetype m pthread stdc++ z
+WANTLIB += c fontconfig freetype m pthread stdc++ z ${MODPY_WANTLIB}
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/}
+GH_ACCOUNT =   bjorn
+GH_PROJECT =   tiled
+GH_TAGNAME =   v0.10.1
+GH_COMMIT =2f2183afa3628a4d8dd28a4391877ac40194bf7a
 
 RUN_DEPENDS =  devel/desktop-file-utils \
+   misc/shared-mime-info \
x11/gtk+2,-guic
-MODULES =  x11/qt4
+MODULES =  lang/python \
+   x11/qt4
 
 MAKE_FLAGS =   CC=${CC} \
CXX=${CXX} \
Index: distinfo
===
RCS file: /cvs/ports/editors/tiled/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo28 Apr 2014 09:48:54 -  1.2
+++ distinfo13 Oct 2014 12:46:11 -
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
-SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
+SHA256 (tiled-qt-0.10.1.tar.gz) = idmw/v58iVCn0nm7yJj3/1R4PEcfWLzKWvSKJFYujWc=
+SIZE (tiled-qt-0.10.1.tar.gz) = 2179428
Index: pkg/PFRAG.shared
===
RCS file: /cvs/ports/editors/tiled/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PFRAG.shared
--- pkg/PFRAG.shared8 Jul 2013 22:10:57 -   1.1.1.1
+++ pkg/PFRAG.shared13 Oct 2014 12:46:11 -
@@ -3,6 +3,7 @@ lib/tiled/plugins/libdroidcraft.so
 lib/tiled/plugins/libflare.so
 lib/tiled/plugins/libjson.so
 lib/tiled/plugins/liblua.so
+lib/tiled/plugins/libpython.so
 lib/tiled/plugins/libreplicaisland.so
 lib/tiled/plugins/libtengine.so
 lib/tiled/plugins/libtmw.so
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/tiled/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST   28 Apr 2014 09:48:54 -  1.2
+++ pkg/PLIST   13 Oct 2014 12:46:11 -
@@ -13,8 +13,12 @@ lib/tiled/plugins/
 @man man/man1/tmxviewer.1
 share/applications/tiled.desktop
 share/icons/hicolor/16x16/apps/tiled.png
+share/icons/hicolor/16x16/mimetypes/application-x-tiled.png
 share/icons/hicolor/32x32/apps/tiled.png
+share/icons/hicolor/32x32/mimetypes/application-x-tiled.png
 share/icons/hicolor/scalable/apps/tiled.svg
+share/icons/hicolor/scalable/mimetypes/application-x-tiled.svg
+share/mime/packages/tiled.xml
 share/tiled/
 share/tiled/translations/
 share/tiled/translations/tiled_cs.qm
@@ -31,7 +35,10 @@ share/tiled/translations/tiled_pt.qm
 share/tiled/translations/tiled_pt_BR.qm
 share/tiled/translations/tiled_ru.qm
 share/tiled/translations/tiled_zh.qm
+share/tiled/translations/tiled_zh_TW.qm
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
 @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
 @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/update-mime-database %D/share/mime
+@unexec-delete %D/bin/update-mime-database %D/share/mime

UPDATE: editors/tiled

2014-04-28 Thread Anthony J. Bentley 
Hi,

Below is an update to tiled-0.9.1.

Tested on amd64. Regression tests have been tweaked so they run from the
correct directory (this was causing a spurious failure before).

ok?


Index: Makefile
===
RCS file: /cvs/ports/editors/tiled/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile19 Jul 2013 03:31:14 -  1.2
+++ Makefile28 Apr 2014 09:22:24 -
@@ -2,7 +2,7 @@
 
 COMMENT =  tile map editor
 
-V =0.9.0
+V =0.9.1
 DISTNAME = tiled-qt-${V}
 PKGNAME =  tiled-${V}
 
@@ -20,7 +20,8 @@ WANTLIB += c fontconfig freetype m pthre
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/}
 
-RUN_DEPENDS =  devel/desktop-file-utils
+RUN_DEPENDS =  devel/desktop-file-utils \
+   x11/gtk+2,-guic
 MODULES =  x11/qt4
 
 MAKE_FLAGS =   CC=${CC} \
@@ -35,9 +36,8 @@ do-configure:
qmake4 -makefile tiled.pro -config release
 
 do-test:
-   cd ${WRKSRC}/tests  \
-   ./staggeredrenderer/staggeredrenderer  \
-   ./mapreader/mapreader
+   cd ${WRKSRC}/tests/staggeredrenderer  ./staggeredrenderer  \
+   cd ${WRKSRC}/tests/mapreader  ./mapreader
 
 # XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
 DPB_PROPERTIES =   nojunk
Index: distinfo
===
RCS file: /cvs/ports/editors/tiled/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo8 Jul 2013 22:10:57 -   1.1.1.1
+++ distinfo28 Apr 2014 09:22:24 -
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.0.tar.gz) = /8iDG+cu7eei/KZJCVYBJEUjcEVyFNgR1scDDgV6GjM=
-SIZE (tiled-qt-0.9.0.tar.gz) = 1432489
+SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
+SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
Index: patches/patch-src_automappingconverter_automappingconverter_pro
===
RCS file: patches/patch-src_automappingconverter_automappingconverter_pro
diff -N patches/patch-src_automappingconverter_automappingconverter_pro
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_automappingconverter_automappingconverter_pro 28 Apr 
2014 09:22:24 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/automappingconverter/automappingconverter.pro.orig Mon Apr 28 
02:32:11 2014
 src/automappingconverter/automappingconverter.pro  Mon Apr 28 02:32:17 2014
+@@ -48,7 +48,7 @@ HEADERS  += \
+ FORMS+= \
+ converterwindow.ui
+ 
+-manpage.path = $${PREFIX}/share/man/man1/
++manpage.path = $${PREFIX}/man/man1/
+ manpage.files += ../../docs/automappingconverter.1
+ INSTALLS += manpage
+ 
Index: patches/patch-src_tiled_tiled_pro
===
RCS file: /cvs/ports/editors/tiled/patches/patch-src_tiled_tiled_pro,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_tiled_tiled_pro
--- patches/patch-src_tiled_tiled_pro   8 Jul 2013 22:10:57 -   1.1.1.1
+++ patches/patch-src_tiled_tiled_pro   28 Apr 2014 09:22:24 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_tiled_tiled_pro,v 1.1.1.1 2013/07/08 22:10:57 bentley Exp $
 src/tiled/tiled.pro.orig   Sat Jul  6 20:59:42 2013
-+++ src/tiled/tiled.proSat Jul  6 20:59:45 2013
-@@ -278,7 +278,7 @@ desktopfile.path = $${PREFIX}/share/applications/
+--- src/tiled/tiled.pro.orig   Sat Jul 27 14:34:23 2013
 src/tiled/tiled.proMon Apr 28 01:48:23 2014
+@@ -286,7 +286,7 @@ desktopfile.path = $${PREFIX}/share/applications/
  desktopfile.files += ../../docs/tiled.desktop
  INSTALLS += desktopfile
  
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/tiled/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   8 Jul 2013 22:10:57 -   1.1.1.1
+++ pkg/PLIST   28 Apr 2014 09:22:24 -
@@ -1,18 +1,21 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2013/07/08 22:10:57 bentley Exp $
 %%SHARED%%
+@bin bin/automappingconverter
 @bin bin/tiled
 @bin bin/tmxrasterizer
 @bin bin/tmxviewer
 @lib lib/libtiled.so.${LIBtiled_VERSION}
 lib/tiled/
 lib/tiled/plugins/
+@man man/man1/automappingconverter.1
 @man man/man1/tiled.1
 @man man/man1/tmxrasterizer.1
 @man man/man1/tmxviewer.1
 share/applications/tiled.desktop
+share/icons/hicolor/16x16/apps/tiled.png
+share/icons/hicolor/32x32/apps/tiled.png
+share/icons/hicolor/scalable/apps/tiled.svg
 share/tiled/
-share/tiled/images/
-share/tiled/images/tiled-icon-32.png
 share/tiled/translations/
 share/tiled/translations/tiled_cs.qm
 share/tiled/translations/tiled_de.qm

Re: UPDATE: editors/tiled

2014-04-28 Thread Antoine Jacoutot 
On Mon, Apr 28, 2014 at 03:28:06AM -0600, Anthony J. Bentley wrote:
 Hi,
 
 Below is an update to tiled-0.9.1.
 
 Tested on amd64. Regression tests have been tweaked so they run from the
 correct directory (this was causing a spurious failure before).

Missing x11/gtk+2,-guic goo.


 
 ok?
 
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/editors/tiled/Makefile,v
 retrieving revision 1.2
 diff -u -p -u -p -r1.2 Makefile
 --- Makefile  19 Jul 2013 03:31:14 -  1.2
 +++ Makefile  28 Apr 2014 09:22:24 -
 @@ -2,7 +2,7 @@
  
  COMMENT =tile map editor
  
 -V =  0.9.0
 +V =  0.9.1
  DISTNAME =   tiled-qt-${V}
  PKGNAME =tiled-${V}
  
 @@ -20,7 +20,8 @@ WANTLIB += c fontconfig freetype m pthre
  
  MASTER_SITES =   ${MASTER_SITE_SOURCEFORGE:=tiled/}
  
 -RUN_DEPENDS =devel/desktop-file-utils
 +RUN_DEPENDS =devel/desktop-file-utils \
 + x11/gtk+2,-guic
  MODULES =x11/qt4
  
  MAKE_FLAGS = CC=${CC} \
 @@ -35,9 +36,8 @@ do-configure:
   qmake4 -makefile tiled.pro -config release
  
  do-test:
 - cd ${WRKSRC}/tests  \
 - ./staggeredrenderer/staggeredrenderer  \
 - ./mapreader/mapreader
 + cd ${WRKSRC}/tests/staggeredrenderer  ./staggeredrenderer  \
 + cd ${WRKSRC}/tests/mapreader  ./mapreader
  
  # XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
  DPB_PROPERTIES = nojunk
 Index: distinfo
 ===
 RCS file: /cvs/ports/editors/tiled/distinfo,v
 retrieving revision 1.1.1.1
 diff -u -p -u -p -r1.1.1.1 distinfo
 --- distinfo  8 Jul 2013 22:10:57 -   1.1.1.1
 +++ distinfo  28 Apr 2014 09:22:24 -
 @@ -1,2 +1,2 @@
 -SHA256 (tiled-qt-0.9.0.tar.gz) = /8iDG+cu7eei/KZJCVYBJEUjcEVyFNgR1scDDgV6GjM=
 -SIZE (tiled-qt-0.9.0.tar.gz) = 1432489
 +SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
 +SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
 Index: patches/patch-src_automappingconverter_automappingconverter_pro
 ===
 RCS file: patches/patch-src_automappingconverter_automappingconverter_pro
 diff -N patches/patch-src_automappingconverter_automappingconverter_pro
 --- /dev/null 1 Jan 1970 00:00:00 -
 +++ patches/patch-src_automappingconverter_automappingconverter_pro   28 Apr 
 2014 09:22:24 -
 @@ -0,0 +1,12 @@
 +$OpenBSD$
 +--- src/automappingconverter/automappingconverter.pro.orig   Mon Apr 28 
 02:32:11 2014
  src/automappingconverter/automappingconverter.proMon Apr 28 
 02:32:17 2014
 +@@ -48,7 +48,7 @@ HEADERS  += \
 + FORMS+= \
 + converterwindow.ui
 + 
 +-manpage.path = $${PREFIX}/share/man/man1/
 ++manpage.path = $${PREFIX}/man/man1/
 + manpage.files += ../../docs/automappingconverter.1
 + INSTALLS += manpage
 + 
 Index: patches/patch-src_tiled_tiled_pro
 ===
 RCS file: /cvs/ports/editors/tiled/patches/patch-src_tiled_tiled_pro,v
 retrieving revision 1.1.1.1
 diff -u -p -u -p -r1.1.1.1 patch-src_tiled_tiled_pro
 --- patches/patch-src_tiled_tiled_pro 8 Jul 2013 22:10:57 -   1.1.1.1
 +++ patches/patch-src_tiled_tiled_pro 28 Apr 2014 09:22:24 -
 @@ -1,7 +1,7 @@
  $OpenBSD: patch-src_tiled_tiled_pro,v 1.1.1.1 2013/07/08 22:10:57 bentley 
 Exp $
  src/tiled/tiled.pro.orig Sat Jul  6 20:59:42 2013
 -+++ src/tiled/tiled.pro  Sat Jul  6 20:59:45 2013
 -@@ -278,7 +278,7 @@ desktopfile.path = $${PREFIX}/share/applications/
 +--- src/tiled/tiled.pro.orig Sat Jul 27 14:34:23 2013
  src/tiled/tiled.pro  Mon Apr 28 01:48:23 2014
 +@@ -286,7 +286,7 @@ desktopfile.path = $${PREFIX}/share/applications/
   desktopfile.files += ../../docs/tiled.desktop
   INSTALLS += desktopfile
   
 Index: pkg/PLIST
 ===
 RCS file: /cvs/ports/editors/tiled/pkg/PLIST,v
 retrieving revision 1.1.1.1
 diff -u -p -u -p -r1.1.1.1 PLIST
 --- pkg/PLIST 8 Jul 2013 22:10:57 -   1.1.1.1
 +++ pkg/PLIST 28 Apr 2014 09:22:24 -
 @@ -1,18 +1,21 @@
  @comment $OpenBSD: PLIST,v 1.1.1.1 2013/07/08 22:10:57 bentley Exp $
  %%SHARED%%
 +@bin bin/automappingconverter
  @bin bin/tiled
  @bin bin/tmxrasterizer
  @bin bin/tmxviewer
  @lib lib/libtiled.so.${LIBtiled_VERSION}
  lib/tiled/
  lib/tiled/plugins/
 +@man man/man1/automappingconverter.1
  @man man/man1/tiled.1
  @man man/man1/tmxrasterizer.1
  @man man/man1/tmxviewer.1
  share/applications/tiled.desktop
 +share/icons/hicolor/16x16/apps/tiled.png
 +share/icons/hicolor/32x32/apps/tiled.png
 +share/icons/hicolor/scalable/apps/tiled.svg
  share/tiled/
 -share/tiled/images/
 -share/tiled/images/tiled-icon-32.png
  share/tiled/translations/
  share/tiled/translations/tiled_cs.qm

Re: UPDATE: editors/tiled

2014-04-28 Thread Anthony J. Bentley 
Antoine Jacoutot writes:
 On Mon, Apr 28, 2014 at 03:28:06AM -0600, Anthony J. Bentley wrote:
  Hi,
  
  Below is an update to tiled-0.9.1.
  
  Tested on amd64. Regression tests have been tweaked so they run from the
  correct directory (this was causing a spurious failure before).
 
 Missing x11/gtk+2,-guic goo.

Note to self: mv pkg/PLIST{.orig,}  make update-plist is a poor habit.


Index: Makefile
===
RCS file: /cvs/ports/editors/tiled/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile19 Jul 2013 03:31:14 -  1.2
+++ Makefile28 Apr 2014 09:38:09 -
@@ -2,7 +2,7 @@
 
 COMMENT =  tile map editor
 
-V =0.9.0
+V =0.9.1
 DISTNAME = tiled-qt-${V}
 PKGNAME =  tiled-${V}
 
@@ -20,7 +20,8 @@ WANTLIB += c fontconfig freetype m pthre
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/}
 
-RUN_DEPENDS =  devel/desktop-file-utils
+RUN_DEPENDS =  devel/desktop-file-utils \
+   x11/gtk+2,-guic
 MODULES =  x11/qt4
 
 MAKE_FLAGS =   CC=${CC} \
@@ -35,9 +36,8 @@ do-configure:
qmake4 -makefile tiled.pro -config release
 
 do-test:
-   cd ${WRKSRC}/tests  \
-   ./staggeredrenderer/staggeredrenderer  \
-   ./mapreader/mapreader
+   cd ${WRKSRC}/tests/staggeredrenderer  ./staggeredrenderer  \
+   cd ${WRKSRC}/tests/mapreader  ./mapreader
 
 # XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
 DPB_PROPERTIES =   nojunk
Index: distinfo
===
RCS file: /cvs/ports/editors/tiled/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo8 Jul 2013 22:10:57 -   1.1.1.1
+++ distinfo28 Apr 2014 09:38:09 -
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.0.tar.gz) = /8iDG+cu7eei/KZJCVYBJEUjcEVyFNgR1scDDgV6GjM=
-SIZE (tiled-qt-0.9.0.tar.gz) = 1432489
+SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
+SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
Index: patches/patch-src_automappingconverter_automappingconverter_pro
===
RCS file: patches/patch-src_automappingconverter_automappingconverter_pro
diff -N patches/patch-src_automappingconverter_automappingconverter_pro
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_automappingconverter_automappingconverter_pro 28 Apr 
2014 09:38:09 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/automappingconverter/automappingconverter.pro.orig Mon Apr 28 
02:32:11 2014
 src/automappingconverter/automappingconverter.pro  Mon Apr 28 02:32:17 2014
+@@ -48,7 +48,7 @@ HEADERS  += \
+ FORMS+= \
+ converterwindow.ui
+ 
+-manpage.path = $${PREFIX}/share/man/man1/
++manpage.path = $${PREFIX}/man/man1/
+ manpage.files += ../../docs/automappingconverter.1
+ INSTALLS += manpage
+ 
Index: patches/patch-src_tiled_tiled_pro
===
RCS file: /cvs/ports/editors/tiled/patches/patch-src_tiled_tiled_pro,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_tiled_tiled_pro
--- patches/patch-src_tiled_tiled_pro   8 Jul 2013 22:10:57 -   1.1.1.1
+++ patches/patch-src_tiled_tiled_pro   28 Apr 2014 09:38:09 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_tiled_tiled_pro,v 1.1.1.1 2013/07/08 22:10:57 bentley Exp $
 src/tiled/tiled.pro.orig   Sat Jul  6 20:59:42 2013
-+++ src/tiled/tiled.proSat Jul  6 20:59:45 2013
-@@ -278,7 +278,7 @@ desktopfile.path = $${PREFIX}/share/applications/
+--- src/tiled/tiled.pro.orig   Sat Jul 27 14:34:23 2013
 src/tiled/tiled.proMon Apr 28 01:48:23 2014
+@@ -286,7 +286,7 @@ desktopfile.path = $${PREFIX}/share/applications/
  desktopfile.files += ../../docs/tiled.desktop
  INSTALLS += desktopfile
  
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/tiled/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   8 Jul 2013 22:10:57 -   1.1.1.1
+++ pkg/PLIST   28 Apr 2014 09:38:09 -
@@ -1,18 +1,21 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2013/07/08 22:10:57 bentley Exp $
 %%SHARED%%
+@bin bin/automappingconverter
 @bin bin/tiled
 @bin bin/tmxrasterizer
 @bin bin/tmxviewer
 @lib lib/libtiled.so.${LIBtiled_VERSION}
 lib/tiled/
 lib/tiled/plugins/
+@man man/man1/automappingconverter.1
 @man man/man1/tiled.1
 @man man/man1/tmxrasterizer.1
 @man man/man1/tmxviewer.1
 share/applications/tiled.desktop
+share/icons/hicolor/16x16/apps/tiled.png
+share/icons/hicolor/32x32/apps/tiled.png
+share/icons/hicolor/scalable/apps/tiled.svg
 share/tiled/
-share/tiled/images/
-share/tiled/images/tiled-icon-32.png
 share/tiled/translations/
 share/tiled/translations/tiled_cs.qm