From 3d8ef5a52d6570c7a88c64337bb6c476b78c810c Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 26 May 2008 02:13:14 +0000 Subject: Second round of explicit pax dependencies. As reminded by tnn@, many packages used to use ${PAX}. Use the common way of directly calling pax, it is created as tool after all. --- chat/ircd-hybrid/Makefile | 6 ++++-- chat/mu-conference/Makefile | 6 +++--- chat/pircbot/Makefile | 5 +++-- chat/tik/Makefile | 14 +++++++------- chat/tkabber/Makefile | 8 ++++---- 5 files changed, 21 insertions(+), 18 deletions(-) (limited to 'chat') diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile index 8e8cc62176a..3b437109b54 100644 --- a/chat/ircd-hybrid/Makefile +++ b/chat/ircd-hybrid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2008/01/18 05:06:24 tnn Exp $ +# $NetBSD: Makefile,v 1.38 2008/05/26 02:13:16 joerg Exp $ DISTNAME= ircd-hybrid-7.2.3 PKGREVISION= 1 @@ -12,6 +12,8 @@ COMMENT= IRC server with many options CONFLICTS+= ircu-[0-9]* +USE_TOOLS+= pax + GNU_CONFIGURE= YES BUILD_DEFS+= IRCD_HYBRID_SYSLOG_FACILITY IRCD_HYBRID_NICLEN \ IRCD_HYBRID_TOPICLEN IRCD_HYBRID_MAXCONN \ @@ -106,7 +108,7 @@ post-install: ${RM} ${WRKSRC}/doc/Makefile ${RM} ${WRKSRC}/doc/Makefile.in - cd ${WRKSRC}/doc && ${PAX} -rwppm . ${HYBRID_DOC}/doc + cd ${WRKSRC}/doc && pax -rwppm . ${HYBRID_DOC}/doc cd ${WRKSRC}/messages && \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile index fb691c4dbb3..ee2d11f1c9e 100644 --- a/chat/mu-conference/Makefile +++ b/chat/mu-conference/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2008/04/07 17:45:40 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2008/05/26 02:13:16 joerg Exp $ # DISTNAME= mu-conference-0.6.0 @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/jcr-0.1.2 SUBWRKSRC= ${WRKSRC}/${DISTNAME}/src XMLCONFIG= ${WRKDIR}/${DISTNAME}/muc-jcr.xml -USE_TOOLS+= gmake pkg-config +USE_TOOLS+= gmake pax pkg-config PKG_SYSCONFSUBDIR= jabberd RCD_SCRIPTS= muc @@ -48,7 +48,7 @@ pre-configure: ${XMLCONFIG:Q}.in > ${XMLCONFIG:Q} pre-build: - cd ${WRKDIR:Q} && ${PAX} -rw -pe ${DISTNAME:Q} ${WRKSRC:Q} + cd ${WRKDIR:Q} && pax -rw -pe ${DISTNAME:Q} ${WRKSRC:Q} post-build: ${CP} ${WRKSRC:Q}/src/main.c ${WRKSRC:Q}/src/jcomp.mk ${SUBWRKSRC:Q} diff --git a/chat/pircbot/Makefile b/chat/pircbot/Makefile index 755ea875d30..78c9f05cc4d 100644 --- a/chat/pircbot/Makefile +++ b/chat/pircbot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/03/03 02:19:52 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2008/05/26 02:13:16 joerg Exp $ # DISTNAME= pircbot-0.9.11 @@ -16,6 +16,7 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_JAVA= run NO_CONFIGURE= YES NO_BUILD= YES +USE_TOOLS+= pax post-extract: ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755 @@ -26,7 +27,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/pircbot.jar ${DESTDIR}${PREFIX}/lib/java ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/java/pircbot cd ${WRKSRC}/javadocs && \ - ${PAX} -rw -pp -pm . ${DESTDIR}${PREFIX}/share/doc/java/pircbot + pax -rw -pp -pm . ${DESTDIR}${PREFIX}/share/doc/java/pircbot .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/tik/Makefile b/chat/tik/Makefile index d72774bca49..c4cd79ce7f6 100644 --- a/chat/tik/Makefile +++ b/chat/tik/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2008/03/03 02:19:52 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2008/05/26 02:13:16 joerg Exp $ # DISTNAME= tik-0.90 @@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR}/tik NO_BUILD= yes -USE_TOOLS+= wish:run +USE_TOOLS+= pax wish:run REPLACE_INTERPRETER+= wish REPLACE.wish.old= .*sh @@ -53,12 +53,12 @@ do-install: ${WRKSRC}/example.pkgrc \ ${DESTDIR}${TIKDIR} cd ${WRKSRC} && \ - ${PAX} -rw components ${DESTDIR}${TIKDIR} && \ - ${PAX} -rw media ${DESTDIR}${TIKDIR} && \ - ${PAX} -rw packages ${DESTDIR}${TIKDIR} && \ - ${PAX} -rw strs ${DESTDIR}${TIKDIR} + pax -rw components ${DESTDIR}${TIKDIR} && \ + pax -rw media ${DESTDIR}${TIKDIR} && \ + pax -rw packages ${DESTDIR}${TIKDIR} && \ + pax -rw strs ${DESTDIR}${TIKDIR} ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/tik - cd ${WRKSRC}/doc && ${PAX} -rw . ${DESTDIR}${PREFIX}/share/doc/tik + cd ${WRKSRC}/doc && pax -rw . ${DESTDIR}${PREFIX}/share/doc/tik ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/tik ${INSTALL_DATA} \ ${WRKSRC}/example.awayrc \ diff --git a/chat/tkabber/Makefile b/chat/tkabber/Makefile index eb13cd7d94b..93175262fb6 100644 --- a/chat/tkabber/Makefile +++ b/chat/tkabber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/03/08 18:57:38 reed Exp $ +# $NetBSD: Makefile,v 1.2 2008/05/26 02:13:16 joerg Exp $ # # TODO: gnupg support, ssl support, others @@ -15,7 +15,7 @@ DEPENDS+= tcllib-[0-9]*:../../devel/tcllib DEPENDS+= bwidget>=1.8.0:../../x11/bwidget NO_BUILD= yes -USE_TOOLS+= wish:run +USE_TOOLS+= pax wish:run EGDIR= ${PREFIX}/share/examples/tkabber DATADIR= ${PREFIX}/share/tkabber @@ -39,9 +39,9 @@ EXTRA_FILES= AUTHORS README COPYING INSTALL ChangeLog do-install: ${INSTALL_DATA} ${WRKSRC}/*.tcl ${DATADIR} #${WRKSRC}/*.xrdb ${DATADIR} cd ${WRKSRC} && ${INSTALL_DATA} ${EXTRA_FILES} ${DOCDIR} - cd ${WRKSRC}/examples && ${PAX} -rw -pm . ${EGDIR} + cd ${WRKSRC}/examples && pax -rw -pm . ${EGDIR} .for i in ${SUBDIRS} - cd ${WRKSRC} && ${PAX} -rw -pm ${i} ${DATADIR} + cd ${WRKSRC} && pax -rw -pm ${i} ${DATADIR} .endfor # TODO This must be a CLASS ${SED} -e "s,@WISH@,${WISH}," \ -- cgit v1.2.3