From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 28 23:30:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B6C04235 for ; Wed, 28 Aug 2013 23:30:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 94CD22034 for ; Wed, 28 Aug 2013 23:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7SNU0rd041888 for ; Wed, 28 Aug 2013 23:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7SNU0qO041887; Wed, 28 Aug 2013 23:30:00 GMT (envelope-from gnats) Resent-Date: Wed, 28 Aug 2013 23:30:00 GMT Resent-Message-Id: <201308282330.r7SNU0qO041887@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, chris petrik Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 26CEF144 for ; Wed, 28 Aug 2013 23:22:20 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 04CE32FFC for ; Wed, 28 Aug 2013 23:22:20 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r7SNMJb4013429 for ; Wed, 28 Aug 2013 23:22:19 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r7SNMJ78013423; Wed, 28 Aug 2013 23:22:19 GMT (envelope-from nobody) Message-Id: <201308282322.r7SNMJ78013423@oldred.freebsd.org> Date: Wed, 28 Aug 2013 23:22:19 GMT From: chris petrik To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/181628: [PATCH] remove deprecated items from irc/bitchx X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Aug 2013 23:30:00 -0000 >Number: 181628 >Category: ports >Synopsis: [PATCH] remove deprecated items from irc/bitchx >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Aug 28 23:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: chris petrik >Release: >Organization: bsdjunk >Environment: >Description: Remove GTK/XMMS support from port as they are deprecated >How-To-Repeat: >Fix: Patch attached with submission follows: Index: irc/bitchx/Makefile =================================================================== --- irc/bitchx/Makefile (revision 325403) +++ irc/bitchx/Makefile (working copy) @@ -27,12 +27,10 @@ DATADIR= ${PREFIX}/share/bx MAN1= BitchX.1 -OPTIONS_DEFINE= ESOUND GNOME IPV6 LATIN PLUGINS SSL XMMS +OPTIONS_DEFINE= IPV6 LATIN PLUGINS SSL -GNOME_DESC= Legacy GTK/GNOME frontend LATIN_DESC= Recommended for ISO-8859-1 display PLUGINS_DESC= Build a handful of BitchX plugins -XMMS_DESC= Build XMMS plugin OPTIONS_DEFAULT= IPV6 PLUGINS SSL @@ -46,20 +44,6 @@ CONFIGURE_ARGS+= --with-ssl .endif -.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MESOUND} -USE_GNOME= gnomelibs -CONFIGURE_ARGS+= --with-gtk -. if ${PORT_OPTIONS:MESOUND} -USE_GNOME+= esound -CONFIGURE_ARGS+= --enable-sound -. endif -CFLAGS+= -I${LOCALBASE}/include/gnome-1.0 -PLIST_SUB+= NOGNOME="@comment " GNOME="" -.else -CONFIGURE_ARGS+= --without-gtk -PLIST_SUB+= GNOME="@comment " NOGNOME="" -.endif - .if ${PORT_OPTIONS:MPLUGINS} PLUGINS= abot acro aim arcfour autocycle blowfish cavlink cdrom encrypt \ europa fserv hint nap nicklist pkga possum qbx qmail wavplay @@ -68,14 +52,6 @@ PLIST_SUB+= PLUGINS="@comment " .endif -.if ${PORT_OPTIONS:MXMMS} -LIB_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms -PLUGINS+= xmms -PLIST_SUB+= XMMS="" -.else -PLIST_SUB+= XMMS="@comment " -.endif - .if !empty(PLUGINS) CONFIGURE_ARGS+= --with-plugins="${PLUGINS:C/\$$/,/g}" .else @@ -90,12 +66,8 @@ ${REINPLACE_CMD} -e 's|bzip2|true|g' ${WRKSRC}/Makefile.in post-install: -.if ${PORT_OPTIONS:MGNOME} - ${STRIP_CMD} ${PREFIX}/bin/gtkBitchX -.else ${STRIP_CMD} ${PREFIX}/bin/BitchX ${STRIP_CMD} ${PREFIX}/bin/scr-bx -.endif .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${DOCSDIR} Index: irc/bitchx/pkg-plist =================================================================== --- irc/bitchx/pkg-plist (revision 325403) +++ irc/bitchx/pkg-plist (working copy) @@ -1,9 +1,7 @@ @unexec if [ -f %D/%%DATADIR%%/script/bxglobal.old ]; then rm -f %D/share/bx/script/bxglobal.old; fi -%%NOGNOME%%bin/BitchX -%%NOGNOME%%bin/BitchX-%%DISTVERSION%% -%%GNOME%%bin/gtkBitchX -%%GNOME%%bin/gtkBitchX-%%DISTVERSION%% -%%NOGNOME%%bin/scr-bx +bin/BitchX +bin/BitchX-%%DISTVERSION%% +bin/scr-bx %%DATADIR%%/BitchX.help %%DATADIR%%/BitchX.ircnames %%DATADIR%%/BitchX.quit @@ -27,7 +25,6 @@ %%PLUGINS%%%%DATADIR%%/plugins/autocycle.so %%PLUGINS%%%%DATADIR%%/plugins/cdrom.so %%PLUGINS%%%%DATADIR%%/plugins/nicklist.so -%%XMMS%%%%DATADIR%%/plugins/xmms.so %%DATADIR%%/script/SCRIPTS %%DATADIR%%/script/actplug.gmz %%DATADIR%%/script/bxglobal @@ -77,7 +74,7 @@ %%DATADIR%%/translation/SWISS %%DATADIR%%/translation/UNITED_KINGDOM %%DATADIR%%/translation/UNITED_KINGDOM_COM -%%NOGNOME%%%%DATADIR%%/wserv +%%DATADIR%%/wserv @dirrm %%DATADIR%%/translation @dirrm %%DATADIR%%/script @dirrm %%DATADIR%%/plugins >Release-Note: >Audit-Trail: >Unformatted: