From 8e84580f055d37994ce1d6c5a0d2c350a8271d51 Mon Sep 17 00:00:00 2001
From: db <db@FreeBSD.org>
Date: Tue, 18 Aug 2015 23:05:43 +0000
Subject: Reassign ownership to hamradio@ Clean up portlint -C warnings do not
 mute install Clean up QA reported error in staging Correct upstream website
 in Makefile fetch and pkg-descr No binary changes

---
 irc/cwirc/Makefile       | 16 +++++++---------
 irc/cwirc/files/Makefile | 18 ++++++++++--------
 irc/cwirc/pkg-descr      |  2 +-
 irc/cwirc/pkg-plist      | 14 +++++++-------
 4 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'irc')

diff --git a/irc/cwirc/Makefile b/irc/cwirc/Makefile
index dcdbf06f5bc0..a8b4a88d0620 100644
--- a/irc/cwirc/Makefile
+++ b/irc/cwirc/Makefile
@@ -5,10 +5,10 @@ PORTNAME=	cwirc
 PORTVERSION=	2.0.0
 PORTREVISION=	5
 CATEGORIES=	irc comms hamradio
-MASTER_SITES=	http://users.skynet.be/ppc/cwirc/download/ \
+MASTER_SITES=	http://myspace.voo.be/pcoupard/cwirc/download/ \
 		LOCAL/db
 
-MAINTAINER=	db@FreeBSD.org
+MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	X-Chat Morse plugin
 
 LICENSE=	GPLv2
@@ -17,21 +17,19 @@ BUILD_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
 USES=		pkgconfig
 
-OPTIONS_DEFINE=	DOCS
-
 post-patch:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
-	  -e 's|%%STAGEDIR%%|${STAGEDIR}|' ${WRKSRC}/Makefile
+		-e 's|%%STAGEDIR%%|${STAGEDIR}|' ${WRKSRC}/Makefile
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in COPYING LISEZMOI README RELEASE_NOTES
-	@${INSTALL_DATA}  ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA}  ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/schematics
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/schematics
 .for f in cw_oscillator.jpg rs232_key_connection.jpg
-	@${INSTALL_DATA} ${WRKSRC}/schematics/$f ${STAGEDIR}${DOCSDIR}/schematics
+	${INSTALL_DATA} ${WRKSRC}/schematics/$f ${STAGEDIR}${DOCSDIR}/schematics
 .endfor
 
 .include <bsd.port.mk>
diff --git a/irc/cwirc/files/Makefile b/irc/cwirc/files/Makefile
index f332072e451d..89cc21275856 100644
--- a/irc/cwirc/files/Makefile
+++ b/irc/cwirc/files/Makefile
@@ -17,9 +17,11 @@
 #
 # $FreeBSD$
 TARGET_OS=FREEBSD
-PLUGIN_INSTALL_DIRECTORY=%%STAGEDIR%%%%PREFIX%%/lib/xchat/plugins
-FRONTEND_INSTALL_DIRECTORY=%%STAGEDIR%%%%PREFIX%%/bin
-CWIRC_EXTENSIONS_DIRECTORY=%%STAGEDIR%%%%PREFIX%%/share/cwirc/extensions
+STAGEDIR=%%STAGEDIR%%
+PREFIX=%%PREFIX%%
+PLUGIN_INSTALL_DIRECTORY=${PREFIX}/lib/xchat/plugins
+FRONTEND_INSTALL_DIRECTORY=${PREFIX}/bin
+CWIRC_EXTENSIONS_DIRECTORY=${PREFIX}/share/cwirc/extensions
 #EXTRA_LDFLAGS=
 
 # Use these with Debian GNU/Linux for example
@@ -74,11 +76,11 @@ all:			missing_settings				\
 install:		missing_settings				\
 			$(PLUGIN)					\
 			$(FRONTEND)
-			$(MKDIR) -p $(PLUGIN_INSTALL_DIRECTORY)
-			$(MKDIR) -p $(CWIRC_EXTENSIONS_DIRECTORY)
-			$(CP) $(PLUGIN) $(PLUGIN_INSTALL_DIRECTORY)
-			$(MKDIR) -p $(FRONTEND_INSTALL_DIRECTORY)
-			$(CP) $(FRONTEND) $(FRONTEND_INSTALL_DIRECTORY)
+			$(MKDIR) -p $(STAGEDIR)$(PLUGIN_INSTALL_DIRECTORY)
+			$(MKDIR) -p $(STAGEDIR)$(CWIRC_EXTENSIONS_DIRECTORY)
+			$(CP) $(PLUGIN) $(STAGEDIR)$(PLUGIN_INSTALL_DIRECTORY)
+			$(MKDIR) -p $(STAGEDIR)$(FRONTEND_INSTALL_DIRECTORY)
+			$(CP) $(FRONTEND) $(STAGEDIR)$(FRONTEND_INSTALL_DIRECTORY)
 
 uninstall:		missing_settings
 			$(RM) -f $(PLUGIN_INSTALL_DIRECTORY)/$(PLUGIN)
diff --git a/irc/cwirc/pkg-descr b/irc/cwirc/pkg-descr
index 910ad95fba4b..d2f962a7b1fa 100644
--- a/irc/cwirc/pkg-descr
+++ b/irc/cwirc/pkg-descr
@@ -8,4 +8,4 @@ straight or iambic key connected to a serial port, or using the mouse buttons,
 and the sound is played through the soundcard, or through an external sounder. 
 
 
-WWW: http://users.skynet.be/ppc/cwirc/
+WWW: http://myspace.voo.be/pcoupard/cwirc
diff --git a/irc/cwirc/pkg-plist b/irc/cwirc/pkg-plist
index 3b1b0c7a9ec8..92d17649819f 100644
--- a/irc/cwirc/pkg-plist
+++ b/irc/cwirc/pkg-plist
@@ -1,8 +1,8 @@
-bin/cwirc_frontend
+#bin/cwirc_frontend
 lib/xchat/plugins/cwirc.so
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/LISEZMOI
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/schematics/cw_oscillator.jpg
-%%PORTDOCS%%%%DOCSDIR%%/schematics/rs232_key_connection.jpg
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/LISEZMOI
+%%DOCSDIR%%/README
+%%DOCSDIR%%/RELEASE_NOTES
+%%DOCSDIR%%/schematics/cw_oscillator.jpg
+%%DOCSDIR%%/schematics/rs232_key_connection.jpg
-- 
cgit