4 files changed, 68 insertions, 11 deletions

diff --git a/audio/libsidplayfp/Makefile b/audio/libsidplayfp/Makefile
index 6276f8c2d9f4..085e5fde79ef 100644
--- a/audio/libsidplayfp/Makefile
+++ b/audio/libsidplayfp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libsidplayfp
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.0
 CATEGORIES=	audio
 MASTER_SITES=	SF/sidplay-residfp/libsidplayfp/${PORTVERSION:R}
 
@@ -15,12 +15,53 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-SIDPLAYFP_SHLIB_VER=	3.0.12
-STILVIEW_SHLIB_VER=	0.0.1
+PORTDOCS=	NEWS README TODO
+
+OPTIONS_DEFINE=	DEBUG DOCS DOXYGEN
+DEBUG_CONFIGURE_ON=	--enable-debug=full
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+
+OPTIONS_MULTI=	OPTIMIZATION
+OPTIONS_MULTI_OPTIMIZATION=	BHINTS INLINE MMX
+OPTIONS_DEFAULT=	BHINTS INLINE
+OPTIMIZATION_DESC=	Increase performance by optimization
+BHINTS_DESC=	Enable branch hints in reSID engine
+BHINTS_CONFIGURE_ENABLE=	branch-hints
+INLINE_DESC=	Enable inlining in reSID engine at bigger code size
+INLINE_CONFIGURE_ENABLE=	inline
+MMX_DESC=	Enable MMX code in reSIDfp for old x86 non-SSE2 CPU
+MMX_CONFIGURE_ENABLE=	mmx
+
+BUILD_DEPENDS+=	xa65:${PORTSDIR}/devel/xa65
+
+.include <bsd.port.options.mk>
+
+SIDPLAYFP_SHLIB_VERSION=	3.1.0
+STILVIEW_SHLIB_VERSION=	0.0.2
 PLIST_SUB+=	\
-		SIDPLAYFP_SHLIB_MVER=${SIDPLAYFP_SHLIB_VER:C/\.[[:digit:].]+//} \
-		SIDPLAYFP_SHLIB_VER=${SIDPLAYFP_SHLIB_VER} \
-		STILVIEW_SHLIB_MVER=${STILVIEW_SHLIB_VER:C/\.[[:digit:].]+//} \
-		STILVIEW_SHLIB_VER=${STILVIEW_SHLIB_VER}
+	SIDPLAYFP_SHLIB_VER=${SIDPLAYFP_SHLIB_VERSION:C/\.[[:digit:].]+//} \
+	SIDPLAYFP_SHLIB_VERSION=${SIDPLAYFP_SHLIB_VERSION} \
+	STILVIEW_SHLIB_VER=${STILVIEW_SHLIB_VERSION:C/\.[[:digit:].]+//} \
+	STILVIEW_SHLIB_VERSION=${STILVIEW_SHLIB_VERSION}
+
+post-build:
+.if ${PORT_OPTIONS:MDOXYGEN}
+	cd ${WRKSRC} && ${MAKE} doc
+.endif
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ; \
+	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+.endif
+.if ${PORT_OPTIONS:MDOXYGEN}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html ; \
+	${INSTALL_MAN} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}/html ; \
+	${RM} -f ${WRKDIR}/PLIST.doc ; \
+	${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \
+		${SED} 's|${STAGEDIR}${PREFIX}/||' \
+		>> ${WRKDIR}/PLIST.doc
+	cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST}
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/libsidplayfp/distinfo b/audio/libsidplayfp/distinfo
index a34c17cc50fb..ca377a93f883 100644
--- a/audio/libsidplayfp/distinfo
+++ b/audio/libsidplayfp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libsidplayfp-1.5.0.tar.gz) = d14806211899df82499445dd197925f95918e5b54e364bcab29b16455deac181
-SIZE (libsidplayfp-1.5.0.tar.gz) = 638301
+SHA256 (libsidplayfp-1.6.0.tar.gz) = bc0e7a612a136e2b173a6fea967db9fe558615eb3bf6a5890b346f75c3eaa013
+SIZE (libsidplayfp-1.6.0.tar.gz) = 646009
diff --git a/audio/libsidplayfp/files/patch-Makefile.in b/audio/libsidplayfp/files/patch-Makefile.in
new file mode 100644
index 000000000000..d054c92cf099
--- /dev/null
+++ b/audio/libsidplayfp/files/patch-Makefile.in
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	2014-10-11 19:24:48.000000000 +0900
++++ Makefile.in	2014-10-23 21:48:16.000000000 +0900
+@@ -1982,10 +1982,10 @@
+ @HAVE_DOXYGEN_TRUE@	rm -fr $(builddir)/docs/html
+ 
+ sidplayfp/psiddrv.o65:
+-	xa -R -G $(srcdir)/sidplayfp/psiddrv.a65 -o $@
++	xa65 -R -G $(srcdir)/sidplayfp/psiddrv.a65 -o $@
+ 
+ sidplayfp/psiddrv.bin: sidplayfp/psiddrv.o65
+-	od -v -An -w8 -tx1 $< | sed -re 's/[[:alnum:]]+/0x&,/g' > sidplayfp/psiddrv.bin
++	od -v -An -tx1 $< | sed -re 's/[[:alnum:]]+/0x&,/g' | rs 0 8 > sidplayfp/psiddrv.bin
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/audio/libsidplayfp/pkg-plist b/audio/libsidplayfp/pkg-plist
index 5d42f5d971ed..540b8feadab2 100644
--- a/audio/libsidplayfp/pkg-plist
+++ b/audio/libsidplayfp/pkg-plist
@@ -14,11 +14,12 @@ include/stilview/stil.h
 include/stilview/stildefs.h
 lib/libsidplayfp.a
 lib/libsidplayfp.so
-lib/libsidplayfp.so.%%SIDPLAYFP_SHLIB_MVER%%
 lib/libsidplayfp.so.%%SIDPLAYFP_SHLIB_VER%%
+lib/libsidplayfp.so.%%SIDPLAYFP_SHLIB_VERSION%%
 lib/libstilview.a
 lib/libstilview.so
-lib/libstilview.so.%%STILVIEW_SHLIB_MVER%%
 lib/libstilview.so.%%STILVIEW_SHLIB_VER%%
+lib/libstilview.so.%%STILVIEW_SHLIB_VERSION%%
 libdata/pkgconfig/libsidplayfp.pc
 libdata/pkgconfig/libstilview.pc
+@comment Insert PLIST.doc here