Index: head/devel/libmpsse/Makefile
===================================================================
--- head/devel/libmpsse/Makefile	(revision 439957)
+++ head/devel/libmpsse/Makefile	(revision 439958)
@@ -1,55 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=	libmpsse
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source library for SPI/I2C control via FTDI chips
 
-LICENSE=	GPLv2
+LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	swig2.0:devel/swig20
 LIB_DEPENDS=	libftdi.so:devel/libftdi
 
-BROKEN=		Unfetchable (google code has gone away)
-DEPRECATED=	Unfetchable for more than six months (google code has gone away)
-EXPIRATION_DATE=	2017-04-30
-
-USES=		gmake pkgconfig python:2
-USE_AUTOTOOLS=	autoconf
-USE_LDCONFIG=	yes
+USES=		autoreconf localbase:ldflags pkgconfig python:2
 GNU_CONFIGURE=	yes
-CFLAGS+=	-I${LOCALBASE}/include -fPIC
-LDFLAGS+=	-L${LOCALBASE}/lib -lftdi
+USE_GITHUB=	yes
+USE_LDCONFIG=	yes
+GH_ACCOUNT=	devttys0
+GH_TAGNAME=	f1a6744b220d
 
-CONFIGURE_WRKSRC=	${WRKSRC}/src
-BUILD_WRKSRC=		${WRKSRC}/src
-INSTALL_WRKSRC=		${WRKSRC}/src
+WRKSRC_SUBDIR=	src
 
-MAKE_JOBS_UNSAFE=	yes
-
 CONFIGURE_ENV=  SWIG="swig2.0"
 
-MAKE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-
-PORTDOCS=	INSTALL COPYING README README.* AN_135_MPSSE_Basics.pdf
+PORTDOCS=	INSTALL LICENSE README README.* AN_135_MPSSE_Basics.pdf
 PORTEXAMPLES=	*
 
-PLIST_FILES= ${LOCALBASE}/lib/libmpsse.so ${LOCALBASE}/lib/libmpsse.a ${LOCALBASE}/include/mpsse.h \
-				${PYTHON_SITELIBDIR}/mpsse.py ${PYTHON_SITELIBDIR}/pylibmpsse.py ${PYTHON_SITELIBDIR}/_pylibmpsse.so
+PLIST_FILES=	lib/libmpsse.so lib/libmpsse.a include/mpsse.h \
+		${PYTHONPREFIX_SITELIBDIR}/_pylibmpsse.so \
+		${PYTHONPREFIX_SITELIBDIR}/mpsse.py \
+		${PYTHONPREFIX_SITELIBDIR}/pylibmpsse.py
 
-pre-install:
-	${MKDIR} ${STAGEDIR}/${LOCALBASE}/lib/
-
 post-install:
-	${MKDIR} ${STAGEDIR}/${DOCSDIR}
-	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name Makefile")
-	${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
-	(cd ${WRKSRC}/src/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -name Makefile")
-
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_pylibmpsse.so
+	(cd ${WRKSRC}/../docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name Makefile")
+	(cd ${WRKSRC}/../src/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -name Makefile")
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_pylibmpsse.so 
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmpsse.so
 
 .include <bsd.port.mk>
Index: head/devel/libmpsse/distinfo
===================================================================
--- head/devel/libmpsse/distinfo	(revision 439957)
+++ head/devel/libmpsse/distinfo	(revision 439958)
@@ -1,2 +1,3 @@
-SHA256 (libmpsse-1.3.tar.gz) = 08f2a0025074720d40e29430089b1ab78d764756cc5d2bcb3148d98131b4074b
-SIZE (libmpsse-1.3.tar.gz) = 652047
+TIMESTAMP = 1487094604
+SHA256 (devttys0-libmpsse-1.3-f1a6744b220d_GH0.tar.gz) = 97f08ad42ffbf5dc6d9e0760fddb03997af4fe1069daa4ce5197e695e3a50a78
+SIZE (devttys0-libmpsse-1.3-f1a6744b220d_GH0.tar.gz) = 644261
Index: head/devel/libmpsse/files/patch-src_Makefile.in
===================================================================
--- head/devel/libmpsse/files/patch-src_Makefile.in	(revision 439957)
+++ head/devel/libmpsse/files/patch-src_Makefile.in	(nonexistent)
@@ -1,31 +0,0 @@
---- src/Makefile.in.orig	2014-08-02 23:32:56.329217465 +0200
-+++ src/Makefile.in	2014-08-02 23:35:17.471137680 +0200
-@@ -43,9 +43,10 @@
- 		-o _pylib$(TARGET).so $(LDFLAGS) $(INC)
-
- pyswig-install:
--	install -D -m644 pylib$(TARGET).py  $(DESTDIR)/$(PYLIB)/pylib$(TARGET).py
--	install -D -m644 _pylib$(TARGET).so $(DESTDIR)/$(PYLIB)/_pylib$(TARGET).so
--	install -D -m644 $(TARGET).py       $(DESTDIR)/$(PYLIB)/$(TARGET).py
-+	install -d -m755 $(DESTDIR)/$(PYLIB)
-+	install -m644 pylib$(TARGET).py  $(DESTDIR)/$(PYLIB)/pylib$(TARGET).py
-+	install -m644 _pylib$(TARGET).so $(DESTDIR)/$(PYLIB)/_pylib$(TARGET).so
-+	install -m644 $(TARGET).py       $(DESTDIR)/$(PYLIB)/$(TARGET).py
-
- pyswig-uninstall:
- 	rm -f $(DESTDIR)/$(PYLIB)/$(TARGET).* \
-@@ -58,9 +59,11 @@
- py-uninstall:
-
- install: py$(BUILD)-install
--	install -D -m644 lib$(TARGET).so $(DESTDIR)/$(LIBDIR)/lib$(TARGET).so
--	install -D -m644 lib$(TARGET).a  $(DESTDIR)/$(LIBDIR)/lib$(TARGET).a
--	install -D -m644 $(TARGET).h     $(DESTDIR)/$(INCDIR)/$(TARGET).h
-+	install -d -m755 $(DESTDIR)/$(LIBDIR)
-+	install -m644 lib$(TARGET).so $(DESTDIR)/$(LIBDIR)/lib$(TARGET).so
-+	install -m644 lib$(TARGET).a  $(DESTDIR)/$(LIBDIR)/lib$(TARGET).a
-+	install -d -m755 $(DESTDIR)/$(INCDIR)
-+	install -m644 $(TARGET).h     $(DESTDIR)/$(INCDIR)/$(TARGET).h
-
- uninstall: py$(BUILD)-uninstall
- 	rm -f $(DESTDIR)/$(LIBDIR)/lib$(TARGET).so \

Property changes on: head/devel/libmpsse/files/patch-src_Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/libmpsse/files/patch-src_configure_ac
===================================================================
--- head/devel/libmpsse/files/patch-src_configure_ac	(revision 439957)
+++ head/devel/libmpsse/files/patch-src_configure_ac	(nonexistent)
@@ -1,43 +0,0 @@
---- src/configure.ac.orig	2014-04-13 17:54:11.835943734 +0200
-+++ src/configure.ac	2014-04-13 18:06:11.083132540 +0200
-@@ -42,6 +42,31 @@
- 		exit 1
- 	fi
-
-+	if ! test $PYEXE
-+  	then
-+    		PYEXE=$(which python2)
-+    		if ! test ${PYEXE}
-+    		then
-+      			PYEXE=$(which python)
-+    		fi
-+  	fi
-+  	echo $PYEXE
-+
-+  	if ! test $PYDEV
-+  	then
-+    		for INCL in $(python2-config --includes)
-+    		do
-+      			echo $INCL
-+      			INCL=$(echo "${INCL}" | sed 's:^-I::g')
-+      			echo $INCL
-+      			if test -f "${INCL}/Python.h"
-+      			then
-+        			PYDEV="${INCL}"
-+        			break;
-+      			fi;
-+    		done
-+  	fi
-+
- 	if ! test $PYDEV
- 	then
- 		PYDEV="/usr/include/python$(python -V 2>&1 | awk '{print $2}' | cut -d'.' -f1,2)"
-@@ -54,7 +79,7 @@
- 		dnl This is a hack to get a valid python library path
- 		echo "import sys" > pylib.py
- 		echo "for path in sys.path: print path" >> pylib.py
--		PYLIB="$(python pylib.py | grep -e '-packages$' | head -1)"
-+		PYLIB="$(${PYEXE} pylib.py | grep -e '-packages$' | head -1)"
- 		rm -f pylib.py
- 	fi
-

Property changes on: head/devel/libmpsse/files/patch-src_configure_ac
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/libmpsse/files/patch-Makefile.in
===================================================================
--- head/devel/libmpsse/files/patch-Makefile.in	(nonexistent)
+++ head/devel/libmpsse/files/patch-Makefile.in	(revision 439958)
@@ -0,0 +1,54 @@
+--- Makefile.in.orig	2015-06-11 12:50:50 UTC
++++ Makefile.in
+@@ -26,26 +26,27 @@ example-code:
+ 	make -C examples
+ 
+ mpsse.o: support.o
+-	$(CC) $(CFLAGS) $(LDFLAGS) -DLIBFTDI1=$(LIBFTDI1) -c mpsse.c
++	$(CC) $(CFLAGS) -DLIBFTDI1=$(LIBFTDI1) -c mpsse.c
+ 
+ fast.o: support.o
+-	$(CC) $(CFLAGS) $(LDFLAGS) -c fast.c
++	$(CC) $(CFLAGS) -c fast.c
+ 
+ support.o:
+-	$(CC) $(CFLAGS) $(LDFLAGS) -DLIBFTDI1=$(LIBFTDI1) -c support.c
++	$(CC) $(CFLAGS) -DLIBFTDI1=$(LIBFTDI1) -c support.c
+ 
+ pyswig-build:
+-	$(CC) $(CFLAGS) $(LDFLAGS) -DSWIGPYTHON -DLIBFTDI1=$(LIBFTDI1) -c support.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -DSWIGPYTHON -DLIBFTDI1=$(LIBFTDI1) -c mpsse.c
++	$(CC) $(CFLAGS) -DSWIGPYTHON -DLIBFTDI1=$(LIBFTDI1) -c support.c -o pyswig_support.o
++	$(CC) $(CFLAGS) -DSWIGPYTHON -DLIBFTDI1=$(LIBFTDI1) -c mpsse.c -o pyswig_mpsse.o
+ 	$(SWIG) -python $(TARGET).i
+ 	$(CC) $(CFLAGS) -c  -DLIBFTDI1=$(LIBFTDI1) $(TARGET)_wrap.c  $(INC)
+-	$(CC) $(CFLAGS) -shared $(FRAMEWORK) $(TARGET)_wrap.o mpsse.o support.o \
++	$(CC) $(CFLAGS) -shared $(FRAMEWORK) $(TARGET)_wrap.o pyswig_mpsse.o pyswig_support.o \
+ 		-o _pylib$(TARGET).so $(LDFLAGS) $(INC)
+ 
+ pyswig-install:
+-	install -D -m644 pylib$(TARGET).py  $(DESTDIR)/$(PYLIB)/pylib$(TARGET).py
+-	install -D -m644 _pylib$(TARGET).so $(DESTDIR)/$(PYLIB)/_pylib$(TARGET).so
+-	install -D -m644 $(TARGET).py       $(DESTDIR)/$(PYLIB)/$(TARGET).py
++	install -d -m755 $(DESTDIR)/$(PYLIB)
++	install -m644 pylib$(TARGET).py  $(DESTDIR)/$(PYLIB)/pylib$(TARGET).py
++	install -m644 _pylib$(TARGET).so $(DESTDIR)/$(PYLIB)/_pylib$(TARGET).so
++	install -m644 $(TARGET).py       $(DESTDIR)/$(PYLIB)/$(TARGET).py
+ 
+ pyswig-uninstall:
+ 	rm -f $(DESTDIR)/$(PYLIB)/$(TARGET).* \
+@@ -58,9 +59,11 @@ py-install:
+ py-uninstall:
+ 
+ install: py$(BUILD)-install
+-	install -D -m644 lib$(TARGET).so $(DESTDIR)/$(LIBDIR)/lib$(TARGET).so
+-	install -D -m644 lib$(TARGET).a  $(DESTDIR)/$(LIBDIR)/lib$(TARGET).a
+-	install -D -m644 $(TARGET).h     $(DESTDIR)/$(INCDIR)/$(TARGET).h
++	install -d -m755 $(DESTDIR)/$(LIBDIR)
++	install -m644 lib$(TARGET).so $(DESTDIR)/$(LIBDIR)/lib$(TARGET).so
++	install -m644 lib$(TARGET).a  $(DESTDIR)/$(LIBDIR)/lib$(TARGET).a
++	install -d -m755 $(DESTDIR)/$(INCDIR)
++	install -m644 $(TARGET).h     $(DESTDIR)/$(INCDIR)/$(TARGET).h
+ 
+ uninstall: py$(BUILD)-uninstall
+ 	rm -f $(DESTDIR)/$(LIBDIR)/lib$(TARGET).so \

Property changes on: head/devel/libmpsse/files/patch-Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/libmpsse/files/patch-configure.ac
===================================================================
--- head/devel/libmpsse/files/patch-configure.ac	(nonexistent)
+++ head/devel/libmpsse/files/patch-configure.ac	(revision 439958)
@@ -0,0 +1,43 @@
+--- configure.ac.orig	2015-06-11 12:50:50 UTC
++++ configure.ac
+@@ -42,6 +42,31 @@ then
+ 		exit 1
+ 	fi
+ 
++	if ! test $PYEXE
++  	then
++    		PYEXE=$(which python2)
++    		if ! test ${PYEXE}
++    		then
++      			PYEXE=$(which python)
++    		fi
++  	fi
++  	echo $PYEXE
++
++  	if ! test $PYDEV
++  	then
++    		for INCL in $(python2-config --includes)
++    		do
++      			echo $INCL
++      			INCL=$(echo "${INCL}" | sed 's:^-I::g')
++      			echo $INCL
++      			if test -f "${INCL}/Python.h"
++      			then
++        			PYDEV="${INCL}"
++        			break;
++      			fi;
++    		done
++  	fi
++
+ 	if ! test $PYDEV
+ 	then
+ 		PYDEV="/usr/include/python$(python -V 2>&1 | awk '{print $2}' | cut -d'.' -f1,2)"
+@@ -54,7 +79,7 @@ then
+ 		dnl This is a hack to get a valid python library path
+ 		echo "import sys" > pylib.py
+ 		echo "for path in sys.path: print path" >> pylib.py
+-		PYLIB="$(python pylib.py | grep -e '-packages$' | head -1)"
++		PYLIB="$(${PYEXE} pylib.py | grep -e '-packages$' | head -1)"
+ 		rm -f pylib.py
+ 	fi
+ 

Property changes on: head/devel/libmpsse/files/patch-configure.ac
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/libmpsse/pkg-descr
===================================================================
--- head/devel/libmpsse/pkg-descr	(revision 439957)
+++ head/devel/libmpsse/pkg-descr	(revision 439958)
@@ -1,6 +1,6 @@
 Open source library for SPI/I2C control via FTDI chips
 
 Libmpsse is a library for interfacing with SPI/I2C devices via FTDI's
 FT-2232 family of USB chips. Based around the libftdi library.
 
-WWW: http://code.google.com/p/libmpsse/
+WWW: http://github.com/devttys0/libmpsse