[Midnightbsd-cvs] mports [18472] trunk/audio/libofa: fix license

[laffer1 at midnightbsd.org]

Revision: 18472
          http://svnweb.midnightbsd.org/mports/?rev=18472
Author:   laffer1
Date:     2015-03-29 13:20:14 -0400 (Sun, 29 Mar 2015)
Log Message:
-----------
fix license

Modified Paths:
--------------
    trunk/audio/libofa/Makefile
    trunk/audio/libofa/pkg-plist

Added Paths:
-----------
    trunk/audio/libofa/files/patch-examples_uselame.cpp
    trunk/audio/libofa/files/patch-examples_wavefile.cpp

Modified: trunk/audio/libofa/Makefile
===================================================================
--- trunk/audio/libofa/Makefile	2015-03-29 17:18:20 UTC (rev 18471)
+++ trunk/audio/libofa/Makefile	2015-03-29 17:20:14 UTC (rev 18472)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libofa
 PORTVERSION=	0.9.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 
@@ -10,19 +10,23 @@
 COMMENT=	The Open Fingerprint Architecture Library
 LICENSE=	gpl2
 
-LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
-		expat:${PORTSDIR}/textproc/expat2 \
-		curl:${PORTSDIR}/ftp/curl
+LICENSE=		APL1 gpl2
+LICENSE_COMB=		dual
+LICENSE_GROUPS_APL1=	OSI
+LICENSE_NAME_APL1=	Adaptive Public License version 1.0
+LICENSE_FILE_APL1=	${WRKSRC}/COPYING
+LICENSE_PERMS_APL1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libcurl.so:${PORTSDIR}/ftp/curl
+
 PROJECTHOST=	musicip-libofa
-USE_DOS2UNIX=	yes
-USES=	libtool
-USE_PATHFIX=	yes
-USE_PKGCONFIG=	yes
+USES=		dos2unix libtool pathfix
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>

Added: trunk/audio/libofa/files/patch-examples_uselame.cpp
===================================================================
--- trunk/audio/libofa/files/patch-examples_uselame.cpp	                        (rev 0)
+++ trunk/audio/libofa/files/patch-examples_uselame.cpp	2015-03-29 17:20:14 UTC (rev 18472)
@@ -0,0 +1,10 @@
+--- examples/uselame.cpp.orig	2013-09-12 09:10:31.000000000 +0000
++++ examples/uselame.cpp	2013-09-12 09:10:42.000000000 +0000
+@@ -12,6 +12,7 @@
+ #else
+ #include <sys/wait.h>
+ #endif
++#include <unistd.h>
+ 
+ AudioData *loadWaveFile(char *file);
+ 


Property changes on: trunk/audio/libofa/files/patch-examples_uselame.cpp
___________________________________________________________________
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
Added: trunk/audio/libofa/files/patch-examples_wavefile.cpp
===================================================================
--- trunk/audio/libofa/files/patch-examples_wavefile.cpp	                        (rev 0)
+++ trunk/audio/libofa/files/patch-examples_wavefile.cpp	2015-03-29 17:20:14 UTC (rev 18472)
@@ -0,0 +1,11 @@
+--- examples/wavefile.cpp.orig	2013-09-12 08:58:25.000000000 +0000
++++ examples/wavefile.cpp	2013-09-12 08:58:31.000000000 +0000
+@@ -11,6 +11,8 @@
+ #include "io.h"
+ #endif
+ #include <fcntl.h>
++#include <sys/types.h>
++#include <unistd.h>
+ 
+ static bool readBytes(int fd, unsigned char *buf, int size) {
+     int ct = 0;


Property changes on: trunk/audio/libofa/files/patch-examples_wavefile.cpp
___________________________________________________________________
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
Modified: trunk/audio/libofa/pkg-plist
===================================================================
--- trunk/audio/libofa/pkg-plist	2015-03-29 17:18:20 UTC (rev 18471)
+++ trunk/audio/libofa/pkg-plist	2015-03-29 17:20:14 UTC (rev 18472)
@@ -1,7 +1,6 @@
 include/ofa1/ofa.h
 lib/libofa.a
-lib/libofa.la
 lib/libofa.so
 lib/libofa.so.0
+lib/libofa.so.0.0.0
 libdata/pkgconfig/libofa.pc
- at dirrm include/ofa1