Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Apr 2018 20:21:08 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r467654 - in head/irc/cwirc: . files
Message-ID:  <201804172021.w3HKL8KK052843@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Tue Apr 17 20:21:07 2018
New Revision: 467654
URL: https://svnweb.freebsd.org/changeset/ports/467654

Log:
  irc/cwirc: save from irc/xchat removal, that port expired
  
  - port to irc/hexchat (runtime tested, works except for opening soundcard,
    no real keyer here)
  - remove bundled copy of xchat.h from irc/xchat during build
  - add a bunch of missing dependencies, found by stage-qa
  - bump PORTREVISION
  
  Approved by:	fixit blanket

Modified:
  head/irc/cwirc/Makefile
  head/irc/cwirc/files/Makefile
  head/irc/cwirc/pkg-plist

Modified: head/irc/cwirc/Makefile
==============================================================================
--- head/irc/cwirc/Makefile	Tue Apr 17 20:18:05 2018	(r467653)
+++ head/irc/cwirc/Makefile	Tue Apr 17 20:21:07 2018	(r467654)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cwirc
 PORTVERSION=	2.0.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	irc comms hamradio
 MASTER_SITES=	http://myspace.voo.be/pcoupard/cwirc/download/ \
 		LOCAL/db
@@ -13,14 +13,20 @@ COMMENT=	X-Chat Morse plugin
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xchat:irc/xchat
+BUILD_DEPENDS=	hexchat:irc/hexchat
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 
-USES=		pkgconfig
+USES=		gettext-runtime gnome pkgconfig
+USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 pango
 
 post-patch:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		-e 's|%%STAGEDIR%%|${STAGEDIR}|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|xchat|hexchat|g' \
+		-e 's|XCHAT|HEXCHAT|g' ${WRKSRC}/plugin.c
+	@${RM} -r ${WRKSRC}/xchat
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/irc/cwirc/files/Makefile
==============================================================================
--- head/irc/cwirc/files/Makefile	Tue Apr 17 20:18:05 2018	(r467653)
+++ head/irc/cwirc/files/Makefile	Tue Apr 17 20:21:07 2018	(r467654)
@@ -19,7 +19,7 @@
 TARGET_OS=FREEBSD
 STAGEDIR=%%STAGEDIR%%
 PREFIX=%%PREFIX%%
-PLUGIN_INSTALL_DIRECTORY=${PREFIX}/lib/xchat/plugins
+PLUGIN_INSTALL_DIRECTORY=${PREFIX}/lib/hexchat/plugins
 FRONTEND_INSTALL_DIRECTORY=${PREFIX}/bin
 CWIRC_EXTENSIONS_DIRECTORY=${PREFIX}/share/cwirc/extensions
 #EXTRA_LDFLAGS=
@@ -60,7 +60,7 @@ PWD?=pwd
 CC?=gcc
 STRIP?=strip
 
-XCHAT_PLUGIN_INCLUDE_PATH=xchat
+XCHAT_PLUGIN_INCLUDE_PATH=${PREFIX}/include
 
 XCHAT_INC=-I$(XCHAT_PLUGIN_INCLUDE_PATH)
 #CFLAGS=-Wall -Wstrict-prototypes -O2 -D$(TARGET_OS)
@@ -114,7 +114,7 @@ $(FRONTEND):		$(FRONTEND_OBJS)
 			$(STRIP) $@
 
 plugin.shared.o:	plugin.c					\
-			$(XCHAT_PLUGIN_INCLUDE_PATH)/xchat-plugin.h	\
+			$(XCHAT_PLUGIN_INCLUDE_PATH)/hexchat-plugin.h	\
 			types.h						\
 			common.h					\
 			cwirc.h						\

Modified: head/irc/cwirc/pkg-plist
==============================================================================
--- head/irc/cwirc/pkg-plist	Tue Apr 17 20:18:05 2018	(r467653)
+++ head/irc/cwirc/pkg-plist	Tue Apr 17 20:21:07 2018	(r467654)
@@ -1,5 +1,5 @@
 bin/cwirc_frontend
-lib/xchat/plugins/cwirc.so
+lib/hexchat/plugins/cwirc.so
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/LISEZMOI
 %%DOCSDIR%%/README



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804172021.w3HKL8KK052843>