- Update to 0.94

- Fix LICENSE and move upward
- Convert to USES=localbase
- Whitespace fix
- Actually build the FreeBSD driver for > 10.x
- Sort pkg-plist

3 files changed, 36 insertions, 36 deletions

diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index ec5a9454f07c..9d6d1a06f24d 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -2,33 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	libcdio
-PORTVERSION=	0.93
+PORTVERSION=	0.94
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compact Disc Input and Control Library
 
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libcddb.so:audio/libcddb
 
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
+USES=		cpe gmake iconv localbase libtool \
+		ncurses pathfix perl5 pkgconfig
+USE_PERL5=	build
+USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-USES=		cpe pathfix pkgconfig iconv libtool ncurses gmake perl5
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG}
-USE_PERL5=	build
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
+LIBS+=		${ICONV_LIB}
 
 INFO=		libcdio
 CPE_VENDOR=	gnu
-INSTALL_TARGET=install-strip
-
-.include <bsd.port.pre.mk>
+INSTALL_TARGET=	install-strip
 
 post-patch:
-	${REINPLACE_CMD} -e "s,freebsd5\.\*,freebsd*," ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|freebsd10\.\*|freebsd*|g' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/libcdio/distinfo b/sysutils/libcdio/distinfo
index 7ddd6ec253ed..a7c4ab1d888f 100644
--- a/sysutils/libcdio/distinfo
+++ b/sysutils/libcdio/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libcdio-0.93.tar.gz) = 4972cd22fd8d0e8bff922d35c7a645be0db0ab0e7b3dfaecc9cd8272429d6975
-SIZE (libcdio-0.93.tar.gz) = 2723371
+TIMESTAMP = 1484801785
+SHA256 (libcdio-0.94.tar.gz) = 96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a
+SIZE (libcdio-0.94.tar.gz) = 2355452
diff --git a/sysutils/libcdio/pkg-plist b/sysutils/libcdio/pkg-plist
index a48328eaa7d7..c7941cf2f56b 100644
--- a/sysutils/libcdio/pkg-plist
+++ b/sysutils/libcdio/pkg-plist
@@ -5,6 +5,16 @@ bin/cdda-player
 bin/iso-info
 bin/iso-read
 bin/mmc-tool
+include/cdio++/cdio.hpp
+include/cdio++/cdtext.hpp
+include/cdio++/device.hpp
+include/cdio++/devices.hpp
+include/cdio++/disc.hpp
+include/cdio++/enum.hpp
+include/cdio++/iso9660.hpp
+include/cdio++/mmc.hpp
+include/cdio++/read.hpp
+include/cdio++/track.hpp
 include/cdio/audio.h
 include/cdio/bytesex.h
 include/cdio/bytesex_asm.h
@@ -38,41 +48,31 @@ include/cdio/utf8.h
 include/cdio/util.h
 include/cdio/version.h
 include/cdio/xa.h
-include/cdio++/cdio.hpp
-include/cdio++/cdtext.hpp
-include/cdio++/device.hpp
-include/cdio++/devices.hpp
-include/cdio++/disc.hpp
-include/cdio++/enum.hpp
-include/cdio++/iso9660.hpp
-include/cdio++/mmc.hpp
-include/cdio++/read.hpp
-include/cdio++/track.hpp
-lib/libcdio.a
-lib/libcdio.so
-lib/libcdio.so.16
-lib/libcdio.so.16.0.0
 lib/libcdio++.a
 lib/libcdio++.so
 lib/libcdio++.so.0
 lib/libcdio++.so.0.0.2
-lib/libiso9660.a
-lib/libiso9660.so
-lib/libiso9660.so.10
-lib/libiso9660.so.10.0.0
+lib/libcdio.a
+lib/libcdio.so
+lib/libcdio.so.16
+lib/libcdio.so.16.0.0
 lib/libiso9660++.a
 lib/libiso9660++.so
 lib/libiso9660++.so.0
 lib/libiso9660++.so.0.0.0
+lib/libiso9660.a
+lib/libiso9660.so
+lib/libiso9660.so.10
+lib/libiso9660.so.10.0.0
 lib/libudf.a
 lib/libudf.so
 lib/libudf.so.0
 lib/libudf.so.0.0.0
-libdata/pkgconfig/libcdio.pc
-libdata/pkgconfig/libudf.pc
 libdata/pkgconfig/libcdio++.pc
+libdata/pkgconfig/libcdio.pc
 libdata/pkgconfig/libiso9660++.pc
 libdata/pkgconfig/libiso9660.pc
+libdata/pkgconfig/libudf.pc
 man/man1/cd-drive.1.gz
 man/man1/cd-info.1.gz
 man/man1/cd-read.1.gz