Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Nov 2015 13:56:32 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r401569 - in head/audio/rioutil: . files
Message-ID:  <201511141356.tAEDuWJd024143@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sat Nov 14 13:56:32 2015
New Revision: 401569
URL: https://svnweb.freebsd.org/changeset/ports/401569

Log:
  - Add LICENSE
  - Switch to USES=autoreconf
  - Clean the port up

Added:
  head/audio/rioutil/files/patch-configure.ac
     - copied unchanged from r401568, head/audio/rioutil/files/extra-patch-configure.ac
  head/audio/rioutil/files/patch-src_Makefile.am   (contents, props changed)
Deleted:
  head/audio/rioutil/files/extra-patch-configure.ac
  head/audio/rioutil/files/patch-src__Makefile.in
Modified:
  head/audio/rioutil/Makefile
  head/audio/rioutil/pkg-plist

Modified: head/audio/rioutil/Makefile
==============================================================================
--- head/audio/rioutil/Makefile	Sat Nov 14 13:52:42 2015	(r401568)
+++ head/audio/rioutil/Makefile	Sat Nov 14 13:56:32 2015	(r401569)
@@ -10,23 +10,15 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program to interface with the Rio600, Rio800, and psa[play devices
 
-USES=		gmake libtool
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		autoreconf gmake libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.include <bsd.port.pre.mk>
-
-EXTRA_PATCHES=  ${FILESDIR}/extra-patch-configure.ac
-USE_AUTOTOOLS=	autoconf
-
 post-extract:
-#	@${RM} -f ${WRKSRC}/src/getopt*
-# Fix for GCC 4.2
-	@${REINPLACE_CMD} -e 's,read_buffer = .*),(&),' \
-		${WRKSRC}/librioutil/rio.c
+	@${RM} -f ${WRKSRC}/src/getopt*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Copied: head/audio/rioutil/files/patch-configure.ac (from r401568, head/audio/rioutil/files/extra-patch-configure.ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/rioutil/files/patch-configure.ac	Sat Nov 14 13:56:32 2015	(r401569, copy of r401568, head/audio/rioutil/files/extra-patch-configure.ac)
@@ -0,0 +1,17 @@
+--- configure.ac.orig	2009-03-07 01:48:24.000000000 +0300
++++ configure.ac	2009-03-07 01:49:07.000000000 +0300
+@@ -74,13 +74,7 @@
+     AC_MSG_RESULT(yes)
+     AC_DEFINE_UNQUOTED(WITH_LIBUSB)
+ 
+-    AC_PATH_PROG(LIBUSB_CONFIG,libusb-config)
+-    if test -n "${LIBUSB_CONFIG}"; then
+-       CFLAGS="`${LIBUSB_CONFIG} --cflags` $CFLAGS"
+-       LIBS="`${LIBUSB_CONFIG} --libs` $LIBS"
+-    else
+-       AC_MSG_ERROR(Can't find libusb)
+-    fi
++       LIBS="-lusb $LIBS"
+ 
+     AC_CHECK_LIB(usb, usb_open)
+     AC_SUBST(WITH_LIBUSB)

Added: head/audio/rioutil/files/patch-src_Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/rioutil/files/patch-src_Makefile.am	Sat Nov 14 13:56:32 2015	(r401569)
@@ -0,0 +1,20 @@
+--- src/Makefile.am.orig	2006-08-07 15:47:28 UTC
++++ src/Makefile.am
+@@ -1,14 +1,14 @@
+ bin_PROGRAMS = rioutil
+ 
+-INCLUDES = -I$(top_srcdir)/include -I/usr/local/include
++INCLUDES = -I$(top_srcdir)/include
+ 
+-rioutil_SOURCES = main.c getopt.c getopt1.c main.h getopt.h
++rioutil_SOURCES = main.c main.h
+ 
+ if MACOSX
+ rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la -lIOKit
+ PREBIND_FLAGS = -prebind
+ else
+-rioutil_LDADD = -L/usr/local/lib $(top_srcdir)/librioutil/librioutil.la
++rioutil_LDADD = $(top_srcdir)/librioutil/librioutil.la
+ endif
+ 
+ rioutil_LDFLAGS = $(PREBIND_FLAGS)

Modified: head/audio/rioutil/pkg-plist
==============================================================================
--- head/audio/rioutil/pkg-plist	Sat Nov 14 13:52:42 2015	(r401568)
+++ head/audio/rioutil/pkg-plist	Sat Nov 14 13:56:32 2015	(r401569)
@@ -2,5 +2,6 @@ bin/rioutil
 include/rio.h
 lib/librioutil.a
 lib/librioutil.so
+lib/librioutil.so.1
 lib/librioutil.so.1.5.0
 man/man1/rioutil.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511141356.tAEDuWJd024143>