On 2010/05/07 16:22, David Coppa wrote:
> On Fri, 07 May 2010, Antoine Jacoutot wrote:
>
> > Aren't you missing @conflict markers?
>
> Ok, 3rd revision of this diff.
> I've also unfucked the python stuff...
> "pkg_add -u" is happy with these @conflict markers.
>
> Is it ok now?
one last thing, please use pre-configure for this instead of post-patch.
otherwise, when you do the 'make patch / edit / make update-patches'
cycle this change gets included in the patches and we don't really want
it there. then as far as I'm concerned it's ok.
(as a side-note, gpsd could do with an update, with this version some
sirf devices get switched to binary mode without warning and it can
be a bit of a pig to get them to speak NMEA again ...)
>
> ciao,
> dav
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/misc/gpsd/Makefile,v
> retrieving revision 1.32
> diff -u -p -r1.32 Makefile
> --- Makefile 24 Apr 2010 20:18:39 -0000 1.32
> +++ Makefile 7 May 2010 14:12:55 -0000
> @@ -7,10 +7,10 @@ COMMENT-python= python bindings for gps
>
> VERSION= 2.38
> DISTNAME= gpsd-${VERSION}
> -PKGNAME-main= gpsd-${VERSION}p0
> -PKGNAME-motif= gpsd-motif-${VERSION}p3
> +PKGNAME-main= gpsd-${VERSION}p1
> +PKGNAME-motif= gpsd-motif-${VERSION}p4
> PKGNAME-php= gpsd-php-${VERSION}
> -PKGNAME-python= gpsd-python-${VERSION}p1
> +PKGNAME-python= gpsd-python-${VERSION}p2
> SHARED_LIBS= gps 18.0
> CATEGORIES= misc geo
>
> @@ -59,7 +59,7 @@ CONFIGURE_ARGS+= --disable-python
> .else
> MULTI_PACKAGES+= -python
> MODULES= lang/python
> -LIB_DEPENDS-python= gps::misc/gpsd
> +RUN_DEPENDS-python= ::misc/gpsd
> WANTLIB-python=
> RUN_DEPENDS-main=
> RUN_DEPENDS-motif=
> @@ -73,10 +73,16 @@ PKG_ARCH-php= *
> RUN_DEPENDS-php= :php5-gd-*:www/php5/extensions,-gd
> PREFIX-php= /var/www/
>
> +PYTHON_SCRIPTS= gpsprof gps.py gpsfake gpscat
> +
> +post-patch:
> +.for file in ${PYTHON_SCRIPTS}
> + perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g' ${WRKSRC}/${file}
> +.endfor
> +
> post-install:
> ${INSTALL_DATA_DIR} ${WRKINST}/var/www/gpsd
> ${INSTALL_SCRIPT} ${WRKSRC}/gpsd.php ${WRKINST}/var/www/gpsd
> ${INSTALL_DATA} ${WRKSRC}/gpsd_config.h ${PREFIX}/include
>
> .include <bsd.port.mk>
> -
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/misc/gpsd/pkg/PLIST-main,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST-main
> --- pkg/PLIST-main 16 Apr 2008 06:53:35 -0000 1.5
> +++ pkg/PLIST-main 7 May 2010 14:12:55 -0000
> @@ -1,13 +1,15 @@
> @comment $OpenBSD: PLIST-main,v 1.5 2008/04/16 06:53:35 ckuethe Exp $
> +...@conflict gpsd-python-<=2.38p1
> @newuser _gpsd:551:dialer::GPS server:/nonexistent:/sbin/nologin
> %%SHARED%%
> -bin/cgps
> -bin/cgpxlogger
> -bin/gpsctl
> -bin/gpsflash
> -bin/gpspipe
> -bin/rtcmdecode
> -bin/sirfmon
> +...@bin bin/cgps
> +...@bin bin/cgpxlogger
> +...@bin bin/gpsctl
> +...@bin bin/gpsdlcdd
> +...@bin bin/gpsflash
> +...@bin bin/gpspipe
> +...@bin bin/rtcmdecode
> +...@bin bin/sirfmon
> include/gps.h
> include/gpsd.h
> include/gpsd_config.h
> @@ -20,16 +22,15 @@ lib/pkgconfig/libgpsd.pc
> @man man/man1/cgps.1
> @man man/man1/cgpxlogger.1
> @man man/man1/gps.1
> +...@man man/man1/gpsctl.1
> @man man/man1/gpsflash.1
> -...@man man/man1/gpscat.1
> @man man/man1/gpspipe.1
> @man man/man1/rtcmdecode.1
> @man man/man1/sirfmon.1
> -...@man man/man1/xgps.1
> @man man/man3/libgps.3
> @man man/man3/libgpsd.3
> @man man/man3/libgpsmm.3
> @man man/man5/rtcm-104.5
> @man man/man5/srec.5
> @man man/man8/gpsd.8
> -sbin/gpsd
> +...@bin sbin/gpsd
> Index: pkg/PLIST-motif
> ===================================================================
> RCS file: /cvs/ports/misc/gpsd/pkg/PLIST-motif,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST-motif
> --- pkg/PLIST-motif 27 Oct 2006 23:47:23 -0000 1.2
> +++ pkg/PLIST-motif 7 May 2010 14:12:55 -0000
> @@ -1,4 +1,6 @@
> @comment $OpenBSD: PLIST-motif,v 1.2 2006/10/27 23:47:23 ckuethe Exp $
> -bin/xgps
> -bin/xgpsspeed
> +...@conflict gpsd-<=2.38p0
> +...@bin bin/xgps
> +...@bin bin/xgpsspeed
> +...@man man/man1/xgps.1
> @man man/man1/xgpsspeed.1
> Index: pkg/PLIST-python
> ===================================================================
> RCS file: /cvs/ports/misc/gpsd/pkg/PLIST-python,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST-python
> --- pkg/PLIST-python 16 Apr 2008 06:53:35 -0000 1.2
> +++ pkg/PLIST-python 7 May 2010 14:12:55 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST-python,v 1.2 2008/04/16 06:53:35 ckuethe Exp $
> +...@conflict gpsd-<=2.38p0
> bin/gpscat
> bin/gpsfake
> bin/gpsprof
> @@ -7,9 +8,14 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/gps.py
> lib/python${MODPY_VERSION}/site-packages/gps.pyc
> lib/python${MODPY_VERSION}/site-packages/gps.pyo
> +lib/python${MODPY_VERSION}/site-packages/gpscap.py
> +lib/python${MODPY_VERSION}/site-packages/gpscap.pyc
> +lib/python${MODPY_VERSION}/site-packages/gpscap.pyo
> lib/python${MODPY_VERSION}/site-packages/gpsfake.py
> lib/python${MODPY_VERSION}/site-packages/gpsfake.pyc
> lib/python${MODPY_VERSION}/site-packages/gpsfake.pyo
> -...@man man/man1/gpsctl.1
> +lib/python${MODPY_VERSION}/site-packages/gpslib.so
> +lib/python${MODPY_VERSION}/site-packages/gpspacket.so
> +...@man man/man1/gpscat.1
> @man man/man1/gpsfake.1
> @man man/man1/gpsprof.1
