5 files changed, 76 insertions, 20 deletions

diff --git a/audio/libgig/Makefile b/audio/libgig/Makefile
index 8e4d01b3221d..63ad07732894 100644
--- a/audio/libgig/Makefile
+++ b/audio/libgig/Makefile
@@ -2,28 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	libgig
-PORTVERSION=	3.3.0
-PORTREVISION=	4
+DISTVERSION=	4.0.0
 CATEGORIES=	audio
 MASTER_SITES=	SF/qsampler/${PORTNAME}/${PORTVERSION} \
 		http://download.linuxsampler.org/packages/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Gigasampler file loader library
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libFLAC.so:audio/flac \
-		libsndfile.so:audio/libsndfile \
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
 		libuuid.so:misc/e2fsprogs-libuuid
 
-USES=		tar:bzip2 gmake pathfix pkgconfig libtool
+USES=		gmake libtool pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${PREFIX}/lib/libgig
 INSTALL_TARGET=	install-strip
-MAKE_JOBS_UNSAFE=yes
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/libgig/distinfo b/audio/libgig/distinfo
index 567a8a1076a8..d33879c33805 100644
--- a/audio/libgig/distinfo
+++ b/audio/libgig/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libgig-3.3.0.tar.bz2) = d22a3c7ba13d920c1d4b6c218107ad105622ae9d1236ffbce007b98547774425
-SIZE (libgig-3.3.0.tar.bz2) = 338119
+TIMESTAMP = 1511122871
+SHA256 (libgig-4.0.0.tar.bz2) = 5f4db3fbc4effe1b85dd1a2ff791fd3fc418afa6a79cd497f9de5e5c25af28f3
+SIZE (libgig-4.0.0.tar.bz2) = 700905
diff --git a/audio/libgig/files/patch-src_Akai.h b/audio/libgig/files/patch-src_Akai.h
new file mode 100644
index 000000000000..3a6bfc2ac85a
--- /dev/null
+++ b/audio/libgig/files/patch-src_Akai.h
@@ -0,0 +1,20 @@
+--- src/Akai.h.orig	2017-11-19 20:27:40 UTC
++++ src/Akai.h
+@@ -30,7 +30,7 @@
+ # include <config.h>
+ #endif
+ 
+-#if !defined(_CARBON_) && !defined(__APPLE__) && !defined(WIN32)
++#if !defined(_CARBON_) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(WIN32)
+ # define LINUX 1
+ #endif
+ 
+@@ -146,7 +146,7 @@ public:
+ protected:
+ #ifdef WIN32
+   HANDLE mFile;
+-#elif defined _CARBON_ || defined(__APPLE__) || LINUX
++#elif defined _CARBON_ || defined(__APPLE__) || defined(__FreeBSD__) || LINUX
+   int mFile;
+ #endif
+   bool mRegularFile;
diff --git a/audio/libgig/files/patch-src_DLS.h b/audio/libgig/files/patch-src_DLS.h
new file mode 100644
index 000000000000..3763546ea0f1
--- /dev/null
+++ b/audio/libgig/files/patch-src_DLS.h
@@ -0,0 +1,13 @@
+--- src/DLS.h.orig	2017-11-19 20:25:36 UTC
++++ src/DLS.h
+@@ -517,8 +517,10 @@ namespace DLS {
+             virtual ~File();
+         protected:
+             typedef std::list<Sample*>     SampleList;
++        public: // otherwise it breaks in build
+             typedef std::list<Instrument*> InstrumentList;
+ 
++        protected:
+             RIFF::File*              pRIFF;
+             std::list<RIFF::File*>   ExtensionFiles;
+             SampleList*              pSamples;
diff --git a/audio/libgig/pkg-plist b/audio/libgig/pkg-plist
index 822ed8fbedb8..132212524dcc 100644
--- a/audio/libgig/pkg-plist
+++ b/audio/libgig/pkg-plist
@@ -1,16 +1,42 @@
+bin/akaidump
+bin/akaiextract
 bin/dlsdump
+bin/gig2mono
+bin/gig2stereo
 bin/gigdump
 bin/gigextract
+bin/gigmerge
+bin/korg2gig
+bin/korgdump
 bin/rifftree
-include/DLS.h
-include/RIFF.h
-include/gig.h
-lib/libgig.a
-lib/libgig.so
-lib/libgig.so.6
-lib/libgig.so.6.4.0
+bin/sf2dump
+bin/sf2extract
+include/libgig/Akai.h
+include/libgig/DLS.h
+include/libgig/Korg.h
+include/libgig/RIFF.h
+include/libgig/SF.h
+include/libgig/gig.h
+lib/libgig/libakai.a
+lib/libgig/libakai.so
+lib/libgig/libakai.so.0
+lib/libgig/libakai.so.0.0.0
+lib/libgig/libgig.a
+lib/libgig/libgig.so
+lib/libgig/libgig.so.7
+lib/libgig/libgig.so.7.0.0
+libdata/pkgconfig/akai.pc
 libdata/pkgconfig/gig.pc
+man/man1/akaidump.1.gz
+man/man1/akaiextract.1.gz
 man/man1/dlsdump.1.gz
+man/man1/gig2mono.1.gz
+man/man1/gig2stereo.1.gz
 man/man1/gigdump.1.gz
 man/man1/gigextract.1.gz
+man/man1/gigmerge.1.gz
+man/man1/korg2gig.1.gz
+man/man1/korgdump.1.gz
 man/man1/rifftree.1.gz
+man/man1/sf2dump.1.gz
+man/man1/sf2extract.1.gz