aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/timidity++-emacs/Makefile136
-rw-r--r--audio/timidity++-emacs/pkg-plist2
-rw-r--r--audio/timidity++-gtk/Makefile6
-rw-r--r--audio/timidity++-gtk/pkg-plist2
-rw-r--r--audio/timidity++-motif/Makefile12
-rw-r--r--audio/timidity++-motif/pkg-plist2
-rw-r--r--audio/timidity++-slang/Makefile7
-rw-r--r--audio/timidity++-tcltk/Makefile4
-rw-r--r--audio/timidity++-tcltk/pkg-plist36
-rw-r--r--audio/timidity++-xaw/Makefile6
-rw-r--r--audio/timidity++-xaw/pkg-plist26
-rw-r--r--audio/timidity++-xskin/Makefile4
-rw-r--r--audio/timidity++-xskin/pkg-plist2
-rw-r--r--audio/timidity++/Makefile86
-rw-r--r--audio/timidity++/Makefile.interface132
-rw-r--r--japanese/timidity++-slang/Makefile8
-rw-r--r--japanese/timidity++-tcltk/Makefile5
-rw-r--r--japanese/timidity++-tcltk/pkg-plist36
18 files changed, 248 insertions, 264 deletions
diff --git a/audio/timidity++-emacs/Makefile b/audio/timidity++-emacs/Makefile
index d02156397e1b..bb8e5ef5a14c 100644
--- a/audio/timidity++-emacs/Makefile
+++ b/audio/timidity++-emacs/Makefile
@@ -5,139 +5,13 @@
# $FreeBSD$
#
-PORTNAME= timidity++
-PORTVERSION= 2.13.2
-PORTREVISION= 1
-CATEGORIES+= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=timidity
-PKGNAMESUFFIX= -${INTERFACE}
-DISTNAME= TiMidity++-${PORTVERSION}
+PKGNAMESUFFIX= -emacs
-MAINTAINER?= ports@FreeBSD.org
-COMMENT?= Emacs interface for TiMidity++
-
-RUN_DEPENDS= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++
-LIB_DEPENDS= ${INTERFACE_DEPS}
-
-SLAVEDIRS= 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?= emacs
-
-USE_BZIP2= yes
-GNU_CONFIGURE= yes
-LDFLAGS= -export-dynamic
-USE_GMAKE= yes
-.if !${INTERFACE} == "emacs" && !${INTERFACE} == "slang"
-USE_XLIB= yes
-.endif
-
-CONFIGURE_ARGS+=--enable-dynamic=${INTERFACE}
+MAINTAINER= ports@FreeBSD.org
+COMMENT= Emacs interface for TiMidity++
MASTERDIR= ${.CURDIR}/../../audio/timidity++
-PKGDIR= ${.CURDIR}
-PLIST_SUB+= TIMID_LIBDIR=${TIMID_LIBDIR}
-
-TIMID_LIBDIR= lib/timidity
-
-.if ${INTERFACE} == "emacs"
-ELISPDIR= ${PREFIX}/share/emacs/site-lisp
-.elif ${INTERFACE} == "gtk"
-LINK= gtkmidi
-USE_GNOME= gtk12
-.elif ${INTERFACE} == "motif"
-LINK= xmmidi
-USE_MOTIF= yes
-CONFIGURE_ENV+= MOTIFLIB="${MOTIFLIB}"
-.elif ${INTERFACE} == "slang"
-CONFIGURE_ARGS+=--with-includes=${LOCALBASE}/include \
- --with-libraries=${LOCALBASE}/lib
-LDFLAGS+= -L${LOCALBASE}/lib
-.if defined(JAPANESE)
-INTERFACE_DEPS= slang.2:${PORTSDIR}/japanese/libslang
-.else
-INTERFACE_DEPS= slang:${PORTSDIR}/devel/libslang
-.endif
-CONFIGURE_ARGS+= --enable-ncurses
-.elif ${INTERFACE} == "tcltk"
-LINK= tkmidi
-DOCFILES= README.tk
-DOCLANG= C ja_JP.eucJP
-.if defined(JAPANESE)
-INTERFACE_DEPS= tk80jp.1:${PORTSDIR}/japanese/tk80
-CONFIGURE_ARGS+= --with-tcl-includes=${PREFIX}/include/tcl8.0jp \
- --with-tk-includes=${PREFIX}/include/tk8.0jp \
- --with-tcl-libs=${PREFIX}/lib --with-tk-libs=${PREFIX}/lib
-CONFIGURE_ENV+= WISH=wish8.0jp
-.else
-INTERFACE_DEPS= tk84:${PORTSDIR}/x11-toolkits/tk84
-CONFIGURE_ARGS+= --with-tcl-includes=${PREFIX}/include/tcl8.4 \
- --with-tk-includes=${PREFIX}/include/tk8.4 \
- --with-tcl-libs=${PREFIX}/lib --with-tk-libs=${PREFIX}/lib
-CONFIGURE_ENV+= WISH=wish8.4
-.endif
-.elif ${INTERFACE} == "xaw"
-LINK= xawmidi
-DOCFILES= README.xaw
-DOCLANG= C ja_JP.eucJP
-INTERFACE_DEPS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
-.elif ${INTERFACE} == "xskin"
-LINK= xskinmidi
-DOCFILES= README.xskin
-DOCLANG= C ja_JP.eucJP
-.else
-NO_BUILD= yes
-NO_INSTALL= yes
-.endif
-
-CONFIGURE_ENV+= SHLD="${CC} -shared ${LDFLAGS}"
-
-.include <bsd.port.pre.mk>
-
-EUCJP_LOCALE= ja_JP.eucJP
-PLIST_SUB+= EUCJP_LOCALE=${EUCJP_LOCALE}
-
-.if ${INTERFACE} == "motif"
-post-configure:
- @${MV} ${WRKSRC}/interface/Makefile ${WRKSRC}/interface/Makefile.orig
- @${SED} -e 's^m_so_libs = $$^m_so_libs = -L${X11BASE}/lib ${MOTIFLIB} -lXt -lXext -lSM -lICE -lX11 ^' \
- -e 's^dynamic_targets = $$^dynamic_targets = interface_m.so^' \
- ${WRKSRC}/interface/Makefile.orig > ${WRKSRC}/interface/Makefile
-.endif
-
-do-build:
- @cd ${WRKSRC}/interface; ${GMAKE} ${ALL_TARGET}
-
-do-install:
- @cd ${WRKSRC}/interface; ${GMAKE} ${INSTALL_TARGET}
-post-install:
-.if ${INTERFACE} == "emacs"
- @${MKDIR} ${ELISPDIR}
- ${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${ELISPDIR}
-.endif
-.if ${INTERFACE} == "xaw"
- @${MKDIR} ${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults
- ${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \
- ${X11BASE}/lib/X11/app-defaults/TiMidity
- ${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \
- ${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity
-.endif
-.if defined(DOCFILES) && !defined(NOPORTDOCS)
-.for lang in ${DOCLANG}
- ${MKDIR} ${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++
- ${INSTALL_DATA} ${WRKSRC}/doc/${lang}/${DOCFILES} \
- ${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++/
-.endfor
-.endif
-.if defined(LINK)
- ${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK}
-.endif
-.if exists(${PKGMESSAGE})
- @${CAT} ${PKGMESSAGE}
-.endif
+PLIST_FILES= ${TIMID_LIBDIR}/interface_e.so ${ELISPDIR}/timidity.el
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++-emacs/pkg-plist b/audio/timidity++-emacs/pkg-plist
deleted file mode 100644
index 8da3750f7bcf..000000000000
--- a/audio/timidity++-emacs/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/timidity/interface_e.so
-share/emacs/site-lisp/timidity.el
diff --git a/audio/timidity++-gtk/Makefile b/audio/timidity++-gtk/Makefile
index b66a8a7ceddb..ca4ee7df2c82 100644
--- a/audio/timidity++-gtk/Makefile
+++ b/audio/timidity++-gtk/Makefile
@@ -5,11 +5,13 @@
# $FreeBSD$
#
-INTERFACE= gtk
+PKGNAMESUFFIX= -gtk
MAINTAINER= ports@FreeBSD.org
COMMENT= Gtk interface for TiMidity++
-MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs
+MASTERDIR= ${.CURDIR}/../../audio/timidity++
+
+PLIST_FILES= bin/gtkmidi ${TIMID_LIBDIR}/interface_g.so
.include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++-gtk/pkg-plist b/audio/timidity++-gtk/pkg-plist
deleted file mode 100644
index ac4e28ef5131..000000000000
--- a/audio/timidity++-gtk/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/gtkmidi
-lib/timidity/interface_g.so
diff --git a/audio/timidity++-motif/Makefile b/audio/timidity++-motif/Makefile
index 71b37dd5e2a3..93a3200b13e0 100644
--- a/audio/timidity++-motif/Makefile
+++ b/audio/timidity++-motif/Makefile
@@ -5,11 +5,19 @@
# $FreeBSD$
#
-INTERFACE= motif
+PKGNAMESUFFIX= -motif
MAINTAINER= ports@FreeBSD.org
COMMENT= Motif interface for TiMidity++
-MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs
+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${X11BASE}/lib ${MOTIFLIB} -lXt -lXext -lSM -lICE -lX11 ^' \
+ -e 's^dynamic_targets = $$^dynamic_targets = interface_m.so^' \
+ ${WRKSRC}/interface/Makefile.orig > ${WRKSRC}/interface/Makefile
.include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++-motif/pkg-plist b/audio/timidity++-motif/pkg-plist
deleted file mode 100644
index 5342adda62c3..000000000000
--- a/audio/timidity++-motif/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/xmmidi
-lib/timidity/interface_m.so
diff --git a/audio/timidity++-slang/Makefile b/audio/timidity++-slang/Makefile
index 6bef631dd61c..8e9aa0242b42 100644
--- a/audio/timidity++-slang/Makefile
+++ b/audio/timidity++-slang/Makefile
@@ -5,12 +5,13 @@
# $FreeBSD$
#
-INTERFACE= slang
+PKGNAMESUFFIX= -slang
MAINTAINER= ports@FreeBSD.org
COMMENT= Slang interface for TiMidity++
-MASTERDIR= ${.CURDIR:H:H}/audio/timidity++-emacs
-PLIST_FILES= lib/timidity/interface_s.so
+MASTERDIR= ${.CURDIR}/../..//audio/timidity++
+
+PLIST_FILES= ${TIMID_LIBDIR}/interface_s.so
.include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++-tcltk/Makefile b/audio/timidity++-tcltk/Makefile
index feff62f35755..595fff66594f 100644
--- a/audio/timidity++-tcltk/Makefile
+++ b/audio/timidity++-tcltk/Makefile
@@ -5,11 +5,11 @@
# $FreeBSD$
#
-INTERFACE= tcltk
+PKGNAMESUFFIX= -tcltk
MAINTAINER= ports@FreeBSD.org
COMMENT= Tcl/Tk interface for TiMidity++
-MASTERDIR= ${.CURDIR:H:H}/audio/timidity++-emacs
+MASTERDIR= ${.CURDIR}/../../audio/timidity++
.include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++-tcltk/pkg-plist b/audio/timidity++-tcltk/pkg-plist
index 09b7026693ac..69d8cab6f3a7 100644
--- a/audio/timidity++-tcltk/pkg-plist
+++ b/audio/timidity++-tcltk/pkg-plist
@@ -1,21 +1,21 @@
bin/tkmidi
-lib/timidity/bitmaps/back.xbm
-lib/timidity/bitmaps/fwrd.xbm
-lib/timidity/bitmaps/next.xbm
-lib/timidity/bitmaps/pause.xbm
-lib/timidity/bitmaps/play.xbm
-lib/timidity/bitmaps/prev.xbm
-lib/timidity/bitmaps/quit.xbm
-lib/timidity/bitmaps/random.xbm
-lib/timidity/bitmaps/repeat.xbm
-lib/timidity/bitmaps/stop.xbm
-lib/timidity/bitmaps/timidity.xbm
-lib/timidity/browser.tcl
-lib/timidity/interface_k.so
-lib/timidity/misc.tcl
-lib/timidity/tclIndex
-lib/timidity/tkmidity.tcl
-lib/timidity/tkpanel.tcl
+%%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%%/browser.tcl
+%%TIMID_LIBDIR%%/interface_k.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
-@dirrm lib/timidity/bitmaps
+@dirrm %%TIMID_LIBDIR%%/bitmaps
diff --git a/audio/timidity++-xaw/Makefile b/audio/timidity++-xaw/Makefile
index 10e338fbcb73..b0a52df4384c 100644
--- a/audio/timidity++-xaw/Makefile
+++ b/audio/timidity++-xaw/Makefile
@@ -5,13 +5,13 @@
# $FreeBSD$
#
-INTERFACE= xaw
+PKGNAMESUFFIX= -xaw
MAINTAINER= ports@FreeBSD.org
COMMENT= Xaw interface for TiMidity++
-MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs
+MASTERDIR= ${.CURDIR}/../../audio/timidity++
-PLIST_SUB+= REALPREFIX=${PREFIX}
+PLIST_SUB= REALPREFIX=${PREFIX}
.include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++-xaw/pkg-plist b/audio/timidity++-xaw/pkg-plist
index 4741f3049103..6df2562f5b50 100644
--- a/audio/timidity++-xaw/pkg-plist
+++ b/audio/timidity++-xaw/pkg-plist
@@ -3,21 +3,21 @@ lib/X11/app-defaults/TiMidity
lib/X11/%%EUCJP_LOCALE%%/app-defaults/TiMidity
@cwd %%REALPREFIX%%
bin/xawmidi
-lib/timidity/bitmaps/back.xbm
-lib/timidity/bitmaps/fwrd.xbm
-lib/timidity/bitmaps/next.xbm
-lib/timidity/bitmaps/pause.xbm
-lib/timidity/bitmaps/play.xbm
-lib/timidity/bitmaps/prev.xbm
-lib/timidity/bitmaps/quit.xbm
-lib/timidity/bitmaps/random.xbm
-lib/timidity/bitmaps/repeat.xbm
-lib/timidity/bitmaps/stop.xbm
-lib/timidity/bitmaps/timidity.xbm
-lib/timidity/interface_a.so
+%%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
%%PORTDOCS%%%%DOCSDIR%%/README.xaw
%%PORTDOCS%%share/doc/ja/timidity++/README.xaw
-@dirrm lib/timidity/bitmaps
+@dirrm %%TIMID_LIBDIR%%/bitmaps
@cwd %%X11BASE%%
@dirrmtry lib/X11/%%EUCJP_LOCALE%%/app-defaults
@dirrmtry lib/X11/%%EUCJP_LOCALE%%
diff --git a/audio/timidity++-xskin/Makefile b/audio/timidity++-xskin/Makefile
index a7fb2f5c0307..106df61efdca 100644
--- a/audio/timidity++-xskin/Makefile
+++ b/audio/timidity++-xskin/Makefile
@@ -5,11 +5,11 @@
# $FreeBSD$
#
-INTERFACE= xskin
+PKGNAMESUFFIX= -xskin
MAINTAINER= ports@FreeBSD.org
COMMENT= X11AMP skin interface for TiMidity++
-MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs
+MASTERDIR= ${.CURDIR}/../../audio/timidity++
.include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++-xskin/pkg-plist b/audio/timidity++-xskin/pkg-plist
index 200e40485138..b4beb9b5bb66 100644
--- a/audio/timidity++-xskin/pkg-plist
+++ b/audio/timidity++-xskin/pkg-plist
@@ -1,4 +1,4 @@
bin/xskinmidi
-lib/timidity/interface_i.so
+%%TIMID_LIBDIR%%/interface_i.so
%%PORTDOCS%%%%DOCSDIR%%/README.xskin
%%PORTDOCS%%share/doc/ja/timidity++/README.xskin
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index d3a3cc823c54..5dafc3d62368 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -7,56 +7,50 @@
PORTNAME= timidity++
PORTVERSION= 2.13.2
-PORTREVISION= 2
-CATEGORIES= audio
+PORTREVISION?= 2
+CATEGORIES+= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=timidity
DISTNAME= TiMidity++-${PORTVERSION}
-MAINTAINER= nork@FreeBSD.org
-COMMENT= Software MIDI player
+MAINTAINER?= nork@FreeBSD.org
+COMMENT?= Software MIDI player
-LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis \
+.if !defined(PKGNAMESUFFIX)
+LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \
arc:${PORTSDIR}/archivers/libarc
RUN_DEPENDS= ${LOCALBASE}/share/timidity/timidity.cfg:${PORTSDIR}/audio/eawpats
CONFLICTS= timidity-0.*
+.endif
-# If you don't have X11, type "make -DWITHOUT_X11" or uncomment this.
-#WITHOUT_X11= yes
USE_BZIP2= yes
-USE_GETOPT_LONG=yes
-WANT_GNOME= yes
GNU_CONFIGURE= yes
+USE_GMAKE= yes
+
+PLIST_SUB+= TIMID_LIBDIR=${TIMID_LIBDIR} EUCJP_LOCALE=${EUCJP_LOCALE}
+
+EUCJP_LOCALE= ja_JP.eucJP
+TIMID_LIBDIR= lib/timidity
+
+.if !defined(PKGNAMESUFFIX)
+WANT_GNOME= yes
EXTRACT_AFTER_ARGS=| ${TAR} -xpf - --exclude '*/libarc/*' \
--exclude '*/utils/mblock.h' --exclude '*/utils/memb.h'
-CONFIGURE_ARGS?=--enable-interface=ncurses,vt100,server
-CONFIGURE_ARGS+=--program-transform-name= --enable-network
+CONFIGURE_ARGS= --enable-interface=ncurses,vt100,server \
+ --program-transform-name= --enable-network
CPPFLAGS+= -I${LOCALBASE}/include/libarc
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS=-export-dynamic
-
-PLIST_SUB= EUCJP_LOCALE=${EUCJP_LOCALE} TIMID_LIBDIR=${TIMID_LIBDIR} \
- ELISPDIR=share/emacs/site-lisp
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS=-export-dynamic
-DOCFILES?= README.alsaseq README.dl README.m2m README.mts README.sf
-DOCLANG?= C ja_JP.eucJP
-
-TIMID_LIBDIR= lib/timidity
+DOCFILES= README.alsaseq README.dl README.m2m README.mts README.sf
+DOCLANG= C ja_JP.eucJP
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500000
-USE_GMAKE= yes
-.endif
-
-.if ${.CURDIR} == ${MASTERDIR}
MANLANG= "" ja
MAN1= timidity.1
MAN5= timidity.cfg.5
-.else
-RUN_DEPENDS+= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++
-.endif
.if defined(WITHOUT_X11)
CONFIGURE_ARGS+=--without-x --disable-spectrogram --disable-wrd --disable-dynamic
@@ -66,21 +60,9 @@ USE_XLIB= yes
LIB_DEPENDS+= png:${PORTSDIR}/graphics/png
.endif
-.if ${OSVERSION} >= 450002
-EUCJP_LOCALE= ja_JP.eucJP
-.else
-EUCJP_LOCALE= ja_JP.EUC
-.endif
-
-#.if ${OSVERSION} > 600006
-#BROKEN= "Depends on libxpg4 which was removed from FreeBSD 6.0"
-#.endif
-
.if ${HAVE_GNOME:Mesound}!=""
USE_GNOME= esound
CONFIGURE_ARGS+=--enable-audio=oss,esd,vorbis
-# 4.x make(1) doesn't like/work when using :=, so just disable esound suffix
-#PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-esound
.else
CONFIGURE_ARGS+=--enable-audio=oss,vorbis
.endif
@@ -88,37 +70,25 @@ CONFIGURE_ARGS+=--enable-audio=oss,vorbis
pre-install:
@${MKDIR} ${PREFIX}/share/timidity ${PREFIX}/${TIMID_LIBDIR}
-.if ${.CURDIR} == ${MASTERDIR}
post-install::
${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.1 \
${PREFIX}/man/ja/man1
${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.cfg.5 \
${PREFIX}/man/ja/man5
-.else
-do-build:
- @cd ${WRKSRC}/interface; ${MAKE} ${ALL_TARGET}
+.else # defined(PKGNAMESUFFIX)
+.include "${MASTERDIR}/Makefile.interface"
+.endif # !defined(PKGNAMESUFFIX)
-do-install:
- @cd ${WRKSRC}/interface; ${MAKE} ${INSTALL_TARGET}
-.endif
-
-.if !defined(NOPORTDOCS)
post-install::
-. for lang in ${DOCLANG}
+.if !defined(NOPORTDOCS) && defined(DOCFILES)
+.for lang in ${DOCLANG}
${MKDIR} ${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++/
-. endfor
+.endfor
.endif
-
-.if defined(LINK)
-post-install::
- ${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK}
-.endif
-
.if exists(${PKGMESSAGE})
-post-install::
- @${SED} -e 's,/usr/local,${PREFIX},g' ${PKGMESSAGE}
+ @${CAT} ${PKGMESSAGE}
.endif
.include <bsd.port.post.mk>
diff --git a/audio/timidity++/Makefile.interface b/audio/timidity++/Makefile.interface
new file mode 100644
index 000000000000..32b7458f28ff
--- /dev/null
+++ b/audio/timidity++/Makefile.interface
@@ -0,0 +1,132 @@
+#$FreeBSD$
+
+# Shared by timidity++ interface ports
+
+RUN_DEPENDS+= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++
+
+SLAVEDIRS= 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/^-//}
+
+DESCR= ${.CURDIR}/pkg-descr
+
+.if exists(${.CURDIR}/pkg-plist)
+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
+
+# interface section
+
+.if ${INTERFACE} == "emacs"
+ELISPDIR= share/emacs/site-lisp
+.endif
+
+.if ${INTERFACE} == "gtk"
+LINK= gtkmidi
+
+USE_GNOME= gtk12
+USE_XLIB= yes
+.endif
+
+.if ${INTERFACE} == "motif"
+LINK= xmmidi
+
+USE_MOTIF= yes
+USE_XLIB= yes
+
+CONFIGURE_ENV+= MOTIFLIB="${MOTIFLIB}"
+.endif
+
+.if ${INTERFACE} == "slang"
+CONFIGURE_ARGS+=--with-includes=${LOCALBASE}/include \
+ --with-libraries=${LOCALBASE}/lib \
+ --enable-ncurses
+
+LDFLAGS+= -L${LOCALBASE}/lib
+
+.if defined(JAPANESE)
+LIB_DEPENDS+= slang.2:${PORTSDIR}/japanese/libslang
+.else
+LIB_DEPENDS+= slang:${PORTSDIR}/devel/libslang
+.endif
+.endif
+
+.if ${INTERFACE} == "tcltk"
+LINK= tkmidi
+
+USE_XLIB= yes
+
+DOCFILES= README.tk
+DOCLANG= C ja_JP.eucJP
+
+.if defined(JAPANESE)
+LIB_DEPENDS+= tk80jp.1:${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
+
+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
+.endif
+.endif
+
+.if ${INTERFACE} == "xaw"
+LINK= xawmidi
+
+LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
+
+USE_XLIB= yes
+
+DOCFILES= README.xaw
+DOCLANG= C ja_JP.eucJP
+.endif
+
+.if ${INTERFACE} == "xskin"
+LINK= xskinmidi
+
+USE_XLIB= yes
+
+DOCFILES= README.xskin
+DOCLANG= C ja_JP.eucJP
+.endif
+
+.include <bsd.port.pre.mk>
+
+post-install::
+.if ${INTERFACE} == "emacs"
+ @${MKDIR} ${PREFIX}/${ELISPDIR}
+ ${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${PREFIX}/${ELISPDIR}
+.endif
+.if ${INTERFACE} == "xaw"
+ @${MKDIR} ${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults
+ ${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \
+ ${X11BASE}/lib/X11/app-defaults/TiMidity
+ ${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \
+ ${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity
+.endif
+.if defined(LINK)
+ ${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK}
+.endif
diff --git a/japanese/timidity++-slang/Makefile b/japanese/timidity++-slang/Makefile
index 024b4d65b073..2c134f306796 100644
--- a/japanese/timidity++-slang/Makefile
+++ b/japanese/timidity++-slang/Makefile
@@ -5,15 +5,17 @@
# $FreeBSD$
#
+PKGNAMESUFFIX= -slang
+
CATEGORIES= japanese
MAINTAINER= ports@FreeBSD.org
COMMENT= Slang interface for TiMidity++ with Japanese support
-INTERFACE= slang
+MASTERDIR= ${.CURDIR}/../../audio/timidity++
+
JAPANESE= yes
-PLIST_FILES= lib/timidity/interface_s.so
-MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs
+PLIST_FILES= ${TIMID_LIBDIR}/interface_s.so
.include "${MASTERDIR}/Makefile"
diff --git a/japanese/timidity++-tcltk/Makefile b/japanese/timidity++-tcltk/Makefile
index 211028d2dcaf..38941eb803b1 100644
--- a/japanese/timidity++-tcltk/Makefile
+++ b/japanese/timidity++-tcltk/Makefile
@@ -5,14 +5,15 @@
# $FreeBSD$
#
+PKGNAMESUFFIX= -tcltk
+
CATEGORIES= japanese
MAINTAINER= ports@FreeBSD.org
COMMENT= Tcl/Tk interface for TiMidity++ with Japanese support
-INTERFACE= tcltk
JAPANESE= yes
-MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs
+MASTERDIR= ${.CURDIR}/../../audio/timidity++
.include "${MASTERDIR}/Makefile"
diff --git a/japanese/timidity++-tcltk/pkg-plist b/japanese/timidity++-tcltk/pkg-plist
index eb813568ed40..ebcd6cff4929 100644
--- a/japanese/timidity++-tcltk/pkg-plist
+++ b/japanese/timidity++-tcltk/pkg-plist
@@ -1,21 +1,21 @@
bin/tkmidi
-lib/timidity/bitmaps/back.xbm
-lib/timidity/bitmaps/fwrd.xbm
-lib/timidity/bitmaps/next.xbm
-lib/timidity/bitmaps/pause.xbm
-lib/timidity/bitmaps/play.xbm
-lib/timidity/bitmaps/prev.xbm
-lib/timidity/bitmaps/quit.xbm
-lib/timidity/bitmaps/random.xbm
-lib/timidity/bitmaps/repeat.xbm
-lib/timidity/bitmaps/stop.xbm
-lib/timidity/bitmaps/timidity.xbm
-lib/timidity/browser.tcl
-lib/timidity/interface_k.so
-lib/timidity/misc.tcl
-lib/timidity/tclIndex
-lib/timidity/tkmidity.tcl
-lib/timidity/tkpanel.tcl
+%%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%%/browser.tcl
+%%TIMID_LIBDIR%%/interface_k.so
+%%TIMID_LIBDIR%%/misc.tcl
+%%TIMID_LIBDIR%%/tclIndex
+%%TIMID_LIBDIR%%/tkmidity.tcl
+%%TIMID_LIBDIR%%/tkpanel.tcl
%%PORTDOCS%%share/doc/timidity++/README.tk
%%PORTDOCS%%share/doc/ja/timidity++/README.tk
-@dirrm lib/timidity/bitmaps
+@dirrm %%TIMID_LIBDIR%%/bitmaps