===================================================================
RCS file: /cvs/ports/misc/gpsd3/Attic/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -u -r1.1.1.1 -r1.3
--- ports/misc/gpsd3/Attic/Makefile	2017/12/05 09:21:57	1.1.1.1
+++ ports/misc/gpsd3/Attic/Makefile	2019/06/11 15:34:46	1.3
@@ -1,40 +1,39 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/12/05 09:21:57 kirby Exp $
+# $OpenBSD: Makefile,v 1.3 2019/06/11 15:34:46 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.18
 DISTNAME=		gpsd-${VERSION}
 PKGNAME-main=		gpsd-${VERSION}
 PKGNAME-x11=		gpsd-x11-${VERSION}
 PKGNAME-php=		gpsd-php-${VERSION}
 
 # libgpsd version always equal to libgps version, thanks to scons code.
-SHARED_LIBS += 		gps	20.0 # 20.0
-SHARED_LIBS += 		gpsd	20.0 # 20.0
+SHARED_LIBS += 		gps	24.0 # 24.0
 CATEGORIES=		misc geo
 
 HOMEPAGE = 		http://www.catb.org/gpsd/
 
-MAINTAINER=		Chris Kuethe <ckuethe@openbsd.org>
-
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
 MASTER_SITES = 		${MASTER_SITE_SAVANNAH:=gpsd/}
 
-MAKE_ENV +=		DESTDIR=${WRKINST}
-MODSCONS_ENV +=		DESTDIR=${WRKINST}
-MODULES += 		devel/scons lang/python lang/php
+WANTLIB-main +=	c dbus-1 m curses pthread usb-1.0
+
+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
 
@@ -43,23 +42,20 @@
 			textproc/docbook-xsl
 TEST_DEPENDS=		misc/gpsd,-main
 
-LIB_DEPENDS-main = 	devel/libusb1
+LIB_DEPENDS-main = 	devel/libusb1 \
+			x11/dbus
 RUN_DEPENDS-main=	${MODPY_RUN_DEPENDS}
 
 RUN_DEPENDS-x11 = 	${BASE_PKGPATH} \
 			devel/desktop-file-utils \
 			x11/py-gtk2
 
-WANTLIB-main = 		m ncurses c pthread stdc++ usb-1.0
-
 # the php display script doesn't depend on having any of gpsd around,
 # it just sits there and looks pretty.
 PKG_ARCH-php=		*
 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 +78,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