4 files changed, 41 insertions, 68 deletions
diff --git a/irc/xchat-fish/Makefile b/irc/xchat-fish/Makefile
index d8617ec22c2b..bb269c3e3e3f 100644
--- a/irc/xchat-fish/Makefile
+++ b/irc/xchat-fish/Makefile
@@ -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>
diff --git a/irc/xchat-fish/files/patch-FiSH.c b/irc/xchat-fish/files/patch-FiSH.c
index 16c598bc91ee..1a653cb66bda 100644
--- a/irc/xchat-fish/files/patch-FiSH.c
+++ b/irc/xchat-fish/files/patch-FiSH.c
@@ -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
diff --git a/irc/xchat-mircryption/Makefile b/irc/xchat-mircryption/Makefile
index 69b83984e496..c320128fcbbf 100644
--- a/irc/xchat-mircryption/Makefile
+++ b/irc/xchat-mircryption/Makefile
@@ -16,15 +16,13 @@ COMMENT=	A free encryption add-on for the popular XChat irc client
 
 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/mircryption.so
 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>
diff --git a/irc/xchat-ruby/Makefile b/irc/xchat-ruby/Makefile
index fc31011bf8a7..5968697feff6 100644
--- a/irc/xchat-ruby/Makefile
+++ b/irc/xchat-ruby/Makefile
@@ -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-ruby.so
 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>