Re: geo/gpsbabel update
Hi. Ports tree is unlocked, so I'm sending a diff once again. Now it's update
to 1.4.3. Also tested with qlandkartegt.
OK to commit?
On Wed, February 1, 2012 23:30, Kirill Bychkov wrote:
This patch updates gpsbabel to one of the latest stable versions (1.4.2),
adds Qt-gui subpackage, disables hardcoding of Tk version (works with both
8.4 and 8.5) and removes gmake from dependencies, as it's not needed (even
for 1.3.6 building).
There were a lot of changes since 2008 - support of new file formats,
translations, new Qt-GUI, fixes. Full list of changes could be found there
http://www.gpsbabel.org/changes.html
CLI and Qt-GUI were tested on amd64 with Garmin eTrex Summit, connected via
serial port. geo/viking also works fine. OK to commit now or this should
wait unlock?
Is it OK to use gentoo mirror, or I should mirror distfile on my own server?
Patch was send to maintainer at 15.01, but I have no response from Chris.
Index: Makefile
===
RCS file: /cvs/ports/geo/gpsbabel/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile13 Nov 2011 13:54:04 - 1.20
+++ Makefile2 Feb 2012 11:12:36 -
@@ -1,29 +1,27 @@
# $OpenBSD: Makefile,v 1.20 2011/11/13 13:54:04 ajacoutot Exp $
COMMENT-main= GPS waypoint, track, and route conversion tool
-COMMENT-gui= Tk front-end to gpsbabel
+COMMENT-tk=Tk front-end to gpsbabel
+COMMENT-qt=Qt front-end to gpsbabel
-VERSION= 1.3.6
+VERSION= 1.4.3
DISTNAME= gpsbabel-${VERSION}
PKGNAME-main= gpsbabel-${VERSION}
-PKGNAME-gui= gpsbabel-gui-${VERSION}
-REVISION-main =0
-REVISION-gui = 0
+PKGNAME-tk=gpsbabel-tk-${VERSION}
+PKGNAME-qt=gpsbabel-qt-${VERSION}
CATEGORIES=geo
HOMEPAGE= http://www.gpsbabel.org/
MAINTAINER=Chris Kuethe ckue...@openbsd.org
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-#MASTER_SITES= ${HOMEPAGE}
-MASTER_SITES= http://comstyle.com/source/ \
- ftp://quatramaran.ens.fr/pub/espie/
+MASTER_SITES= http://www.linklevel.net/distfiles/
AUTOCONF_VERSION= 2.61
CONFIGURE_STYLE= autoconf
@@ -37,11 +35,9 @@ CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE
LDFLAGS=-L${LOCALBASE}/lib \
WEB=${WRKSRC}
-USE_GMAKE= Yes
-MULTI_PACKAGES=-main -gui
+MULTI_PACKAGES=-main -tk -qt
-MODULES= x11/tk
-MODTK_VERSION= 8.4
+MODULES= x11/tk x11/qt4
BUILD_DEPENDS= textproc/libxslt \
textproc/docbook \
@@ -49,18 +45,31 @@ BUILD_DEPENDS= textproc/libxslt \
LIB_DEPENDS-main= devel/libusb-compat \
devel/shapelib
-WANTLIB-main= expat m c z usb shp=1 pthread
-
-LIB_DEPENDS-gui=
-PKG_ARCH-gui= *
-RUN_DEPENDS-gui= geo/gpsbabel \
+cWANTLIB = c m pthread
+WANTLIB-main += expat shp=1 usb z ${cWANTLIB}
+WANTLIB-tk =
+WANTLIB-qt += ICE QtCore QtGui QtNetwork QtWebKit QtXml SM X11 Xext Xi
+WANTLIB-qt += Xinerama Xrender fontconfig freetype stdc++ ${cWANTLIB}
+
+LIB_DEPENDS-tk=
+PKG_ARCH-tk= *
+RUN_DEPENDS-tk=geo/gpsbabel \
${MODTK_RUN_DEPENDS}
+RUN_DEPENDS-qt=geo/gpsbabel
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/guibabel
+post-configure:
+ cd ${WRKSRC}/gui ${SETENV} ${CONFIGURE_ENV} qmake4 \
+ app.pro
post-build:
- gmake -C ${WRKSRC} doc
+ cd ${WRKSRC} make doc
+ cd ${WRKSRC}/gui make
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe-bin \
+ ${PREFIX}/bin/guibabel-qt
${INSTALL_SCRIPT} ${WRKSRC}/guibabel ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gpsbabel
${INSTALL_DATA} ${WRKSRC}/babelweb/htmldoc-*/*.html \
Index: distinfo
===
RCS file: /cvs/ports/geo/gpsbabel/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo31 Aug 2009 22:48:17 - 1.6
+++ distinfo2 Feb 2012 11:12:36 -
@@ -1,5 +1,5 @@
-MD5 (gpsbabel-1.3.6.tar.gz) = FXGzH48G9yKZVEnb/wHKSQ==
-RMD160 (gpsbabel-1.3.6.tar.gz) = 20BeAg+0NA2n9ArPJm4nqJMwrZQ=
-SHA1 (gpsbabel-1.3.6.tar.gz) = j/huNWU5ykk7M1J7kQMq2ztFKng=
-SHA256 (gpsbabel-1.3.6.tar.gz) = CL1dBPyT/hjMxYDyI8xVG94dWBcj/Z+S+RtI3dilqbY=
-SIZE (gpsbabel-1.3.6.tar.gz) = 6637505
+MD5 (gpsbabel-1.4.3.tar.gz) = kW9+Ek9t+RGiTh6jI+nFKQ==
+RMD160 (gpsbabel-1.4.3.tar.gz) = n/L+4X6Xj+ckjRwNRf8cf/43ddE=
+SHA1 (gpsbabel-1.4.3.tar.gz) = vWJm7u84dV1J5twXMwtYxo5aMtc=
+SHA256
geo/gpsbabel update
This patch updates gpsbabel to one of the latest stable versions (1.4.2), adds
Qt-gui subpackage, disables hardcoding of Tk version (works with both 8.4 and
8.5) and removes gmake from dependencies, as it's not needed (even for 1.3.6
building).
There were a lot of changes since 2008 - support of new file formats,
translations, new Qt-GUI, fixes. Full list of changes could be found there
http://www.gpsbabel.org/changes.html
CLI and Qt-GUI were tested on amd64 with Garmin eTrex Summit, connected via
serial port. geo/viking also works fine. OK to commit now or this should wait
unlock?
Is it OK to use gentoo mirror, or I should mirror distfile on my own server?
Patch was send to maintainer at 15.01, but I have no response from Chris.
Index: Makefile
===
RCS file: /cvs/ports/geo/gpsbabel/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile13 Nov 2011 13:54:04 - 1.20
+++ Makefile1 Feb 2012 08:20:49 -
@@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.20 2011/11/13 13:54:04 ajacoutot Exp $
COMMENT-main= GPS waypoint, track, and route conversion tool
-COMMENT-gui= Tk front-end to gpsbabel
+COMMENT-tk=Tk front-end to gpsbabel
+COMMENT-qt=Qt front-end to gpsbabel
-VERSION= 1.3.6
+VERSION= 1.4.2
DISTNAME= gpsbabel-${VERSION}
PKGNAME-main= gpsbabel-${VERSION}
-PKGNAME-gui= gpsbabel-gui-${VERSION}
-REVISION-main =0
-REVISION-gui = 0
+PKGNAME-tk=gpsbabel-tk-${VERSION}
+PKGNAME-qt=gpsbabel-qt-${VERSION}
CATEGORIES=geo
HOMEPAGE= http://www.gpsbabel.org/
@@ -21,9 +21,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-#MASTER_SITES= ${HOMEPAGE}
-MASTER_SITES= http://comstyle.com/source/ \
- ftp://quatramaran.ens.fr/pub/espie/
+MASTER_SITES= http://distfiles.gentoo.org/distfiles/
AUTOCONF_VERSION= 2.61
CONFIGURE_STYLE= autoconf
@@ -37,11 +35,9 @@ CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE
LDFLAGS=-L${LOCALBASE}/lib \
WEB=${WRKSRC}
-USE_GMAKE= Yes
-MULTI_PACKAGES=-main -gui
+MULTI_PACKAGES=-main -tk -qt
-MODULES= x11/tk
-MODTK_VERSION= 8.4
+MODULES= x11/tk x11/qt4
BUILD_DEPENDS= textproc/libxslt \
textproc/docbook \
@@ -49,18 +45,31 @@ BUILD_DEPENDS= textproc/libxslt \
LIB_DEPENDS-main= devel/libusb-compat \
devel/shapelib
-WANTLIB-main= expat m c z usb shp=1 pthread
-
-LIB_DEPENDS-gui=
-PKG_ARCH-gui= *
-RUN_DEPENDS-gui= geo/gpsbabel \
+cWANTLIB = c m pthread
+WANTLIB-main += expat shp=1 usb z ${cWANTLIB}
+WANTLIB-tk =
+WANTLIB-qt += ICE QtCore QtGui QtNetwork QtWebKit QtXml SM X11 Xext Xi
+WANTLIB-qt += Xinerama Xrender fontconfig freetype stdc++ ${cWANTLIB}
+
+LIB_DEPENDS-tk=
+PKG_ARCH-tk= *
+RUN_DEPENDS-tk=geo/gpsbabel \
${MODTK_RUN_DEPENDS}
+RUN_DEPENDS-qt=geo/gpsbabel
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/guibabel
+post-configure:
+ cd ${WRKSRC}/gui ${SETENV} ${CONFIGURE_ENV} qmake4 \
+ app.pro
post-build:
- gmake -C ${WRKSRC} doc
+ cd ${WRKSRC} make doc
+ cd ${WRKSRC}/gui make
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe-bin \
+ ${PREFIX}/bin/guibabel-qt
${INSTALL_SCRIPT} ${WRKSRC}/guibabel ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gpsbabel
${INSTALL_DATA} ${WRKSRC}/babelweb/htmldoc-*/*.html \
Index: distinfo
===
RCS file: /cvs/ports/geo/gpsbabel/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo31 Aug 2009 22:48:17 - 1.6
+++ distinfo1 Feb 2012 08:20:49 -
@@ -1,5 +1,5 @@
-MD5 (gpsbabel-1.3.6.tar.gz) = FXGzH48G9yKZVEnb/wHKSQ==
-RMD160 (gpsbabel-1.3.6.tar.gz) = 20BeAg+0NA2n9ArPJm4nqJMwrZQ=
-SHA1 (gpsbabel-1.3.6.tar.gz) = j/huNWU5ykk7M1J7kQMq2ztFKng=
-SHA256 (gpsbabel-1.3.6.tar.gz) = CL1dBPyT/hjMxYDyI8xVG94dWBcj/Z+S+RtI3dilqbY=
-SIZE (gpsbabel-1.3.6.tar.gz) = 6637505
+MD5 (gpsbabel-1.4.2.tar.gz) = duqfeFK+LpiqGJdsRpfKkw==
+RMD160 (gpsbabel-1.4.2.tar.gz) = RZh4eLgR97FGUR6FnonQ4ozMH7M=
+SHA1 (gpsbabel-1.4.2.tar.gz) = 6X+UlxbXhmOK9yNdeil5v1BUdCY=
+SHA256 (gpsbabel-1.4.2.tar.gz) = 6T16ZiDUBIp4HoLCbih9s+HcUl1LKTR5VGz5iHvCgAo=
+SIZE (gpsbabel-1.4.2.tar.gz) = 5551502
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/geo/gpsbabel/patches/patch-Makefile_in,v
retrieving revision
Re: geo/gpsbabel update
On 2012/02/01 23:30, Kirill Bychkov wrote: This patch updates gpsbabel to one of the latest stable versions (1.4.2), adds Qt-gui subpackage, disables hardcoding of Tk version (works with both 8.4 and 8.5) and removes gmake from dependencies, as it's not needed (even for 1.3.6 building). There were a lot of changes since 2008 - support of new file formats, translations, new Qt-GUI, fixes. Full list of changes could be found there http://www.gpsbabel.org/changes.html CLI and Qt-GUI were tested on amd64 with Garmin eTrex Summit, connected via serial port. geo/viking also works fine. OK to commit now or this should wait unlock? Wait until unlock please (did you check qlandkartegt, btw?) Is it OK to use gentoo mirror, or I should mirror distfile on my own server? I'd prefer to mirror it (I can do so if you like).
