Index: Makefile
===================================================================
--- Makefile	(revision 353726)
+++ Makefile	(working copy)
@@ -12,26 +12,14 @@
 BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
 		xsltproc:${PORTSDIR}/textproc/libxslt
 
-NO_STAGE=	yes
-USES=		pathfix pkgconfig
-USE_SCONS=	yes
+USES=		pathfix pkgconfig scons
 USE_RC_SUBR=	gpsd
 USE_PYTHON=	yes
-INSTALLS_EGGINFO=	yes
-PYDISTUTILS_EGGINFO=	gps-${PORTVERSION}.egg-info
 
-SCONS_BUILDENV=	CC=${CC}
-SCONS_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \
+MAKE_ARGS=	prefix="${PREFIX}" mandir="man" pkgconfig="libdata/pkgconfig" \
 		chrpath=no
+MAKE_ENV=	DESTDIR="${STAGEDIR}"
 
-MAN1=	cgps.1 gegps.1 gps.1 gpscat.1 gpsctl.1 gpsdecode.1 \
-	gpsfake.1  gpspipe.1 gpsprof.1 xgps.1 xgpsspeed.1 \
-	gpsmon.1 lcdgps.1
-MAN3=	libgps.3 libgpsd.3 libgpsmm.3 libQgpsmm.3
-MAN5=	srec.5 gpsd_json.5
-MAN8=	gpsd.8 gpsdctl.8 gpsinit.8
-MANCOMPRESSED=	no
-
 OPTIONS_DEFINE=	AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FV18 GARMIN GARMINTXT \
 		GEOSTAR GPSCLOCK GTK2 IPV6 ITRAX MTK NAVCOM NETFEED NMEA NTPSHM NTRIP \
 		OCEANSERVER OLDPROTO ONCORE PASSTHROUGH PPS PROFILING RECONFIGURE \
@@ -262,12 +250,10 @@
 # if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted
 # with these files when module is imported from root user
 post-install:
-	@${FIND} ${PYTHON_SITELIBDIR:C/^${LOCALBASE}/${PREFIX}/}/gps \
-		-name "*.py" -exec \
-		${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py {} \;
-	@${SETENV} PYTHONOPTIMIZE=yes \
-		${FIND} ${PYTHON_SITELIBDIR:C/^${LOCALBASE}/${PREFIX}/}/gps \
-		-name "*.py" -exec \
-		${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py {} \;
+	(cd ${STAGEDIR}${PREFIX} && \
+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} && \
+	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 
 .include <bsd.port.mk>
Index: files/patch-SConstruct
===================================================================
--- files/patch-SConstruct	(revision 353726)
+++ files/patch-SConstruct	(working copy)
@@ -1,6 +1,21 @@
 --- SConstruct.orig	2013-05-01 09:44:21.000000000 +0400
-+++ SConstruct	2013-05-01 16:30:55.000000000 +0400
-@@ -590,7 +590,14 @@
++++ SConstruct	2014-05-20 00:47:57.769697286 +0400
+@@ -268,14 +268,6 @@
+     wrapped.replace("/usr/etc", "/etc")
+     return wrapped
+ 
+-# Honor the specified installation prefix in link paths.
+-if not env["sysroot"]:
+-    env.Prepend(LIBPATH=[installdir('libdir')])
+-else:
+-    env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')])
+-if env["shared"]:
+-    env.Prepend(RPATH=[installdir('libdir')])
+-
+ # Give deheader a way to set compiler flags
+ if 'MORECFLAGS' in os.environ:
+     env.Append(CFLAGS=Split(os.environ['MORECFLAGS']))
+@@ -590,7 +582,14 @@
  #ifdef __LITTLE_ENDIAN__
  #undef WORDS_BIGENDIAN
  #else
@@ -16,7 +31,7 @@
  #if __BYTE_ORDER == __BIG_ENDIAN
  #define WORDS_BIGENDIAN 1
  #elif __BYTE_ORDER == __LITTLE_ENDIAN
-@@ -1242,7 +1249,7 @@
+@@ -1242,7 +1241,7 @@
  if not env['python']:
      python_install = []
  else:
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 353726)
+++ pkg-plist	(working copy)
@@ -26,6 +26,29 @@
 lib/libgpsd.so.21
 lib/libgpsd.so.21.0
 lib/libgpsd.so.21.0.0
+man/man1/cgps.1.gz
+man/man1/gegps.1.gz
+man/man1/gps.1.gz
+man/man1/gpscat.1.gz
+man/man1/gpsctl.1.gz
+man/man1/gpsdecode.1.gz
+man/man1/gpsfake.1.gz
+man/man1/gpsmon.1.gz
+man/man1/gpspipe.1.gz
+man/man1/gpsprof.1.gz
+man/man1/lcdgps.1.gz
+man/man1/xgps.1.gz
+man/man1/xgpsspeed.1.gz
+man/man3/libQgpsmm.3.gz
+man/man3/libgps.3.gz
+man/man3/libgpsd.3.gz
+man/man3/libgpsmm.3.gz
+man/man5/gpsd_json.5.gz
+man/man5/srec.5.gz
+man/man8/gpsd.8.gz
+man/man8/gpsdctl.8.gz
+man/man8/gpsinit.8.gz
+%%PYTHON_SITELIBDIR%%/gps-3.9.egg-info
 %%PYTHON_SITELIBDIR%%/gps/__init__.py
 %%PYTHON_SITELIBDIR%%/gps/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gps/__init__.pyo
@@ -44,6 +67,8 @@
 %%PYTHON_SITELIBDIR%%/gps/misc.pyo
 %%PYTHON_SITELIBDIR%%/gps/packet.so
 @dirrm %%PYTHON_SITELIBDIR%%/gps
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
 %%QTBIND%%libdata/pkgconfig/Qgpsmm.pc
 libdata/pkgconfig/libgps.pc
 libdata/pkgconfig/libgpsd.pc