From owner-svn-ports-all@FreeBSD.ORG Thu Jun 5 07:31:05 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 7AAB0D9D; Thu, 5 Jun 2014 07:31:05 +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 659D828EB; Thu, 5 Jun 2014 07:31:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s557V5Hp002159; Thu, 5 Jun 2014 07:31:05 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s557V0tx002125; Thu, 5 Jun 2014 07:31:00 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201406050731.s557V0tx002125@svn.freebsd.org> From: Martin Wilke Date: Thu, 5 Jun 2014 07:31:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356603 - in head: audio/timidity++ audio/timidity++-emacs audio/timidity++-gtk audio/timidity++-motif audio/timidity++-slang audio/timidity++-tcltk audio/timidity++-xaw 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.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: Thu, 05 Jun 2014 07:31:05 -0000 Author: miwi Date: Thu Jun 5 07:31:00 2014 New Revision: 356603 URL: http://svnweb.freebsd.org/changeset/ports/356603 QAT: https://qat.redports.org/buildarchive/r356603/ Log: - Update to version 2.14.0 PR: 174176 Submitted by: ports fury Added: head/audio/timidity++/files/patch-interface__Makefile.in (contents, props changed) head/audio/timidity++/files/patch-interface__tk_c.c (contents, props changed) head/audio/timidity++/files/patch-timidity__Makefile.in (contents, props changed) Deleted: head/audio/timidity++/files/patch-configure head/audio/timidity++/files/patch-dynamic head/audio/timidity++/files/patch-playmidi head/audio/timidity++/files/patch-x_sherry.c head/audio/timidity++/files/patch-xaw_i.c 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++-tcltk/pkg-plist head/audio/timidity++-xaw/Makefile head/audio/timidity++-xaw/pkg-plist head/audio/timidity++-xskin/Makefile head/audio/timidity++-xskin/pkg-plist head/audio/timidity++/Makefile head/audio/timidity++/Makefile.interface head/audio/timidity++/distinfo head/audio/timidity++/files/patch-Makefile.in head/audio/timidity++/pkg-descr head/audio/timidity++/pkg-plist head/japanese/timidity++-slang/Makefile head/japanese/timidity++-tcltk/Makefile head/japanese/timidity++-tcltk/pkg-plist Modified: head/audio/timidity++-emacs/Makefile ============================================================================== --- head/audio/timidity++-emacs/Makefile Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++-emacs/Makefile Thu Jun 5 07:31:00 2014 (r356603) @@ -8,6 +8,7 @@ COMMENT= Emacs interface for TiMidity++ MASTERDIR= ${.CURDIR}/../../audio/timidity++ -PLIST_FILES= ${TIMID_LIBDIR}/interface_e.so ${ELISPDIR}/timidity.el +PLIST_FILES= ${TIMID_LIBDIR}/if_emacs.so \ + share/emacs/site-lisp/timidity.el .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++-gtk/Makefile ============================================================================== --- head/audio/timidity++-gtk/Makefile Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++-gtk/Makefile Thu Jun 5 07:31:00 2014 (r356603) @@ -8,6 +8,6 @@ COMMENT= Gtk interface for TiMidity++ MASTERDIR= ${.CURDIR}/../../audio/timidity++ -PLIST_FILES= bin/gtkmidi ${TIMID_LIBDIR}/interface_g.so +PLIST_FILES= bin/${LINK} ${TIMID_LIBDIR}/if_gtk.so .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++-motif/Makefile ============================================================================== --- head/audio/timidity++-motif/Makefile Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++-motif/Makefile Thu Jun 5 07:31:00 2014 (r356603) @@ -8,12 +8,6 @@ COMMENT= Motif interface for TiMidity++ MASTERDIR= ${.CURDIR}/../../audio/timidity++ -PLIST_FILES= bin/xmmidi ${TIMID_LIBDIR}/interface_m.so - -post-configure: - @${MV} ${WRKSRC}/interface/Makefile ${WRKSRC}/interface/Makefile.orig - @${SED} -e 's^m_so_libs = $$^m_so_libs = -L${LOCALBASE}/lib ${MOTIFLIB} -lXt -lXext -lSM -lICE -lX11 ^' \ - -e 's^dynamic_targets = $$^dynamic_targets = interface_m.so^' \ - ${WRKSRC}/interface/Makefile.orig > ${WRKSRC}/interface/Makefile +PLIST_FILES= bin/${LINK} ${TIMID_LIBDIR}/if_motif.so .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++-slang/Makefile ============================================================================== --- head/audio/timidity++-slang/Makefile Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++-slang/Makefile Thu Jun 5 07:31:00 2014 (r356603) @@ -6,9 +6,8 @@ PKGNAMESUFFIX= -slang MAINTAINER= ports@FreeBSD.org COMMENT= Slang interface for TiMidity++ - MASTERDIR= ${.CURDIR}/../../audio/timidity++ -PLIST_FILES= ${TIMID_LIBDIR}/interface_s.so +PLIST_FILES= ${TIMID_LIBDIR}/if_${INTERFACE}.so .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++-tcltk/Makefile ============================================================================== --- head/audio/timidity++-tcltk/Makefile Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++-tcltk/Makefile Thu Jun 5 07:31:00 2014 (r356603) @@ -6,6 +6,8 @@ PKGNAMESUFFIX= -tcltk MAINTAINER= ports@FreeBSD.org COMMENT= Tcl/Tk interface for TiMidity++ +OPTIONS_DEFINE= DOCS + MASTERDIR= ${.CURDIR}/../../audio/timidity++ .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++-tcltk/pkg-plist ============================================================================== --- head/audio/timidity++-tcltk/pkg-plist Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++-tcltk/pkg-plist Thu Jun 5 07:31:00 2014 (r356603) @@ -1,21 +1,30 @@ bin/tkmidi +%%TIMID_LIBDIR%%/bitmaps/arrow.xbm %%TIMID_LIBDIR%%/bitmaps/back.xbm +%%TIMID_LIBDIR%%/bitmaps/check.xbm +%%TIMID_LIBDIR%%/bitmaps/fast.xbm %%TIMID_LIBDIR%%/bitmaps/fwrd.xbm +%%TIMID_LIBDIR%%/bitmaps/keydown.xbm +%%TIMID_LIBDIR%%/bitmaps/keyup.xbm %%TIMID_LIBDIR%%/bitmaps/next.xbm +%%TIMID_LIBDIR%%/bitmaps/off.xbm +%%TIMID_LIBDIR%%/bitmaps/on.xbm %%TIMID_LIBDIR%%/bitmaps/pause.xbm %%TIMID_LIBDIR%%/bitmaps/play.xbm %%TIMID_LIBDIR%%/bitmaps/prev.xbm %%TIMID_LIBDIR%%/bitmaps/quit.xbm %%TIMID_LIBDIR%%/bitmaps/random.xbm %%TIMID_LIBDIR%%/bitmaps/repeat.xbm +%%TIMID_LIBDIR%%/bitmaps/slow.xbm %%TIMID_LIBDIR%%/bitmaps/stop.xbm %%TIMID_LIBDIR%%/bitmaps/timidity.xbm %%TIMID_LIBDIR%%/browser.tcl -%%TIMID_LIBDIR%%/interface_k.so +%%TIMID_LIBDIR%%/if_tcltk.so %%TIMID_LIBDIR%%/misc.tcl -%%TIMID_LIBDIR%%/tclIndex %%TIMID_LIBDIR%%/tkmidity.tcl %%TIMID_LIBDIR%%/tkpanel.tcl %%PORTDOCS%%%%DOCSDIR%%/README.tk %%PORTDOCS%%share/doc/ja/timidity++/README.tk +%%PORTDOCS%%@dirrmtry share/doc/ja/timidity++ +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrm %%TIMID_LIBDIR%%/bitmaps Modified: head/audio/timidity++-xaw/Makefile ============================================================================== --- head/audio/timidity++-xaw/Makefile Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++-xaw/Makefile Thu Jun 5 07:31:00 2014 (r356603) @@ -6,6 +6,8 @@ PKGNAMESUFFIX= -xaw MAINTAINER= ports@FreeBSD.org COMMENT= Xaw interface for TiMidity++ +OPTIONS_DEFINE= DOCS + MASTERDIR= ${.CURDIR}/../../audio/timidity++ .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++-xaw/pkg-plist ============================================================================== --- head/audio/timidity++-xaw/pkg-plist Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++-xaw/pkg-plist Thu Jun 5 07:31:00 2014 (r356603) @@ -1,20 +1,10 @@ bin/xawmidi lib/X11/app-defaults/TiMidity lib/X11/%%EUCJP_LOCALE%%/app-defaults/TiMidity -%%TIMID_LIBDIR%%/bitmaps/back.xbm -%%TIMID_LIBDIR%%/bitmaps/fwrd.xbm -%%TIMID_LIBDIR%%/bitmaps/next.xbm -%%TIMID_LIBDIR%%/bitmaps/pause.xbm -%%TIMID_LIBDIR%%/bitmaps/play.xbm -%%TIMID_LIBDIR%%/bitmaps/prev.xbm -%%TIMID_LIBDIR%%/bitmaps/quit.xbm -%%TIMID_LIBDIR%%/bitmaps/random.xbm -%%TIMID_LIBDIR%%/bitmaps/repeat.xbm -%%TIMID_LIBDIR%%/bitmaps/stop.xbm -%%TIMID_LIBDIR%%/bitmaps/timidity.xbm -%%TIMID_LIBDIR%%/interface_a.so +%%TIMID_LIBDIR%%/if_xaw.so %%PORTDOCS%%%%DOCSDIR%%/README.xaw %%PORTDOCS%%share/doc/ja/timidity++/README.xaw -@dirrm %%TIMID_LIBDIR%%/bitmaps +%%PORTDOCS%%@dirrmtry share/doc/ja/timidity++ +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrmtry lib/X11/%%EUCJP_LOCALE%%/app-defaults @dirrmtry lib/X11/%%EUCJP_LOCALE%% Modified: head/audio/timidity++-xskin/Makefile ============================================================================== --- head/audio/timidity++-xskin/Makefile Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++-xskin/Makefile Thu Jun 5 07:31:00 2014 (r356603) @@ -6,6 +6,8 @@ PKGNAMESUFFIX= -xskin MAINTAINER= ports@FreeBSD.org COMMENT= X11AMP skin interface for TiMidity++ +OPTIONS_DEFINE= DOCS + MASTERDIR= ${.CURDIR}/../../audio/timidity++ .include "${MASTERDIR}/Makefile" Modified: head/audio/timidity++-xskin/pkg-plist ============================================================================== --- head/audio/timidity++-xskin/pkg-plist Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++-xskin/pkg-plist Thu Jun 5 07:31:00 2014 (r356603) @@ -1,4 +1,6 @@ bin/xskinmidi -%%TIMID_LIBDIR%%/interface_i.so +%%TIMID_LIBDIR%%/if_xskin.so %%PORTDOCS%%%%DOCSDIR%%/README.xskin %%PORTDOCS%%share/doc/ja/timidity++/README.xskin +%%PORTDOCS%%@dirrmtry share/doc/ja/timidity++ +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% Modified: head/audio/timidity++/Makefile ============================================================================== --- head/audio/timidity++/Makefile Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++/Makefile Thu Jun 5 07:31:00 2014 (r356603) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= timidity++ -PORTVERSION= 2.13.2 -PORTREVISION?= 11 +PORTVERSION= 2.14.0 +PORTREVISION?= 0 CATEGORIES+= audio MASTER_SITES= SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION} DISTNAME= TiMidity++-${PORTVERSION} @@ -11,76 +11,76 @@ DISTNAME= TiMidity++-${PORTVERSION} MAINTAINER?= ports@FreeBSD.org COMMENT?= Software MIDI player -.if !defined(PKGNAMESUFFIX) -LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis \ - libarc.so:${PORTSDIR}/archivers/libarc -RUN_DEPENDS= ${LOCALBASE}/share/timidity/timidity.cfg:${PORTSDIR}/audio/eawpats +LICENSE= GPLv2 # (or later) -CONFLICTS= timidity-0.* +.if !defined(PKGNAMESUFFIX) +LIB_DEPENDS= libarc.so:${PORTSDIR}/archivers/libarc \ + libvorbis.so:${PORTSDIR}/audio/libvorbis +RUN_DEPENDS= eawpats>0:${PORTSDIR}/audio/eawpats .endif -USES= tar:bzip2 gmake +USES= gmake tar:bzip2 GNU_CONFIGURE= yes +CONFIGURE_ENV+= SHLD="${CC} -shared" -PLIST_SUB+= TIMID_LIBDIR=${TIMID_LIBDIR} EUCJP_LOCALE=${EUCJP_LOCALE} - -EUCJP_LOCALE= ja_JP.eucJP -TIMID_LIBDIR= lib/timidity - -OPTIONS_DEFINE= DOCS +CPPFLAGS+= -I${LOCALBASE}/include/libarc -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -Wl,--export-dynamic -.include +PLIST_SUB+= TIMID_LIBDIR="${TIMID_LIBDIR}" EUCJP_LOCALE="${EUCJP_LOCALE}" .if !defined(PKGNAMESUFFIX) -WANT_GNOME= yes -EXTRACT_AFTER_ARGS= --exclude '*/libarc/*' \ - --exclude '*/utils/mblock.h' --exclude '*/utils/memb.h' - -CONFIGURE_ARGS= --enable-interface=ncurses,vt100,server \ - --program-transform-name= --enable-network -CPPFLAGS+= -I${LOCALBASE}/include/libarc -LDFLAGS+= -export-dynamic +OPTIONS_DEFINE= DOCS EAWPLUS ESOUND X11 +OPTIONS_DEFAULT= X11 -DOCFILES= README.alsaseq README.dl README.m2m README.mts README.sf -DOCLANG= C ja_JP.eucJP - -.if defined(WITHOUT_X11) -CONFIGURE_ARGS+=--without-x --disable-spectrogram --disable-wrd --disable-dynamic -.else -CONFIGURE_ARGS+=--with-x --enable-spectrogram --enable-wrd --enable-dynamic -USE_XORG= x11 xext -LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png -CPPFLAGS+= -I${LOCALBASE}/include/libpng15 +EAWPLUS_DESC= Collection of Gravis Ultrasound MIDI patches +EAWPLUS_RUN_DEPENDS= eawplus>0:${PORTSDIR}/audio/eawplus +ESOUND_USE= gnome=esound +ESOUND_CONFIGURE_ON= --enable-audio=oss,esd,vorbis +ESOUND_CONFIGURE_OFF= --enable-audio=oss,vorbis +X11_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +X11_USE= xorg=x11,xext +X11_CONFIGURE_ON= --with-x --enable-spectrogram --enable-wrd \ + --enable-dynamic +X11_CONFIGURE_OFF= --without-x --disable-spectrogram --disable-wrd \ + --disable-dynamic +X11_CPPFLAGS= $$(libpng-config --I_opts) .endif -.include +TIMID_LIBDIR= lib/timidity +EUCJP_LOCALE= ja_JP.eucJP -.if ${HAVE_GNOME:Mesound}!="" -USE_GNOME= esound -CONFIGURE_ARGS+=--enable-audio=oss,esd,vorbis +.include + +.if defined(PKGNAMESUFFIX) +.include "Makefile.interface" .else -CONFIGURE_ARGS+=--enable-audio=oss,vorbis -.endif +USES+= ncurses +CONFIGURE_ARGS+=--enable-interface=ncurses,vt100,server \ + --enable-network -pre-su-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/timidity ${STAGEDIR}${PREFIX}/${TIMID_LIBDIR} +CONFLICTS_INSTALL= timidity-[0-9]* -post-install:: - ${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.1 \ - ${STAGEDIR}${PREFIX}/man/ja/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.cfg.5 \ - ${STAGEDIR}${PREFIX}/man/ja/man5 -.else # defined(PKGNAMESUFFIX) -.include "${MASTERDIR}/Makefile.interface" -.endif # !defined(PKGNAMESUFFIX) +DOCFILES= README.alsaseq README.dl README.m2m README.mts README.sf + +pre-patch: + @${RM} -f ${WRKSRC}/libarc/*.h + @${RM} -f ${WRKSRC}/utils/mblock.h + +pre-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${TIMID_LIBDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/timidity post-install:: -.if ${PORT_OPTIONS:MDOCS} && defined(DOCFILES) -.for lang in ${DOCLANG} - ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++ - cd ${WRKSRC}/doc/${lang} && ${INSTALL_DATA} ${DOCFILES} \ - ${STAGEDIR}${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++/ -.endfor -.endif + (cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_MAN} timidity.1 \ + ${STAGEDIR}${MANPREFIX}/man/ja/man1) + (cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_MAN} timidity.cfg.5 \ + ${STAGEDIR}${MANPREFIX}/man/ja/man5) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc/C && ${INSTALL_DATA} ${DOCFILES} \ + ${STAGEDIR}${DOCSDIR}) + @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME} + (cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} ${DOCFILES} \ + ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}) -.include +.endif # PKGNAMESUFFIX +.include Modified: head/audio/timidity++/Makefile.interface ============================================================================== --- head/audio/timidity++/Makefile.interface Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++/Makefile.interface Thu Jun 5 07:31:00 2014 (r356603) @@ -2,11 +2,13 @@ # Shared by timidity++ interface ports -RUN_DEPENDS+= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++ +BUILD_DEPENDS+= libarc>0:${PORTSDIR}/archivers/libarc +RUN_DEPENDS+= timidity++>0:${PORTSDIR}/audio/timidity++ -SLAVEDIRS= audio/timidity++-gtk audio/timidity++-motif \ - audio/timidity++-slang audio/timidity++-tcltk \ - audio/timidity++-xaw audio/timidity++-xskin \ +SLAVEDIRS= audio/timidity++-emacs audio/timidity++-gtk \ + audio/timidity++-motif audio/timidity++-slang \ + audio/timidity++-tcltk audio/timidity++-xaw \ + audio/timidity++-xskin \ japanese/timidity++-slang japanese/timidity++-tcltk INTERFACE= ${PKGNAMESUFFIX:S/^-//} @@ -18,30 +20,31 @@ PLIST= ${.CURDIR}/pkg-plist .else PLIST= ${NONEXISTENT} .endif + .if exists(${.CURDIR}/pkg-message) PKGMESSAGE= ${.CURDIR}/pkg-message .else PKGMESSAGE= ${NONEXISTENT} .endif -CONFIGURE_ENV+= SHLD="${CC} -shared ${LDFLAGS}" -LDFLAGS+= -export-dynamic - -CONFIGURE_ARGS+=--enable-dynamic=${INTERFACE} - BUILD_WRKSRC= ${WRKSRC}/interface INSTALL_WRKSRC= ${WRKSRC}/interface +CONFIGURE_ARGS+=--enable-dynamic=${INTERFACE} + # interface section .if ${INTERFACE} == "emacs" -ELISPDIR= share/emacs/site-lisp +CONFIGURE_ARGS+=--with-lispdir=${PREFIX}/share/emacs/site-lisp .endif .if ${INTERFACE} == "gtk" LINK= gtkmidi -USE_GNOME= gtk12 +USES+= pkgconfig +USE_GNOME= gtk20 + +DESKTOP_ENTRIES="GtkMidi" "" "" "${LINK}" "GTK;AudioVideo;Audio;Midi;" "" .endif .if ${INTERFACE} == "motif" @@ -49,52 +52,64 @@ LINK= xmmidi USES+= motif -CONFIGURE_ENV+= MOTIFLIB="${MOTIFLIB}" +DESKTOP_ENTRIES="XmMidi" "" "" "${LINK}" "Motif;AudioVideo;Audio;Midi;" "" .endif .if ${INTERFACE} == "slang" -CONFIGURE_ARGS+=--with-includes=${LOCALBASE}/include \ +.if defined(JAPANESE) +LIB_DEPENDS+= libslang.so:${PORTSDIR}/japanese/libslang +.else +LIB_DEPENDS+= libslang.so:${PORTSDIR}/devel/libslang2 +.endif + +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS+=\ + --with-includes=${LOCALBASE}/include \ --with-libraries=${LOCALBASE}/lib \ --enable-ncurses - -LDFLAGS+= -L${LOCALBASE}/lib -LIB_DEPENDS+= libslang.so:${PORTSDIR}/japanese/libslang .endif .if ${INTERFACE} == "tcltk" LINK= tkmidi -USE_XORG= x11 - -DOCFILES= README.tk -DOCLANG= C ja_JP.eucJP - .if defined(JAPANESE) LIB_DEPENDS+= libtk80jp.so:${PORTSDIR}/japanese/tk80 - -CONFIGURE_ARGS+= --with-tcl-includes=${LOCALBASE}/include/tcl8.0jp \ +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 + --with-tcl-libs=${LOCALBASE}/lib \ + --with-tk-libs=${LOCALBASE}/lib +WISH= ${LOCALBASE}/bin/wish8.0jp .else -LIB_DEPENDS+= libtk84.so:${PORTSDIR}/x11-toolkits/tk84 - -CONFIGURE_ARGS+= --with-tcl-includes=${LOCALBASE}/include/tcl8.4 \ - --with-tk-includes=${LOCALBASE}/include/tk8.4 \ - --with-tcl-libs=${LOCALBASE}/lib --with-tk-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= WISH=wish8.4 +USES+= tk +CONFIGURE_ARGS+=\ + --with-tcl-includes=${TCL_INCLUDEDIR} \ + --with-tk-includes=${TK_INCLUDEDIR} \ + --with-tcl-libs=${LOCALBASE}/lib \ + --with-tk-libs=${LOCALBASE}/lib .endif + +USES+= shebangfix +SHEBANG_FILES= interface/tkmidity.ptcl interface/tkpanel.tcl +SHEBANG_LANG= wish +wish_OLD_CMD= /usr/bin/wish +wish_CMD= ${WISH} +USE_XORG= x11 +CONFIGURE_ENV+= WISH="${WISH}" + +LDFLAGS+= -L${LOCALBASE}/lib -lX11 + +DESKTOP_ENTRIES="TkMidi" "" "" "${LINK}" "AudioVideo;Audio;Midi;" "" .endif .if ${INTERFACE} == "xaw" LINK= xawmidi -LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -USE_XORG= xaw +LIB_DEPENDS+= libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d -DOCFILES= README.xaw -DOCLANG= C ja_JP.eucJP +USE_XORG= x11 xext xmu xt sm ice xpm +DESKTOP_ENTRIES="XawMidi" "" "" "${LINK}" "AudioVideo;Audio;Midi;" "" .endif .if ${INTERFACE} == "xskin" @@ -102,24 +117,64 @@ LINK= xskinmidi USE_XORG= x11 -DOCFILES= README.xskin -DOCLANG= C ja_JP.eucJP +DESKTOP_ENTRIES="XSkinMidi" "" "" "${LINK}" "AudioVideo;Audio;Midi;" "" .endif -.include +post-extract: + @${RM} -f ${WRKSRC}/libarc/*.h + @${RM} -f ${WRKSRC}/utils/mblock.h -post-install:: -.if ${INTERFACE} == "emacs" - @${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR} - ${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${STAGEDIR}${PREFIX}/${ELISPDIR} +post-patch: +.if ${INTERFACE} == "slang" + @${REINPLACE_CMD} -e \ + 's|"-lslang"|"-lslang $$LIBS"|' ${WRKSRC}/configure +.endif +.if ${INTERFACE} == "tcltk" +.if defined(JAPANESE) + @${REINPLACE_CMD} -e \ + 's|in tcl.*;|in tcl80jp;| ; \ + s|in tk.*;|in tk80jp;|' ${WRKSRC}/configure +.else + @${REINPLACE_CMD} -e \ + 's|in tcl.*;|in tcl${TCL_VER:S|.||};| ; \ + s|in tk.*;|in tk${TK_VER:S|.||};|' ${WRKSRC}/configure +.endif +.endif + +post-install: +.if ${INTERFACE} == "tcltk" + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc/C && ${INSTALL_DATA} README.tk \ + ${STAGEDIR}${DOCSDIR}) + @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME} + (cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} README.tk \ + ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}) .endif +# .if ${INTERFACE} == "xaw" - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults - ${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \ + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults + cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} TiMidity.ad \ ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/TiMidity - ${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \ + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults + cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} TiMidity-uj.ad \ ${STAGEDIR}${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc/C && ${INSTALL_DATA} README.xaw \ + ${STAGEDIR}${DOCSDIR}) + @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME} + (cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} README.xaw \ + ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}) +.endif +# +.if ${INTERFACE} == "xskin" + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc/C && ${INSTALL_DATA} README.xskin \ + ${STAGEDIR}${DOCSDIR}) + @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME} + (cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} README.xskin \ + ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}) .endif +# .if defined(LINK) - ${LN} -sf ${PREFIX}/bin/timidity ${STAGEDIR}${PREFIX}/bin/${LINK} + ${LN} -sf timidity ${STAGEDIR}${PREFIX}/bin/${LINK} .endif Modified: head/audio/timidity++/distinfo ============================================================================== --- head/audio/timidity++/distinfo Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++/distinfo Thu Jun 5 07:31:00 2014 (r356603) @@ -1,2 +1,2 @@ -SHA256 (TiMidity++-2.13.2.tar.bz2) = 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260 -SIZE (TiMidity++-2.13.2.tar.bz2) = 1581230 +SHA256 (TiMidity++-2.14.0.tar.bz2) = f97fb643f049e9c2e5ef5b034ea9eeb582f0175dce37bc5df843cc85090f6476 +SIZE (TiMidity++-2.14.0.tar.bz2) = 1611424 Modified: head/audio/timidity++/files/patch-Makefile.in ============================================================================== --- head/audio/timidity++/files/patch-Makefile.in Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++/files/patch-Makefile.in Thu Jun 5 07:31:00 2014 (r356603) @@ -1,37 +1,10 @@ -http://timidity-docs.sourceforge.jp/cgi-bin/kagemai-en/guest.cgi?project=timidity-bugs-en&action=view_report&id=56 - -Plus another patch... - ---- timidity/Makefile.in Sun Oct 3 08:39:54 2004 -+++ timidity/Makefile.in Thu Sep 22 03:11:09 2005 -@@ -478,5 +477,5 @@ - @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ - @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ --@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ -+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ -larc \ - @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ - @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ -@@ -509,5 +507,4 @@ - @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \ - @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ --@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ - @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ - @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ -@@ -585,5 +583,4 @@ - @BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ - @BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ --@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ - @BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ - @BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a -@@ -576,9 +576,8 @@ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ -- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ -- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p"; \ -+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p || exit 1; \ - else :; fi; \ - done - +--- Makefile.in.orig 2012-06-28 23:14:25.000000000 +0900 ++++ Makefile.in 2012-10-01 02:41:14.000000000 +0900 +@@ -284,7 +284,6 @@ + SUBDIRS = \ + autoconf \ + utils \ +- libarc \ + libunimod \ + interface \ + timidity \ Added: head/audio/timidity++/files/patch-interface__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/timidity++/files/patch-interface__Makefile.in Thu Jun 5 07:31:00 2014 (r356603) @@ -0,0 +1,10 @@ +--- interface/Makefile.in.orig 2012-06-28 23:14:25.000000000 +0900 ++++ interface/Makefile.in 2012-10-13 00:59:03.000000000 +0900 +@@ -340,7 +340,6 @@ + + INCLUDES = \ + -I$(top_srcdir)/timidity \ +- -I$(top_srcdir)/libarc \ + -I$(top_srcdir)/utils + + Added: head/audio/timidity++/files/patch-interface__tk_c.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/timidity++/files/patch-interface__tk_c.c Thu Jun 5 07:31:00 2014 (r356603) @@ -0,0 +1,11 @@ +--- interface/tk_c.c.orig ++++ interface/tk_c.c +@@ -913,7 +913,7 @@ + vsnprintf(buf, sizeof(buf), fmt, ap); + Tcl_Eval(my_interp, buf); + va_end(ap); +- return my_interp->result; ++ return Tcl_GetStringResult(my_interp); + } + + static const char *v_get2(const char *v1, const char *v2) Added: head/audio/timidity++/files/patch-timidity__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/timidity++/files/patch-timidity__Makefile.in Thu Jun 5 07:31:00 2014 (r356603) @@ -0,0 +1,88 @@ +--- timidity/Makefile.in.orig 2012-06-28 23:14:25.000000000 +0900 ++++ timidity/Makefile.in 2012-10-01 03:09:08.000000000 +0900 +@@ -336,7 +336,6 @@ + + INCLUDES = \ + -I$(top_srcdir) \ +- -I$(top_srcdir)/libarc \ + -I$(top_srcdir)/libunimod \ + -I$(top_srcdir)/interface \ + -I$(top_srcdir)/utils \ +@@ -497,7 +496,7 @@ + @VCPP_TRUE@timidity_LDADD = \ + @VCPP_TRUE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ + @VCPP_TRUE@ $(top_builddir)/interface/interface.lib \ +-@VCPP_TRUE@ $(top_builddir)/libarc/arc.lib \ ++@VCPP_TRUE@ -larc \ + @VCPP_TRUE@ $(top_builddir)/libunimod/unimod.lib \ + @VCPP_TRUE@ $(top_builddir)/utils/utils.lib \ + @VCPP_TRUE@ $(W32GUI_RES) +@@ -528,7 +527,7 @@ + @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_LDADD = \ + @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ + @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ +-@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ ++@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ -larc \ + @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ + @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ + @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(W32GUI_RES) +@@ -558,7 +557,6 @@ + + @BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \ + @BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(top_builddir)/interface/interface.lib \ +-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(top_builddir)/libarc/arc.lib \ + @BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(top_builddir)/libunimod/unimod.lib \ + @BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(top_builddir)/utils/utils.lib \ + @BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(W32GUI_RES) +@@ -573,7 +571,6 @@ + + @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \ + @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ +-@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ + @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ + @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ + @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(W32GUI_RES) +@@ -648,7 +645,6 @@ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ +-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \ +@@ -695,7 +691,6 @@ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ +-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/w32g_res.res +@@ -749,7 +744,6 @@ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ +-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/w32g_res.res +@@ -803,7 +797,6 @@ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \ +-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \ + @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/w32g_res.res +@@ -1538,9 +1531,8 @@ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ +- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p"; \ ++ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p || exit 1; \ + else :; fi; \ + done + Modified: head/audio/timidity++/pkg-descr ============================================================================== --- head/audio/timidity++/pkg-descr Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++/pkg-descr Thu Jun 5 07:31:00 2014 (r356603) @@ -9,4 +9,3 @@ Toivonen(until version 0.2i). Now, Masanao Izumo and many hackers are developing "TiMidity++". WWW: http://timidity.sourceforge.net/ -WWW: http://www.linet.gr.jp/~tamuki/ Modified: head/audio/timidity++/pkg-plist ============================================================================== --- head/audio/timidity++/pkg-plist Thu Jun 5 07:22:46 2014 (r356602) +++ head/audio/timidity++/pkg-plist Thu Jun 5 07:31:00 2014 (r356603) @@ -3,17 +3,19 @@ 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 -%%PORTDOCS%%%%DOCSDIR%%/README.mts -%%PORTDOCS%%%%DOCSDIR%%/README.sf %%PORTDOCS%%share/doc/ja/timidity++/README.alsaseq %%PORTDOCS%%share/doc/ja/timidity++/README.dl %%PORTDOCS%%share/doc/ja/timidity++/README.m2m %%PORTDOCS%%share/doc/ja/timidity++/README.mts %%PORTDOCS%%share/doc/ja/timidity++/README.sf -%%PORTDOCS%%@dirrm share/doc/ja/timidity++/ +%%PORTDOCS%%%%DOCSDIR%%/README.alsaseq +%%PORTDOCS%%%%DOCSDIR%%/README.dl +%%PORTDOCS%%%%DOCSDIR%%/README.m2m +%%PORTDOCS%%%%DOCSDIR%%/README.mts +%%PORTDOCS%%%%DOCSDIR%%/README.sf %%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dirrm share/doc/ja/timidity++ +@exec mkdir -p %D/%%TIMID_LIBDIR%% +@exec mkdir -p %D/share/timidity @dirrmtry %%TIMID_LIBDIR%% @dirrmtry share/timidity Modified: head/japanese/timidity++-slang/Makefile ============================================================================== --- head/japanese/timidity++-slang/Makefile Thu Jun 5 07:22:46 2014 (r356602) +++ head/japanese/timidity++-slang/Makefile Thu Jun 5 07:31:00 2014 (r356603) @@ -8,11 +8,10 @@ CATEGORIES= japanese MAINTAINER= ports@FreeBSD.org COMMENT= Slang interface for TiMidity++ with Japanese support - MASTERDIR= ${.CURDIR}/../../audio/timidity++ -JAPANESE= yes +PLIST_FILES= ${TIMID_LIBDIR}/if_slang.so -PLIST_FILES= ${TIMID_LIBDIR}/interface_s.so +JAPANESE= yes .include "${MASTERDIR}/Makefile" Modified: head/japanese/timidity++-tcltk/Makefile ============================================================================== --- head/japanese/timidity++-tcltk/Makefile Thu Jun 5 07:22:46 2014 (r356602) +++ head/japanese/timidity++-tcltk/Makefile Thu Jun 5 07:31:00 2014 (r356603) @@ -8,9 +8,10 @@ CATEGORIES= japanese MAINTAINER= ports@FreeBSD.org COMMENT= Tcl/Tk interface for TiMidity++ with Japanese support -JAPANESE= yes +OPTIONS_DEFINE= DOCS MASTERDIR= ${.CURDIR}/../../audio/timidity++ -NO_STAGE= yes +JAPANESE= yes + .include "${MASTERDIR}/Makefile" Modified: head/japanese/timidity++-tcltk/pkg-plist ============================================================================== --- head/japanese/timidity++-tcltk/pkg-plist Thu Jun 5 07:22:46 2014 (r356602) +++ head/japanese/timidity++-tcltk/pkg-plist Thu Jun 5 07:31:00 2014 (r356603) @@ -1,21 +1,30 @@ bin/tkmidi +%%TIMID_LIBDIR%%/bitmaps/arrow.xbm %%TIMID_LIBDIR%%/bitmaps/back.xbm +%%TIMID_LIBDIR%%/bitmaps/check.xbm +%%TIMID_LIBDIR%%/bitmaps/fast.xbm %%TIMID_LIBDIR%%/bitmaps/fwrd.xbm +%%TIMID_LIBDIR%%/bitmaps/keydown.xbm +%%TIMID_LIBDIR%%/bitmaps/keyup.xbm %%TIMID_LIBDIR%%/bitmaps/next.xbm +%%TIMID_LIBDIR%%/bitmaps/off.xbm +%%TIMID_LIBDIR%%/bitmaps/on.xbm %%TIMID_LIBDIR%%/bitmaps/pause.xbm %%TIMID_LIBDIR%%/bitmaps/play.xbm %%TIMID_LIBDIR%%/bitmaps/prev.xbm %%TIMID_LIBDIR%%/bitmaps/quit.xbm %%TIMID_LIBDIR%%/bitmaps/random.xbm %%TIMID_LIBDIR%%/bitmaps/repeat.xbm +%%TIMID_LIBDIR%%/bitmaps/slow.xbm %%TIMID_LIBDIR%%/bitmaps/stop.xbm %%TIMID_LIBDIR%%/bitmaps/timidity.xbm %%TIMID_LIBDIR%%/browser.tcl -%%TIMID_LIBDIR%%/interface_k.so +%%TIMID_LIBDIR%%/if_tcltk.so %%TIMID_LIBDIR%%/misc.tcl -%%TIMID_LIBDIR%%/tclIndex %%TIMID_LIBDIR%%/tkmidity.tcl %%TIMID_LIBDIR%%/tkpanel.tcl -%%PORTDOCS%%share/doc/timidity++/README.tk +%%PORTDOCS%%%%DOCSDIR%%/README.tk %%PORTDOCS%%share/doc/ja/timidity++/README.tk +%%PORTDOCS%%@dirrmtry share/doc/ja/timidity++ +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrm %%TIMID_LIBDIR%%/bitmaps