- Support staging

- Use new LIB_DEPENDS syntax
- Convert USE_BZIP2 to USES

10 files changed, 20 insertions, 35 deletions

diff --git a/audio/timidity++-emacs/Makefile b/audio/timidity++-emacs/Makefile
index 4ab9199ecaac..bc15d35b18e0 100644
--- a/audio/timidity++-emacs/Makefile
+++ b/audio/timidity++-emacs/Makefile
@@ -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"
diff --git a/audio/timidity++-gtk/Makefile b/audio/timidity++-gtk/Makefile
index a7790b10ea13..91c3625d9d54 100644
--- a/audio/timidity++-gtk/Makefile
+++ b/audio/timidity++-gtk/Makefile
@@ -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"
diff --git a/audio/timidity++-motif/Makefile b/audio/timidity++-motif/Makefile
index 4f2063d0fd74..deb1c08a3f43 100644
--- a/audio/timidity++-motif/Makefile
+++ b/audio/timidity++-motif/Makefile
@@ -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
diff --git a/audio/timidity++-slang/Makefile b/audio/timidity++-slang/Makefile
index 788ffea76b5c..e954a25d9c82 100644
--- a/audio/timidity++-slang/Makefile
+++ b/audio/timidity++-slang/Makefile
@@ -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"
diff --git a/audio/timidity++-tcltk/Makefile b/audio/timidity++-tcltk/Makefile
index 9e5cf52f9b27..a25039b2b6ed 100644
--- a/audio/timidity++-tcltk/Makefile
+++ b/audio/timidity++-tcltk/Makefile
@@ -7,6 +7,5 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tcl/Tk interface for TiMidity++
 
 MASTERDIR=	${.CURDIR}/../../audio/timidity++
-NO_STAGE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++-xaw/Makefile b/audio/timidity++-xaw/Makefile
index a5ff59c16f9c..7cb934b0d8a4 100644
--- a/audio/timidity++-xaw/Makefile
+++ b/audio/timidity++-xaw/Makefile
@@ -7,6 +7,5 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Xaw interface for TiMidity++
 
 MASTERDIR=	${.CURDIR}/../../audio/timidity++
-NO_STAGE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++-xskin/Makefile b/audio/timidity++-xskin/Makefile
index f6fc5178c230..cb3d9df0aebc 100644
--- a/audio/timidity++-xskin/Makefile
+++ b/audio/timidity++-xskin/Makefile
@@ -7,6 +7,5 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11AMP skin interface for TiMidity++
 
 MASTERDIR=	${.CURDIR}/../../audio/timidity++
-NO_STAGE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index ccd3769c618c..0c16ee7e7d5d 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -19,12 +19,9 @@ RUN_DEPENDS=	${LOCALBASE}/share/timidity/timidity.cfg:${PORTSDIR}/audio/eawpats
 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,vorbis
 .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 <bsd.port.post.mk>
diff --git a/audio/timidity++/Makefile.interface b/audio/timidity++/Makefile.interface
index 63aafe0ee597..fbca39539550 100644
--- a/audio/timidity++/Makefile.interface
+++ b/audio/timidity++/Makefile.interface
@@ -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=${LOCALBASE}/include \
 		--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
diff --git a/audio/timidity++/pkg-plist b/audio/timidity++/pkg-plist
index 08abdc451464..784d05745513 100644
--- a/audio/timidity++/pkg-plist
+++ b/audio/timidity++/pkg-plist
@@ -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