Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Jul 2013 21:35:15 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r322582 - head/audio/timidity++
Message-ID:  <201307092135.r69LZF1B051669@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}



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