*/*: sync with upstream

Taken from: FreeBSD

astro/libroadnav/Makefile

@@ -10,6 +10,9 @@ MASTER_SITES=	SF/roadnav/LibRoadnav/${PORTVERSION}
 MAINTAINER=	[email protected]
 COMMENT=	Helper library for Roadnav (3D GPS mapping program)
 
+DEPRECATED=	No releases for 8+ years, no supporting newer wxWidget
+EXPIRATION_DATE=	2015-12-13
+
 OPTIONS_DEFINE=	DOCS
 
 USE_WX=		2.8+

astro/readosm/Makefile

@@ -5,7 +5,7 @@ PORTNAME=	readosm
 PORTVERSION=	1.0.0
 CATEGORIES=	astro geography devel
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
-DISTNAME=	${PORTNAME}-${PORTVERSION}d
+DISTNAME=	${PORTNAME}-${PORTVERSION}e
 
 MAINTAINER=	[email protected]
 COMMENT=	Extract valid data from within an Open Street Map input file
@@ -15,9 +15,9 @@ LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}d
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}e
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pkgconfig pathfix
+USES=		gmake libtool pathfix pkgconfig
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}

astro/readosm/distinfo

@@ -1,2 +1,2 @@
-SHA256 (readosm-1.0.0d.tar.gz) = f056d26489610699802a2a44e315750383af303cf7dcdc580c52bb5ed4d136e3
-SIZE (readosm-1.0.0d.tar.gz) = 1095751
+SHA256 (readosm-1.0.0e.tar.gz) = 1fd839e05b411db6ba1ca6199bf3334ab9425550a58e129c07ad3c6d39299acf
+SIZE (readosm-1.0.0e.tar.gz) = 1096062

astro/roadnav/Makefile

@@ -10,6 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/Roadnav/${PORTVERSION}
 MAINTAINER=	[email protected]
 COMMENT=	3D GPS mapping program
 
+DEPRECATED=	No releases for 8+ years, no supporting newer wxWidget
+EXPIRATION_DATE=	2015-12-13
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/libroadnav.a:${PORTSDIR}/astro/libroadnav
 
 USE_WX=		2.8+

audio/abcde/Makefile

@@ -2,67 +2,69 @@
 # $FreeBSD$
 
 PORTNAME=	abcde
-PORTVERSION=	2.6
+PORTVERSION=	2.7
 CATEGORIES=	audio
 MASTER_SITES=	http://abcde.einval.com/download/
 
 MAINTAINER=	[email protected]
 COMMENT=	Front-end shell script to encode CDs in flac/mp3/ogg/speex format
 
-LICENSE=	GPLv2
+LICENSE=	ART10 GPLv2
+LICENSE_COMB=	dual
 
 RUN_DEPENDS=	cd-discid:${PORTSDIR}/audio/cd-discid \
 		cdparanoia:${PORTSDIR}/audio/cdparanoia \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		lame:${PORTSDIR}/audio/lame \
 		${PYTHON_PKGNAMEPREFIX}eyed3>=0.7:${PORTSDIR}/audio/py-eyed3 \
+		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		bash:${PORTSDIR}/shells/bash
 
+NO_ARCH=	yes
 NO_BUILD=	yes
+
 USES=		python:run shebangfix
-SHEBANG_FILES=	${PORTNAME} cddb-tool
+SHEBANG_FILES=	abcde cddb-tool
+
+SUB_FILES=	pkg-message
+
+PLIST_FILES=	bin/abcde bin/cddb-tool etc/abcde.conf.sample \
+		man/man1/abcde.1.gz man/man1/cddb-tool.1.gz
 
 OPTIONS_GROUP=		CODEC RIPPER
 OPTIONS_GROUP_CODEC=	AAC FLAC MPP OPUS SPEEX
 OPTIONS_GROUP_RIPPER=	CDDA2WAV DAGRAB
 OPTIONS_DEFINE=		NORMALIZE REPLAYGAIN
 
-NORMALIZE_DESC?=	Enable normalize support
-REPLAYGAIN_DESC?=	Enable (vorbis|mp3)gain support
-
-AAC_RUN_DEPENDS+=	faac:${PORTSDIR}/audio/faac
-FLAC_RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
-MPP_RUN_DEPENDS+=	mpcenc:${PORTSDIR}/audio/musepack
-OPUS_RUN_DEPENDS+=	opusenc:${PORTSDIR}/audio/opus-tools
-SPEEX_RUN_DEPENDS+=	speexenc:${PORTSDIR}/audio/speex
-CDDA2WAV_RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
-DAGRAB_RUN_DEPENDS+=	dagrab:${PORTSDIR}/audio/dagrab
-NORMALIZE_RUN_DEPENDS+=	normalize:${PORTSDIR}/audio/normalize
-REPLAYGAIN_RUN_DEPENDS+=mp3gain:${PORTSDIR}/audio/mp3gain \
+AAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac
+CDDA2WAV_RUN_DEPENDS=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
+DAGRAB_RUN_DEPENDS=	dagrab:${PORTSDIR}/audio/dagrab
+FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
+MPP_RUN_DEPENDS=	mpcenc:${PORTSDIR}/audio/musepack
+NORMALIZE_DESC=		Enable normalize support
+NORMALIZE_RUN_DEPENDS=	normalize:${PORTSDIR}/audio/normalize
+OPUS_RUN_DEPENDS=	opusenc:${PORTSDIR}/audio/opus-tools
+REPLAYGAIN_DESC=	Enable (vorbis|mp3)gain support
+REPLAYGAIN_RUN_DEPENDS=	mp3gain:${PORTSDIR}/audio/mp3gain \
 			vorbisgain:${PORTSDIR}/audio/vorbisgain
+SPEEX_RUN_DEPENDS=	speexenc:${PORTSDIR}/audio/speex
 
-PLIST_FILES=	bin/abcde bin/cddb-tool etc/abcde.conf.sample \
-		man/man1/abcde.1.gz man/man1/cddb-tool.1.gz
+post-extract:
+	@${LN} -sf abcde.conf ${WRKSRC}/abcde.conf.sample
 
 post-patch:
-	${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \
-		${WRKSRC}/abcde ${WRKSRC}/abcde.1
+	@${REINPLACE_CMD} -e \
+		's|\([[:space:]]\)\(/etc/abcde.conf\)|\1${PREFIX}\2|' \
+		${WRKSRC}/abcde
+	@${REINPLACE_CMD} -e \
+		's|\(fI\)\(/etc/abcde.conf\)|\1${PREFIX}\2|' \
+		${WRKSRC}/abcde.1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/abcde.conf \
-		${STAGEDIR}${PREFIX}/etc/abcde.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/abcde.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${STAGEDIR}${PREFIX}/man/man1
-
-post-install:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Please copy ${PREFIX}/etc/abcde.conf.sample to ~/.abcde.conf"
-	@${ECHO_MSG} "and edit as necessary. Sane defaults have been set."
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "NOTE: If you have been using ${PORTNAME}-2.1.4 or older,"
-	@${ECHO_MSG} "you must start with a fresh ~/.abcde.conf."
-	@${ECHO_MSG} ""
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} abcde cddb-tool \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_DATA} abcde.conf.sample \
+		${STAGEDIR}${PREFIX}/etc)
+	(cd ${WRKSRC} && ${INSTALL_MAN} abcde.1 cddb-tool.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1)
 
 .include <bsd.port.mk>

audio/abcde/distinfo

@@ -1,2 +1,2 @@
-SHA256 (abcde-2.6.tar.gz) = 683ea7e215142784a28afcda4a18d9a2b8f7ef7bcd9c2881ee110a3b86784c78
-SIZE (abcde-2.6.tar.gz) = 105609
+SHA256 (abcde-2.7.tar.gz) = 0148698a09fedcbae37ee9da295afe411a1190cf8ae224b7814d31b5bf737746
+SIZE (abcde-2.7.tar.gz) = 140039

audio/abcde/files/patch-abcde.conf

@@ -1,51 +1,33 @@
---- abcde.conf.orig	2014-12-18 17:39:40.000000000 +0100
-+++ abcde.conf	2014-12-18 17:45:51.000000000 +0100
-@@ -141,13 +141,13 @@
- #CDDAFS=cp
- #CDDISCID=cd-discid
- #CDDBTOOL=cddb-tool
--#EJECT=eject
--#MD5SUM=md5sum
-+EJECT=cdcontrol
-+MD5SUM=md5
- #DISTMP3=distmp3
- #VORBISCOMMENT=vorbiscomment
- #METAFLAC=metaflac
- #NORMALIZE=normalize-audio
--#CDSPEED=eject
-+CDSPEED=cdcontrol
- #VORBISGAIN=vorbisgain
- #MKCUE=mkcue
- #MKTOC=cdrdao
-@@ -215,10 +215,10 @@
- #PIRDOPTS="-p"
- #CDDAFSOPTS="-f"
- #CDDBTOOLOPTS=
--#EJECTOPTS=
-+EJECTOPTS="eject"
- #DISTMP3OPTS=
- #NORMALIZEOPTS=
--#CDSPEEDOPTS="-x"
-+CDSPEEDOPTS="speed"
- #CDSPEEDVALUE=""
- #MKCUEOPTS=""
- #MKTOCOPTS=""
-@@ -245,7 +245,7 @@
- # CD device you want to read from
- # It can be defined as a singletrack flac file, but since it might change from
- # file to file it makes little sense to define it here.
--#CDROM=/dev/cdrom
-+CDROM=/dev/cd0
- # If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d"
- # If we are using the ide-scsi emulation layer, we need to define a "g"
- #CDPARANOIACDROMBUS="d"
-@@ -343,8 +343,7 @@
- # Custom pre-read function
- # By default it does nothing.
- # You can set some things to get abcde function in better ways:
--# * Close the CD tray using eject -t (if available in eject and supported by 
--#   your CD device.
-+# * Close the CD tray using cdcontrol close (if supported by your CD device).
- # * Set the CD speed. You can also use the built-in options, but you can also 
- #   set it here. In Debian, eject -x and cdset -x do the job.
- # KEEP IN MIND that executables included in pre_read must be in your $PATH or
+--- abcde.conf.orig	2015-06-18 12:26:40 UTC
++++ abcde.conf
+@@ -209,7 +209,8 @@
+
+ # Ogg:
+ #VORBIZEOPTS=
+-#OGGENCOPTS=
++#OFFENCOPTS=
++OGGENCOPTS="-q 5"
+
+ # FLAC:
+ # The flac option is a workaround for an error where flac fails
+@@ -323,7 +324,7 @@
+ # (e.g. "ogg") or a combination of them separated with ","
+ # (e.g. "flac,mp3"). Currently recognised and supported are:
+ # "flac", "m4a", "mp3, "mpc", "ogg", "opus", "spx", "vorbis", "wav", "wv", "ape"
+-#OUTPUTTYPE=ogg
++OUTPUTTYPE=ogg
+
+ # Output filename format - change this to reflect your inner desire to
+ # organize things differently than everyone else :)
+@@ -336,9 +337,11 @@
+ # to the files. Remove it from your user defined string if you are getting
+ # files like ".ogg.ogg".
+ #OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
++OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
+
+ # Like OUTPUTFORMAT but for Various Artists discs.
+ #VAOUTPUTFORMAT='Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
++VAOUTPUTFORMAT='${ARTISTFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
+
+ # Like OUTPUTFORMAT and VAOUTPUTFORMAT but for the ONEFILE rips.
+ #ONETRACKOUTPUTFORMAT=$OUTPUTFORMAT

audio/abcde/files/pkg-message.in

@@ -0,0 +1,7 @@
+******************************************************************
+Please copy %%PREFIX%%/etc/abcde.conf.sample to ~/.abcde.conf and
+edit as necessary. Sane defaults have been set.
+
+NOTE: If you have been using abcde-2.1.4 or older, you must start
+with a fresh ~/.abcde.conf.
+******************************************************************

audio/audacity/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	audacity
 PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}-minsrc-${PORTVERSION}
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-minsrc-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USES=		cpe desktop-file-utils gettext gmake pkgconfig shared-mime-info \
 		tar:xz
-USE_WX=		2.8
+USE_WX=		3.0+
 WX_UNICODE=	yes
 WX_COMPS=	wx
 INSTALLS_ICONS=	yes

audio/aumix/Makefile

@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		tar:bzip2
-WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
 		--enable-own-labels \

audio/autozen/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	autozen
 PORTVERSION=	2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://www.sourcefiles.org/Miscellaneous/
 
@@ -12,9 +12,9 @@ COMMENT=	Adjust brain waves with sound
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	GTK2 DOCS
+OPTIONS_DEFINE=	DOCS
 
-USES=		shebangfix perl5
+USES=		shebangfix perl5 pkgconfig
 SHEBANG_FILES=	zentime
 USE_PERL5=	run
 
@@ -27,10 +27,8 @@ DESKTOP_ENTRIES="AutoZen" \
 
 PORTDOCS=	*
 
-GTK2_USES=	pkgconfig
-GTK2_USE=	GNOME=gtk20
-GTK2_MAKE_ENV=	GTK_CONFIG="pkg-config gtk+-2.0"
-GTK2_USE_OFF=	GNOME=gtk12
+USE_GNOME=	gtk20
+MAKE_ENV=	GTK_CONFIG="pkg-config gtk+-2.0"
 
 post-extract:
 	@cd ${WRKSRC} && ${RM} -f autozen seq2wav
@@ -42,7 +40,8 @@ post-patch:
 		 /^PREFIX/s| =| ?=| ; \
 		 s|share/AutoZen|${DATADIR_REL}| ; \
 		 s|gtk-config|$${GTK_CONFIG}|g ; \
-		 s|$$(CC) seq2wav|$$(CC) $$(CFLAGS) seq2wav|' \
+		 s|$$(CC) seq2wav|$$(CC) $$(CFLAGS) seq2wav| ; \
+		 s|-pthread|-lm -pthread|g' \
 		${WRKSRC}/Makefile
 
 do-install:
@@ -51,6 +50,8 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/autozen.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.seq ${STAGEDIR}${DATADIR}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} HTML ${STAGEDIR}${DOCSDIR}
 

audio/mous/Makefile

@@ -23,9 +23,9 @@ OPTIONS_DEFINE=		ALSA ASSEMBLY FAAC FAAD FLAC LAME AO CUE MAC4DECODER \
 			WAVDECODER WAVENCODER WMA
 OPTIONS_DEFAULT=	FAAC FAAD FLAC LAME CUE MAC4DECODER \
 			MPG123 NCURSES OSS QT4 TAGLIB VORBIS WAVDECODER \
-			WAVENCODER WMA
-OPTIONS_DEFAULT_amd64=	ASSEMBLY
-OPTIONS_DEFAULT_i386=	ASSEMBLY
+			WAVENCODER
+OPTIONS_DEFAULT_amd64=	ASSEMBLY WMA
+OPTIONS_DEFAULT_i386=	ASSEMBLY WMA
 
 OPTIONS_SUB=		yes
 

audio/mp3blaster/Makefile

@@ -18,7 +18,7 @@ CONFIGURE_ARGS=	--with-cxxflags="${CXXFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	LIRC SIDPLAY VORBIS DOCS
+OPTIONS_DEFINE=	LIRC NAS SIDPLAY VORBIS DOCS ESOUND
 OPTIONS_DEFAULT=	SIDPLAY VORBIS
 SIDPLAY_DESC=	Sidplayer support
 
@@ -40,13 +40,8 @@ NAS_CONFIGURE_WITH=	nas
 NAS_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
 NAS_LDFLAGS=		-laudio
 
-.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mesound} != ""
-USE_GNOME+=		esound
-CONFIGURE_ARGS+=	--with-esd
-.else
-CONFIGURE_ARGS+=	--without-esd
-.endif
+ESOUND_CONFIGURE_WITH=	esd
+ESOUND_GNOME=		esound
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/share/mp3blaster/win2koi.tbl|${DATADIR}/charmap/win2koi.tbl|' \
@@ -58,4 +53,4 @@ post-install-DOCS-on:
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>