portlint and add SLAVEDIRS variable to master ports

4 files changed, 15 insertions, 10 deletions

diff --git a/audio/timidity++-emacs/Makefile b/audio/timidity++-emacs/Makefile
index 58e54e3215cd..c57c91cacafa 100644
--- a/audio/timidity++-emacs/Makefile
+++ b/audio/timidity++-emacs/Makefile
@@ -7,16 +7,20 @@
 
 PORTNAME=	timidity++
 PORTVERSION=	2.9.0
-PKGNAMESUFFIX=	-${INTERFACE}
 CATEGORIES=	audio
 MASTER_SITES=	http://www.goice.co.jp/member/mo/timidity/dist/
+PKGNAMESUFFIX=	-${INTERFACE}
 DISTNAME=	TiMidity++-${PORTVERSION}
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
 
-RUN_DEPENDS=	${PREFIX}/bin/timidity:${PORTSDIR}/audio/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
+
 INTERFACE?=	emacs
 
 USE_BZIP2=	yes
@@ -70,7 +74,7 @@ INTERFACE_DEPS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
 CONFIGURE_ARGS+=	--with-tcl-includes=${PREFIX}/include/tcl8.0 \
 		--with-tk-includes=${PREFIX}/include/tk8.0 \
 		--with-tcl-libs=${PREFIX}/lib --with-tk-libs=${PREFIX}/lib
-CONFIGURE_ENV=  WISH=wish8.0
+CONFIGURE_ENV=	WISH=wish8.0
 .endif
 .elif ${INTERFACE} == "xaw"
 LINK=		xawmidi
@@ -79,8 +83,8 @@ DOCLANG=	C ja_JP.ujis
 INTERFACE_DEPS=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 .elif ${INTERFACE} == "xskin"
 LINK=		xskinmidi
-DOCFILES=       README.xskin
-DOCLANG=        C ja_JP.ujis
+DOCFILES=	README.xskin
+DOCLANG=	C ja_JP.ujis
 .else
 NO_BUILD=	yes
 NO_INSTALL=	yes
diff --git a/audio/timidity++-emacs/pkg-message b/audio/timidity++-emacs/pkg-message
index b1d524b91a0d..65aee5a134d3 100644
--- a/audio/timidity++-emacs/pkg-message
+++ b/audio/timidity++-emacs/pkg-message
@@ -1,4 +1,3 @@
-
 ========================================================================
 "timidity.el" has been installed in ${PREFIX}/share/emacs/site-lisp/ .
 If this place is not proper for your Emacs(en), copy it to load-path.
@@ -13,4 +12,3 @@ Add these line to your "~/.emacs"
 
 And then, type "M-x timidity" on Emacs. Enjoy!
 ========================================================================
-
diff --git a/audio/timidity++-xskin/pkg-message b/audio/timidity++-xskin/pkg-message
index fce4d932698e..c247b2c94d39 100644
--- a/audio/timidity++-xskin/pkg-message
+++ b/audio/timidity++-xskin/pkg-message
@@ -1,4 +1,3 @@
-
 ========================================================================
 Please set environment variable to choose skin you like.
 
@@ -8,4 +7,3 @@ or
 % setenv timidity_skin /dos/programs/winamp/skins/winamp.zip
 
 ========================================================================
-
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 7b22d0f903e6..2fefd519ee19 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -16,6 +16,11 @@ MAINTAINER=	yatt@msc.biglobe.ne.jp
 # If you don't have X11, type "make -DWITHOUT_X11" or uncomment this.
 #WITHOUT_X11=	yes
 
+SLAVEDIRS=	audio/timidity++-emacs
+# rest are included by timidity++-emacs port
+SLAVEDIRS+=	audio/timidity++-gtk audio/timidity++-motif \
+		audio/timidity++-slang audio/timidity++-tcltk \
+		audio/timidity++-xaw audio/timidity++-xskin
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 .if !defined(WITHOUT_X11)
@@ -31,7 +36,7 @@ CONFIGURE_ARGS=	--with-x --enable-ncurses --enable-vt100 \
 		--enable-dynamic --enable-server \
 		--enable-network --enable-spectrogram --enable-wrd
 .else
-CONFIGURE_ARGS= --enable-ncurses --enable-vt100 \
+CONFIGURE_ARGS=	--enable-ncurses --enable-vt100 \
 		--enable-network --disable-spectrogram --disable-wrd
 .endif