5 files changed, 57 insertions, 47 deletions

diff --git a/devel/libmpsse/Makefile b/devel/libmpsse/Makefile
index 3bf366b05413..d1fcd0fafb64 100644
--- a/devel/libmpsse/Makefile
+++ b/devel/libmpsse/Makefile
@@ -2,54 +2,40 @@
 
 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
-
-CONFIGURE_WRKSRC=	${WRKSRC}/src
-BUILD_WRKSRC=		${WRKSRC}/src
-INSTALL_WRKSRC=		${WRKSRC}/src
+USE_GITHUB=	yes
+USE_LDCONFIG=	yes
+GH_ACCOUNT=	devttys0
+GH_TAGNAME=	f1a6744b220d
 
-MAKE_JOBS_UNSAFE=	yes
+WRKSRC_SUBDIR=	src
 
 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
-
-pre-install:
-	${MKDIR} ${STAGEDIR}/${LOCALBASE}/lib/
+PLIST_FILES=	lib/libmpsse.so lib/libmpsse.a include/mpsse.h \
+		${PYTHONPREFIX_SITELIBDIR}/_pylibmpsse.so \
+		${PYTHONPREFIX_SITELIBDIR}/mpsse.py \
+		${PYTHONPREFIX_SITELIBDIR}/pylibmpsse.py
 
 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>
diff --git a/devel/libmpsse/distinfo b/devel/libmpsse/distinfo
index fba396234f9c..fa35a223abc0 100644
--- a/devel/libmpsse/distinfo
+++ b/devel/libmpsse/distinfo
@@ -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
diff --git a/devel/libmpsse/files/patch-src_Makefile.in b/devel/libmpsse/files/patch-Makefile.in
index c9be5198873c..53823c2c2677 100644
--- a/devel/libmpsse/files/patch-src_Makefile.in
+++ b/devel/libmpsse/files/patch-Makefile.in
@@ -1,8 +1,31 @@
---- 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 @@
+--- 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
@@ -11,12 +34,12 @@
 +	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 @@
+@@ -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
@@ -26,6 +49,6 @@
 +	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 \
diff --git a/devel/libmpsse/files/patch-src_configure_ac b/devel/libmpsse/files/patch-configure.ac
index 663f8d3654e0..48a476caa92d 100644
--- a/devel/libmpsse/files/patch-src_configure_ac
+++ b/devel/libmpsse/files/patch-configure.ac
@@ -1,9 +1,9 @@
---- 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 @@
+--- 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)
@@ -32,7 +32,7 @@
  	if ! test $PYDEV
  	then
  		PYDEV="/usr/include/python$(python -V 2>&1 | awk '{print $2}' | cut -d'.' -f1,2)"
-@@ -54,7 +79,7 @@
+@@ -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
@@ -40,4 +40,4 @@
 +		PYLIB="$(${PYEXE} pylib.py | grep -e '-packages$' | head -1)"
  		rm -f pylib.py
  	fi
-
+ 
diff --git a/devel/libmpsse/pkg-descr b/devel/libmpsse/pkg-descr
index cb49d6d0419d..f0055466ec5c 100644
--- a/devel/libmpsse/pkg-descr
+++ b/devel/libmpsse/pkg-descr
@@ -3,4 +3,4 @@ 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