=================================================================== RCS file: /cvs/ports/misc/gpsd3/Attic/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ports/misc/gpsd3/Attic/Makefile 2017/12/05 09:21:57 1.1 +++ ports/misc/gpsd3/Attic/Makefile 2017/12/05 14:54:35 1.2 @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 2017/12/05 09:21:57 kirby Exp $ +# $OpenBSD: Makefile,v 1.2 2017/12/05 14:54:35 kirby Exp $ COMMENT-main= service daemon that monitors one or more GPSes COMMENT-x11= GUI test apps using gpsd COMMENT-php= web-based gpsd monitor in php -VERSION= 3.16 +VERSION= 3.17 DISTNAME= gpsd-${VERSION} PKGNAME-main= gpsd-${VERSION} PKGNAME-x11= gpsd-x11-${VERSION} @@ -24,17 +24,17 @@ MASTER_SITES = ${MASTER_SITE_SAVANNAH:=gpsd/} -MAKE_ENV += DESTDIR=${WRKINST} -MODSCONS_ENV += DESTDIR=${WRKINST} -MODULES += devel/scons lang/python lang/php +MODULES += devel/scons lang/python lang/php x11/qt4 MODPHP_BUILDDEP= No MODSCONS_FLAGS += gpsd_user=_gpsd \ libQgpsmm=no \ mandir=man \ pps=no \ prefix=${PREFIX} \ - chrpath=no \ - shared=yes + shared=yes \ + target_python=${MODPY_BIN} \ + python_libdir=${DESTDIR}/${MODPY_SITEPKG} \ + qt_versioned=4 MULTI_PACKAGES = -main -php -x11 @@ -58,8 +58,6 @@ RUN_DEPENDS-php= lang/php/${MODPHP_VERSION},-gd PREFIX-php= /var/www/ -SEPARATE_BUILD = Yes - SUBST_VARS += VERSION MODPY_ADJ_FILES = gegps gpsprof gps/gps.py gpsfake gpscat xgps xgpsspeed \ @@ -82,10 +80,10 @@ ${INSTALL_DATA} ${WRKSRC}/packaging/X11/gpsd-logo.png \ ${PREFIX}/share/pixmaps/ -# @find ${DESTDIR}/${MODPY_SITEPKG}/gps -name "*.py" -exec \ -# ${MODPY_BIN} ${MODPY_LIBDIR}/py_compile.py {} \; -# @find ${DESTDIR}/${MODPY_SITEPKG}/gps -name "*.py" -exec \ -# ${MODPY_BIN} -O ${MODPY_LIBDIR}/py_compile.py {} \; + @find ${DESTDIR}/${MODPY_SITEPKG}/gps -name "*.py" -exec \ + ${MODPY_BIN} ${MODPY_LIBDIR}/py_compile.py {} \; + @find ${DESTDIR}/${MODPY_SITEPKG}/gps -name "*.py" -exec \ + ${MODPY_BIN} -O ${MODPY_LIBDIR}/py_compile.py {} \; # Disable regression tests until they are fixed. NO_TEST = Yes