Add staging support, allow it as normal user

3 files changed, 40 insertions, 17 deletions

diff --git a/audio/tclmidi/Makefile b/audio/tclmidi/Makefile
index 6c1cf1ff7707..5e0b9b5258ee 100644
--- a/audio/tclmidi/Makefile
+++ b/audio/tclmidi/Makefile
@@ -10,22 +10,13 @@ MASTER_SITES=	http://ringtail.its.monash.edu.au/pub/midi/PROGRAMS/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Language designed for creating and editing standard MIDI files
 
-USES+=		tcl
-NO_STAGE=	yes
+USES+=		tcl uidfix
 MAKE_ENV=	TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" TCL_LIBDIR="${TCL_LIBDIR}"
 MAKE_ENV+=	TCLSH=${TCLSH} FILESDIR="${FILESDIR}" MAN="${MAN1} ${MANN}"
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 MAKEFILE=	${FILESDIR}/BSDmakefile
 
-MAN1=		mplay.1 mrec.1 tclmidi.1 minfo.1 midtotcl.1
-MANN=		midiconf.n midievnt.n midifree.n midiget.n midigrep.n \
-		midimake.n midimerg.n midiplay.n midiput.n midiread.n \
-		midirec.n midirew.n midisplt.n midistop.n midiwait.n \
-		midiwrit.n midivers.n midimove.n midicopy.n mididel.n \
-		miditrck.n mididev.n miditime.n midifeat.n
-MANCOMPRESSED=	maybe
-
 post-patch:
 	${FIND} ${WRKSRC} -type f | ${XARGS} \
 	    ${REINPLACE_CMD} -e 's|iostream.h|iostream|g; s|iomanip.h|iomanip|g'
@@ -36,13 +27,10 @@ post-build:
 pre-su-install:
 .for s in mplay mrec minfo midtotcl
 	${SED} 's|/usr/local/bin/tclsh|${TCLSH}|' \
-		< ${WRKSRC}/${s}.dist > ${PREFIX}/bin/${s}
-	${CHMOD} 755 ${PREFIX}/bin/${s}
+		< ${WRKSRC}/${s}.dist > ${STAGEDIR}${PREFIX}/bin/${s}
+	${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/${s}
 .endfor
-	@${MKDIR} ${PREFIX}/lib/tclmidi
-	${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl ${PREFIX}/lib/tclmidi
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/tclmidi
+	${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/tclmidi
 
 .include <bsd.port.mk>
diff --git a/audio/tclmidi/files/BSDmakefile b/audio/tclmidi/files/BSDmakefile
index de15c3042cf2..c863d8a06731 100644
--- a/audio/tclmidi/files/BSDmakefile
+++ b/audio/tclmidi/files/BSDmakefile
@@ -10,6 +10,12 @@ SRCS=	MidiDev.cxx TclmDr75.cxx ChanPres.cxx Event.cxx MChanPrf.cxx	\
 SRCS+=	TclmIntp.cxx tclmCmd.cxx tclmEvnt.cxx tclmPlay.cxx	\
 	tclmPtch.cxx tclmUtil.cxx
 
+MAN=	mplay.1 mrec.1 tclmidi.1 minfo.1 midtotcl.1 \
+	midiconf.n midievnt.n midifree.n midiget.n midigrep.n \
+	midimake.n midimerg.n midiplay.n midiput.n midiread.n \
+	midirec.n midirew.n midisplt.n midistop.n midiwait.n \
+	midiwrit.n midivers.n midimove.n midicopy.n mididel.n \
+	miditrck.n mididev.n miditime.n midifeat.n
 
 SRCS+=	rb.c list.c
 SHLIB_NAME=	tclmidi31.so
diff --git a/audio/tclmidi/pkg-plist b/audio/tclmidi/pkg-plist
index 62d6da175980..637bbef0e7a9 100644
--- a/audio/tclmidi/pkg-plist
+++ b/audio/tclmidi/pkg-plist
@@ -4,4 +4,33 @@ bin/mplay
 bin/mrec
 lib/tclmidi/pkgIndex.tcl
 lib/tclmidi/tclmidi31.so
+man/man1/midtotcl.1.gz
+man/man1/minfo.1.gz
+man/man1/mplay.1.gz
+man/man1/mrec.1.gz
+man/man1/tclmidi.1.gz
+man/mann/midiconf.n.gz
+man/mann/midicopy.n.gz
+man/mann/mididel.n.gz
+man/mann/mididev.n.gz
+man/mann/midievnt.n.gz
+man/mann/midifeat.n.gz
+man/mann/midifree.n.gz
+man/mann/midiget.n.gz
+man/mann/midigrep.n.gz
+man/mann/midimake.n.gz
+man/mann/midimerg.n.gz
+man/mann/midimove.n.gz
+man/mann/midiplay.n.gz
+man/mann/midiput.n.gz
+man/mann/midiread.n.gz
+man/mann/midirec.n.gz
+man/mann/midirew.n.gz
+man/mann/midisplt.n.gz
+man/mann/midistop.n.gz
+man/mann/miditime.n.gz
+man/mann/miditrck.n.gz
+man/mann/midivers.n.gz
+man/mann/midiwait.n.gz
+man/mann/midiwrit.n.gz
 @dirrm lib/tclmidi