From owner-svn-ports-all@FreeBSD.ORG Sat May 10 00:48:47 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DBFF684E; Sat, 10 May 2014 00:48:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C70AED31; Sat, 10 May 2014 00:48:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4A0mk6m076963; Sat, 10 May 2014 00:48:46 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4A0mim0076953; Sat, 10 May 2014 00:48:44 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201405100048.s4A0mim0076953@svn.freebsd.org> From: Dmitry Marakasov Date: Sat, 10 May 2014 00:48:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353559 - in head/audio: timidity++ timidity++-emacs timidity++-gtk timidity++-motif timidity++-slang timidity++-tcltk timidity++-xaw timidity++-xskin 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.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 00:48:47 -0000 Author: amdmi3 Date: Sat May 10 00:48:44 2014 New Revision: 353559 URL: http://svnweb.freebsd.org/changeset/ports/353559 QAT: https://qat.redports.org/buildarchive/r353559/ Log: - Support staging - Use new LIB_DEPENDS syntax - Convert USE_BZIP2 to USES Modified: head/audio/timidity++-emacs/Makefile head/audio/timidity++-gtk/Makefile head/audio/timidity++-motif/Makefile head/audio/timidity++-slang/Makefile head/audio/timidity++-tcltk/Makefile head/audio/timidity++-xaw/Makefile head/audio/timidity++-xskin/Makefile head/audio/timidity++/Makefile head/audio/timidity++/Makefile.interface head/audio/timidity++/pkg-plist Modified: head/audio/timidity++-emacs/Makefile ============================================================================== --- head/audio/timidity++-emacs/Makefile Sat May 10 00:42:11 2014 (r353558) +++ head/audio/timidity++-emacs/Makefile Sat May 10 00:48:44 2014 (r353559) @@ -9,6 +9,5 @@ COMMENT= Emacs interface for TiMidity++ MASTERDIR= ${.CURDIR}/../../audio/timidity++ PLIST_FILES= ${TIMID_LIBDIR}/interface_e.so ${ELISPDIR}/timidity.el -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++-gtk/Makefile ============================================================================== --- head/audio/timidity++-gtk/Makefile Sat May 10 00:42:11 2014 (r353558) +++ head/audio/timidity++-gtk/Makefile Sat May 10 00:48:44 2014 (r353559) @@ -9,6 +9,5 @@ COMMENT= Gtk interface for TiMidity++ MASTERDIR= ${.CURDIR}/../../audio/timidity++ PLIST_FILES= bin/gtkmidi ${TIMID_LIBDIR}/interface_g.so -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++-motif/Makefile ============================================================================== --- head/audio/timidity++-motif/Makefile Sat May 10 00:42:11 2014 (r353558) +++ head/audio/timidity++-motif/Makefile Sat May 10 00:48:44 2014 (r353559) @@ -9,7 +9,6 @@ COMMENT= Motif interface for TiMidity++ MASTERDIR= ${.CURDIR}/../../audio/timidity++ PLIST_FILES= bin/xmmidi ${TIMID_LIBDIR}/interface_m.so -NO_STAGE= yes post-configure: @${MV} ${WRKSRC}/interface/Makefile ${WRKSRC}/interface/Makefile.orig Modified: head/audio/timidity++-slang/Makefile ============================================================================== --- head/audio/timidity++-slang/Makefile Sat May 10 00:42:11 2014 (r353558) +++ head/audio/timidity++-slang/Makefile Sat May 10 00:48:44 2014 (r353559) @@ -10,6 +10,5 @@ COMMENT= Slang interface for TiMidity++ MASTERDIR= ${.CURDIR}/../../audio/timidity++ PLIST_FILES= ${TIMID_LIBDIR}/interface_s.so -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++-tcltk/Makefile ============================================================================== --- head/audio/timidity++-tcltk/Makefile Sat May 10 00:42:11 2014 (r353558) +++ head/audio/timidity++-tcltk/Makefile Sat May 10 00:48:44 2014 (r353559) @@ -7,6 +7,5 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tcl/Tk interface for TiMidity++ MASTERDIR= ${.CURDIR}/../../audio/timidity++ -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++-xaw/Makefile ============================================================================== --- head/audio/timidity++-xaw/Makefile Sat May 10 00:42:11 2014 (r353558) +++ head/audio/timidity++-xaw/Makefile Sat May 10 00:48:44 2014 (r353559) @@ -7,6 +7,5 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Xaw interface for TiMidity++ MASTERDIR= ${.CURDIR}/../../audio/timidity++ -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++-xskin/Makefile ============================================================================== --- head/audio/timidity++-xskin/Makefile Sat May 10 00:42:11 2014 (r353558) +++ head/audio/timidity++-xskin/Makefile Sat May 10 00:48:44 2014 (r353559) @@ -7,6 +7,5 @@ MAINTAINER= ports@FreeBSD.org COMMENT= X11AMP skin interface for TiMidity++ MASTERDIR= ${.CURDIR}/../../audio/timidity++ -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++/Makefile ============================================================================== --- head/audio/timidity++/Makefile Sat May 10 00:42:11 2014 (r353558) +++ head/audio/timidity++/Makefile Sat May 10 00:48:44 2014 (r353559) @@ -19,12 +19,9 @@ RUN_DEPENDS= ${LOCALBASE}/share/timidity CONFLICTS= timidity-0.* .endif -USES= gmake -NO_STAGE= yes -USE_BZIP2= yes +USES= tar:bzip2 gmake GNU_CONFIGURE= yes - PLIST_SUB+= TIMID_LIBDIR=${TIMID_LIBDIR} EUCJP_LOCALE=${EUCJP_LOCALE} EUCJP_LOCALE= ja_JP.eucJP @@ -47,10 +44,6 @@ LDFLAGS+= -export-dynamic DOCFILES= README.alsaseq README.dl README.m2m README.mts README.sf DOCLANG= C ja_JP.eucJP -MANLANG= "" ja -MAN1= timidity.1 -MAN5= timidity.cfg.5 - .if defined(WITHOUT_X11) CONFIGURE_ARGS+=--without-x --disable-spectrogram --disable-wrd --disable-dynamic .else @@ -70,13 +63,13 @@ CONFIGURE_ARGS+=--enable-audio=oss,vorbi .endif pre-su-install: - @${MKDIR} ${PREFIX}/share/timidity ${PREFIX}/${TIMID_LIBDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/timidity ${STAGEDIR}${PREFIX}/${TIMID_LIBDIR} post-install:: ${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.1 \ - ${PREFIX}/man/ja/man1 + ${STAGEDIR}${PREFIX}/man/ja/man1 ${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.cfg.5 \ - ${PREFIX}/man/ja/man5 + ${STAGEDIR}${PREFIX}/man/ja/man5 .else # defined(PKGNAMESUFFIX) .include "${MASTERDIR}/Makefile.interface" .endif # !defined(PKGNAMESUFFIX) @@ -84,13 +77,10 @@ post-install:: post-install:: .if ${PORT_OPTIONS:MDOCS} && defined(DOCFILES) .for lang in ${DOCLANG} - ${MKDIR} ${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++ + ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++ cd ${WRKSRC}/doc/${lang} && ${INSTALL_DATA} ${DOCFILES} \ - ${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++/ + ${STAGEDIR}${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++/ .endfor .endif -.if exists(${PKGMESSAGE}) - @${CAT} ${PKGMESSAGE} -.endif .include Modified: head/audio/timidity++/Makefile.interface ============================================================================== --- head/audio/timidity++/Makefile.interface Sat May 10 00:42:11 2014 (r353558) +++ head/audio/timidity++/Makefile.interface Sat May 10 00:48:44 2014 (r353559) @@ -14,7 +14,7 @@ INTERFACE= ${PKGNAMESUFFIX:S/^-//} DESCR= ${.CURDIR}/pkg-descr .if exists(${.CURDIR}/pkg-plist) -PLIST= ${.CURDIR}/pkg-plist +PLIST= ${.CURDIR}/pkg-plist .else PLIST= ${NONEXISTENT} .endif @@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--with-includes=${LOCALB --enable-ncurses LDFLAGS+= -L${LOCALBASE}/lib -LIB_DEPENDS+= slang.2:${PORTSDIR}/japanese/libslang +LIB_DEPENDS+= libslang.so:${PORTSDIR}/japanese/libslang .endif .if ${INTERFACE} == "tcltk" @@ -70,14 +70,14 @@ DOCFILES= README.tk DOCLANG= C ja_JP.eucJP .if defined(JAPANESE) -LIB_DEPENDS+= tk80jp.1:${PORTSDIR}/japanese/tk80 +LIB_DEPENDS+= libtk80jp.so:${PORTSDIR}/japanese/tk80 CONFIGURE_ARGS+= --with-tcl-includes=${LOCALBASE}/include/tcl8.0jp \ --with-tk-includes=${LOCALBASE}/include/tk8.0jp \ --with-tcl-libs=${LOCALBASE}/lib --with-tk-libs=${LOCALBASE}/lib CONFIGURE_ENV+= WISH=wish8.0jp .else -LIB_DEPENDS+= tk84:${PORTSDIR}/x11-toolkits/tk84 +LIB_DEPENDS+= libtk84.so:${PORTSDIR}/x11-toolkits/tk84 CONFIGURE_ARGS+= --with-tcl-includes=${LOCALBASE}/include/tcl8.4 \ --with-tk-includes=${LOCALBASE}/include/tk8.4 \ @@ -110,16 +110,16 @@ DOCLANG= C ja_JP.eucJP post-install:: .if ${INTERFACE} == "emacs" - @${MKDIR} ${PREFIX}/${ELISPDIR} - ${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${PREFIX}/${ELISPDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR} + ${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${STAGEDIR}${PREFIX}/${ELISPDIR} .endif .if ${INTERFACE} == "xaw" - @${MKDIR} ${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults ${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \ - ${PREFIX}/lib/X11/app-defaults/TiMidity + ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/TiMidity ${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \ - ${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity + ${STAGEDIR}${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity .endif .if defined(LINK) - ${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK} + ${LN} -sf ${PREFIX}/bin/timidity ${STAGEDIR}${PREFIX}/bin/${LINK} .endif Modified: head/audio/timidity++/pkg-plist ============================================================================== --- head/audio/timidity++/pkg-plist Sat May 10 00:42:11 2014 (r353558) +++ head/audio/timidity++/pkg-plist Sat May 10 00:48:44 2014 (r353559) @@ -1,4 +1,8 @@ bin/timidity +man/ja/man1/timidity.1.gz +man/ja/man5/timidity.cfg.5.gz +man/man1/timidity.1.gz +man/man5/timidity.cfg.5.gz %%PORTDOCS%%%%DOCSDIR%%/README.alsaseq %%PORTDOCS%%%%DOCSDIR%%/README.dl %%PORTDOCS%%%%DOCSDIR%%/README.m2m @@ -11,7 +15,5 @@ bin/timidity %%PORTDOCS%%share/doc/ja/timidity++/README.sf %%PORTDOCS%%@dirrm share/doc/ja/timidity++/ %%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec mkdir -p %D/%%TIMID_LIBDIR%% -@exec mkdir -p %D/share/timidity @dirrmtry %%TIMID_LIBDIR%% @dirrmtry share/timidity