Generate plist either statically or before do-install phase for

compatibility with upcoming bsd.port.mk patches.

Submitted by:	Sergey Matveychuk <sem@ciam.ru>

3 files changed, 126 insertions, 16 deletions

diff --git a/net/danamics/Makefile b/net/danamics/Makefile
index d06140b0527a..245fdfd3a655 100644
--- a/net/danamics/Makefile
+++ b/net/danamics/Makefile
@@ -24,20 +24,20 @@ PLIST=		${WRKDIR}/plist
 
 SORT?=		/usr/bin/sort
 
+pre-install:
+	cd ${WRKSRC}; ${FIND} . -type f \
+		| ${SORT} | ${SED} -e 's|^\.|danamics|' >${PLIST}
+	cd ${WRKSRC};  ${FIND} . -type d \
+		| ${SORT} -r | ${SED} -e 's|^\.|@dirrm danamics|' >>${PLIST}
+	${ECHO} bin/danamics >>${PLIST}
+
 do-install:
 	${MKDIR} ${PREFIX}/danamics
 	${CP} -R ${WRKSRC}/* ${PREFIX}/danamics
 
-	cd ${PREFIX}; ${FIND} danamics -type f \
-		| ${SORT} >${PLIST}
-	cd ${PREFIX}; ${FIND} danamics -type d \
-		| ${SORT} -r | ${SED} -e 's|^|@dirrm |' >>${PLIST}
-
 	${SED} \
 		-e s,%%PREFIX%%,${PREFIX},g \
 		< ${FILESDIR}/danamics.sh > ${PREFIX}/bin/danamics; \
 	${CHMOD} a+x ${PREFIX}/bin/danamics
 
-	${ECHO} bin/danamics >>${PLIST}
-
 .include <bsd.port.post.mk>
diff --git a/net/tik/Makefile b/net/tik/Makefile
index f486f5612f8a..6803b1334cdd 100644
--- a/net/tik/Makefile
+++ b/net/tik/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	tclsh8.2:${PORTSDIR}/lang/tcl82 \
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/tik
-PLIST=		${WRKDIR}/PLIST
 
 SORT?=		sort
 
@@ -38,31 +37,23 @@ DOCFILES=	CHANGES CONTRIBUTORS COPYING LICENSE README-LANG \
 # The packing list starts with just bin/tik.  As we install things,
 # build onto the list.
 do-install:
-	@${CP} ${PKGDIR}/pkg-plist ${PLIST}
 .for d in ${SRCDIRS}
 	@${MKDIR} ${PREFIX}/${d}
-	@${ECHO_CMD} @dirrm ${d} >> ${PLIST}.dirrm
 .endfor
 .for f in ${SRCFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/tik/${f}
-	@${ECHO_CMD} share/tik/${f} >> ${PLIST}
 .endfor
 	@${MKDIR} ${PREFIX}/${EGDIR}
-	@${ECHO_CMD} @dirrm ${EGDIR} >> ${PLIST}.dirrm
 .for f in ${EGFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${EGDIR}/${f}
-	@${ECHO_CMD} ${EGDIR}/${f} >> ${PLIST}
 .endfor
 	@${SED} 's#@PREFIX@#${PREFIX}#g' < ${FILESDIR}/tik >${WRKDIR}/tik.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/tik.sh ${PREFIX}/bin/tik
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${DOCDIR}
-	@${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}.dirrm
 .for f in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${DOCDIR}/${f}
-	@${ECHO_CMD} ${DOCDIR}/${f} >> ${PLIST}
 .endfor
 .endif
-	@${SORT} -r ${PLIST}.dirrm >> ${PLIST} && ${RM} ${PLIST}.dirrm
 
 .include <bsd.port.post.mk>
diff --git a/net/tik/pkg-plist b/net/tik/pkg-plist
index 5096cc31a512..e0929d15530b 100644
--- a/net/tik/pkg-plist
+++ b/net/tik/pkg-plist
@@ -1 +1,120 @@
 bin/tik
+%%PORTDOCS%%share/doc/tik/CHANGES
+%%PORTDOCS%%share/doc/tik/CONTRIBUTORS
+%%PORTDOCS%%share/doc/tik/COPYING
+%%PORTDOCS%%share/doc/tik/LICENSE
+%%PORTDOCS%%share/doc/tik/NEW-FEATURES
+%%PORTDOCS%%share/doc/tik/README-LANG
+%%PORTDOCS%%share/doc/tik/TODO
+share/examples/tik/example.pkgrc
+share/examples/tik/example.tikstrs
+share/tik/balloonhelp.tcl
+share/tik/buddylist.tcl
+share/tik/buddymgmt.tcl
+share/tik/callbacks.tcl
+share/tik/chat.tcl
+share/tik/components/HTTPProxy.tcl
+share/tik/components/away.tcl
+share/tik/components/bcast.tcl
+share/tik/components/beat.tcl
+share/tik/components/boxinfo.tcl
+share/tik/components/buddylog.tcl
+share/tik/components/chatcapture.tcl
+share/tik/components/dir.tcl
+share/tik/components/filetrans.tcl
+share/tik/components/getaway.tcl
+share/tik/components/imcapture.tcl
+share/tik/components/pounce.tcl
+share/tik/components/quickchat.tcl
+share/tik/components/remoteadmin.tcl
+share/tik/components/remotegui.tcl
+share/tik/components/search.tcl
+share/tik/components/socksproxy.tcl
+share/tik/components/sslproxy.tcl
+share/tik/components/ticker.tcl
+share/tik/configTool.tcl
+share/tik/configandpkg.tcl
+share/tik/configdir.tcl
+share/tik/im.tcl
+share/tik/info.tcl
+share/tik/media/AOL.gif
+share/tik/media/Admin.gif
+share/tik/media/Away.gif
+share/tik/media/BuddyArrive.au
+share/tik/media/BuddyLeave.au
+share/tik/media/DT.gif
+share/tik/media/DoorSlam.wav
+share/tik/media/Icon.gif
+share/tik/media/Idle.gif
+share/tik/media/Login.gif
+share/tik/media/Logo.gif
+share/tik/media/Logout.gif
+share/tik/media/Oscar.gif
+share/tik/media/Pounce.wav
+share/tik/media/Receive.au
+share/tik/media/Send.au
+share/tik/media/add.gif
+share/tik/media/angel.gif
+share/tik/media/back.gif
+share/tik/media/bigsmile.gif
+share/tik/media/block.gif
+share/tik/media/bold.gif
+share/tik/media/bsmile.gif
+share/tik/media/burp.gif
+share/tik/media/chat.gif
+share/tik/media/close.gif
+share/tik/media/color.gif
+share/tik/media/crossedlips.gif
+share/tik/media/cry.gif
+share/tik/media/delete.gif
+share/tik/media/dooropen.wav
+share/tik/media/downarrow.gif
+share/tik/media/embarrassed.gif
+share/tik/media/font.gif
+share/tik/media/ignore.gif
+share/tik/media/im.gif
+share/tik/media/imrcv.wav
+share/tik/media/imsend.wav
+share/tik/media/info.gif
+share/tik/media/invite.gif
+share/tik/media/italic.gif
+share/tik/media/kiss.gif
+share/tik/media/moneymouth.gif
+share/tik/media/ok.gif
+share/tik/media/ring.wav
+share/tik/media/sad.gif
+share/tik/media/scream.gif
+share/tik/media/send.gif
+share/tik/media/smile.gif
+share/tik/media/smile8.gif
+share/tik/media/strike.gif
+share/tik/media/think.gif
+share/tik/media/tongue.gif
+share/tik/media/underline.gif
+share/tik/media/uparrow.gif
+share/tik/media/warn.gif
+share/tik/media/whisper.gif
+share/tik/media/wink.gif
+share/tik/media/yell.gif
+share/tik/packages/control.tcl
+share/tik/packages/mynews.tcl
+share/tik/popup.tcl
+share/tik/prefs.tcl
+share/tik/preproc.tcl
+share/tik/protocol.tcl
+share/tik/proxy.tcl
+share/tik/sag.tcl
+share/tik/sflap.tcl
+share/tik/strs/English.strs
+share/tik/tik.tcl
+share/tik/toc.tcl
+share/tik/ui.tcl
+share/tik/util.tcl
+share/tik/version.tcl
+@dirrm share/tik/strs
+@dirrm share/tik/packages
+@dirrm share/tik/media
+@dirrm share/tik/components
+@dirrm share/tik
+@dirrm share/examples/tik
+@dirrm share/doc/tik