Date: Fri, 29 Nov 2013 19:55:30 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335216 - in head/irc: xchat-fish xchat-fish/files xchat-mircryption xchat-ruby Message-ID: <201311291955.rATJtUpH086088@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Fri Nov 29 19:55:29 2013 New Revision: 335216 URL: http://svnweb.freebsd.org/changeset/ports/335216 Log: - use STAGEDIR - use USE_DOS2UNIX Modified: head/irc/xchat-fish/Makefile head/irc/xchat-fish/files/patch-FiSH.c head/irc/xchat-mircryption/Makefile head/irc/xchat-ruby/Makefile Modified: head/irc/xchat-fish/Makefile ============================================================================== --- head/irc/xchat-fish/Makefile Fri Nov 29 19:50:54 2013 (r335215) +++ head/irc/xchat-fish/Makefile Fri Nov 29 19:55:29 2013 (r335216) @@ -17,10 +17,9 @@ COMMENT= An encryption plugin for XChat BUILD_DEPENDS= ${LOCALBASE}/lib/libmiracl.a:${PORTSDIR}/math/miracl RUN_DEPENDS= xchat:${PORTSDIR}/irc/xchat -NO_STAGE= yes - USE_ZIP= yes NO_WRKSUBDIR= yes +USE_DOS2UNIX= yes DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} CCFLAGS+= -Wall -O2 -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -30,27 +29,19 @@ PLIST_FILES= lib/xchat/plugins/xfish.so PORTDOCS= FiSH-xchat.txt \ FiSH-xchat_History.txt +.include <bsd.port.options.mk> + post-patch: - @${CP} -pf ${FILESDIR}/Makefile ${WRKSRC}/ - @${RM} -f ${WRKSRC}/mir* -# \r\n -> \n - @${FIND} ${WRKSRC} -type f -exec \ - ${REINPLACE_CMD} -E \ - -e 's| ||' \ - {} \; + ${RM} -f ${WRKSRC}/mir* + ${CP} -pf ${FILESDIR}/Makefile ${WRKSRC}/ do-install: -# docs -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for doc in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${doc} \ - ${DOCSDIR}/ -.endfor + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/xchat/plugins + ${INSTALL_PROGRAM} ${WRKSRC}/xfish.so \ + ${STAGEDIR}${PREFIX}/lib/xchat/plugins/ +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .endif -# plugin - @${MKDIR} ${PREFIX}/lib/xchat/plugins - @${INSTALL_PROGRAM} ${WRKSRC}/xfish.so \ - ${PREFIX}/lib/xchat/plugins/ .include <bsd.port.mk> Modified: head/irc/xchat-fish/files/patch-FiSH.c ============================================================================== --- head/irc/xchat-fish/files/patch-FiSH.c Fri Nov 29 19:50:54 2013 (r335215) +++ head/irc/xchat-fish/files/patch-FiSH.c Fri Nov 29 19:55:29 2013 (r335216) @@ -1,10 +1,10 @@ --- FiSH.c.orig 2006-03-15 22:17:58.000000000 +0100 +++ FiSH.c 2008-03-29 17:27:33.000000000 +0100 @@ -4,6 +4,7 @@ - - + + #include "xchat-plugin.h" +#include <ctype.h> #include "FiSH.h" - static xchat_plugin *ph=0; // plugin handle + static xchat_plugin *ph=0; // plugin handle Modified: head/irc/xchat-mircryption/Makefile ============================================================================== --- head/irc/xchat-mircryption/Makefile Fri Nov 29 19:50:54 2013 (r335215) +++ head/irc/xchat-mircryption/Makefile Fri Nov 29 19:55:29 2013 (r335216) @@ -16,15 +16,13 @@ COMMENT= A free encryption add-on for th RUN_DEPENDS= xchat:${PORTSDIR}/irc/xchat -NO_STAGE= yes - USE_ZIP= yes +USE_DOS2UNIX= yes ALL_TARGET= freebsd CFLAGS+= -fPIC USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/src/xchat/ -# DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} @@ -33,44 +31,32 @@ PLIST_FILES= lib/xchat/plugins/mircrypti PORTDOCS= README.txt PORTEXAMPLES= mcps_masterkey_on_start.pl +.include <bsd.port.options.mk> + post-patch: -# \r\n -> \n - @${FIND} ${WRKSRC} -type f -exec \ - ${REINPLACE_CMD} -E \ - -e 's| ||' \ - {} \; -# CFLAGS safeness -# LDFLAGS safeness -# linker safeness - @${REINPLACE_CMD} -E \ + ${REINPLACE_CMD} -E \ -e 's|^(CFLAGS.+)"$$|\1 ${CFLAGS}"|' \ -e 's|^(LDFLAGS.+)"$$|\1 ${LDFLAGS}"|' \ -e 's|^(LOAD).*$$|LOAD=${CXX}|' \ ${WRKSRC}/${MAKEFILE} -# set perl path if it exists -.ifdef(PERL5) - @${REINPLACE_CMD} -E \ + ${REINPLACE_CMD} -E \ -e 's|/usr/bin/perl|${PERL5}|' \ ${WRKSRC}/extras/mcps_masterkey_on_start.pl -.endif do-install: -# docs -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README.txt \ - ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/xchat/plugins + ${INSTALL_PROGRAM} ${WRKSRC}/mircryption.so \ + ${STAGEDIR}${PREFIX}/lib/xchat/plugins +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.txt \ + ${STAGEDIR}${DOCSDIR}/ .endif -# plugin - @${MKDIR} ${PREFIX}/lib/xchat/plugins - @${INSTALL_PROGRAM} ${WRKSRC}/mircryption.so \ - ${PREFIX}/lib/xchat/plugins -# script -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_SCRIPT} \ +.if ${PORT_OPTIONS:MEXAMPLES} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} \ ${WRKSRC}/extras/mcps_masterkey_on_start.pl \ - ${EXAMPLESDIR} + ${STAGEDIR}${EXAMPLESDIR}/ .endif .include <bsd.port.mk> Modified: head/irc/xchat-ruby/Makefile ============================================================================== --- head/irc/xchat-ruby/Makefile Fri Nov 29 19:50:54 2013 (r335215) +++ head/irc/xchat-ruby/Makefile Fri Nov 29 19:55:29 2013 (r335216) @@ -15,8 +15,6 @@ RUN_DEPENDS= xchat:${PORTSDIR}/irc/xchat LICENSE= GPLv2 -NO_STAGE= yes - USE_RUBY= yes USE_LIBRUBY= yes WRKSRC= ${WRKDIR}/${DISTNAME}/src @@ -27,6 +25,8 @@ PLIST_FILES= lib/xchat/plugins/xchat-rub PORTDOCS= README ChangeLog PORTEXAMPLES= embedify.rb TimerSample.rb JFilter.rb JBanner.rb +.include <bsd.port.options.mk> + post-patch: ${REINPLACE_CMD} \ -e 's|^RUBY=.*|RUBY=${RUBY}|' \ @@ -35,21 +35,17 @@ post-patch: ${WRKSRC}/Makefile do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/xchat/plugins ${INSTALL_PROGRAM} ${WRKSRC}/xchat-ruby.so \ - ${PREFIX}/lib/xchat/plugins/ -.ifndef(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for doc in ${PORTDOCS} - ${INSTALL_DATA} ${DOCSRC}/${doc} \ - ${DOCSDIR}/ -.endfor + ${STAGEDIR}${PREFIX}/lib/xchat/plugins/ +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${DOCSRC}/,} ${STAGEDIR}${DOCSDIR}/ .endif -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} -.for doc in ${PORTEXAMPLES} - ${INSTALL_DATA} ${DOCSRC}/*/${doc} \ - ${EXAMPLESDIR}/ -.endfor +.if ${PORT_OPTIONS:MEXAMPLES} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${PORTEXAMPLES:S,^,${DOCSRC}/*/,} \ + ${STAGEDIR}${EXAMPLESDIR}/ .endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311291955.rATJtUpH086088>