From owner-svn-ports-all@FreeBSD.ORG  Tue Jul  9 21:35:15 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 79663364;
 Tue,  9 Jul 2013 21:35:15 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6B5901E45;
 Tue,  9 Jul 2013 21:35:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r69LZF38051670;
 Tue, 9 Jul 2013 21:35:15 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r69LZF1B051669;
 Tue, 9 Jul 2013 21:35:15 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201307092135.r69LZF1B051669@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 9 Jul 2013 21:35:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322582 - head/audio/timidity++
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jul 2013 21:35:15 -0000

Author: bapt
Date: Tue Jul  9 21:35:14 2013
New Revision: 322582
URL: http://svnweb.freebsd.org/changeset/ports/322582

Log:
  Really fix this time

Modified:
  head/audio/timidity++/Makefile

Modified: head/audio/timidity++/Makefile
==============================================================================
--- head/audio/timidity++/Makefile	Tue Jul  9 21:26:48 2013	(r322581)
+++ head/audio/timidity++/Makefile	Tue Jul  9 21:35:14 2013	(r322582)
@@ -30,6 +30,8 @@ PLIST_SUB+=	TIMID_LIBDIR=${TIMID_LIBDIR}
 EUCJP_LOCALE=	ja_JP.eucJP
 TIMID_LIBDIR=	lib/timidity
 
+.include <bsd.port.options.mk>
+
 .if !defined(PKGNAMESUFFIX)
 WANT_GNOME=	yes
 EXTRACT_AFTER_ARGS=	--exclude '*/libarc/*'	\
@@ -43,8 +45,6 @@ LDFLAGS+=	-export-dynamic
 DOCFILES=	README.alsaseq README.dl README.m2m README.mts README.sf
 DOCLANG=	C ja_JP.eucJP
 
-.include <bsd.port.options.mk>
-
 MANLANG=	"" ja
 MAN1=		timidity.1
 MAN5=		timidity.cfg.5
@@ -58,6 +58,15 @@ LIB_DEPENDS+=	png15:${PORTSDIR}/graphics
 CPPFLAGS+=	-I${LOCALBASE}/include/libpng15
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME=	esound
+CONFIGURE_ARGS+=--enable-audio=oss,esd,vorbis
+.else
+CONFIGURE_ARGS+=--enable-audio=oss,vorbis
+.endif
+
 pre-su-install:
 	@${MKDIR} ${PREFIX}/share/timidity ${PREFIX}/${TIMID_LIBDIR}
 
@@ -70,15 +79,6 @@ post-install::
 .include "${MASTERDIR}/Makefile.interface"
 .endif # !defined(PKGNAMESUFFIX)
 
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mesound}!=""
-USE_GNOME=	esound
-CONFIGURE_ARGS+=--enable-audio=oss,esd,vorbis
-.else
-CONFIGURE_ARGS+=--enable-audio=oss,vorbis
-.endif
-
 post-install::
 .if !defined(NOPORTDOCS) && defined(DOCFILES)
 .for lang in ${DOCLANG}