Bug 181628

Summary: [PATCH] remove deprecated items from irc/bitchx
Product: Ports & Packages Reporter: Chris Petrik <c.petrik.sosa>
Component: Individual Port(s)Assignee: Po-Chuan Hsieh <sunpoet>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Chris Petrik 2013-08-29 00:30:00 UTC 
Remove GTK/XMMS support from port as they are deprecated

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-08-29 00:30:18 UTC 
Class Changed
From-To: maintainer-update->change-request

Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-08-29 00:30:19 UTC 
Maintainer of irc/bitchx,

Please note that PR ports/181628 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/181628

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2013-08-29 00:30:20 UTC 
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Chris Petrik 2013-09-06 05:45:39 UTC 
This can be approved as im now a maintainer for bitchx
Comment 5 Mark Linimon freebsd_committer freebsd_triage 2013-09-07 18:42:20 UTC 
State Changed
From-To: feedback->open

co-maintainer approved.
Comment 6 Po-Chuan Hsieh freebsd_committer freebsd_triage 2013-09-07 19:38:32 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 7 Po-Chuan Hsieh freebsd_committer freebsd_triage 2013-09-07 19:38:32 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->sunpoet

Committed. Thanks!
Comment 8 dfilter service freebsd_committer freebsd_triage 2013-09-07 19:38:38 UTC 
Author: sunpoet
Date: Sat Sep  7 18:38:25 2013
New Revision: 326679
URL: http://svnweb.freebsd.org/changeset/ports/326679

Log:
  - Remove deprecated GTK/XMMS support
  - While I'm here:
    - Add DOCS to OPTIONS_DEFINE
    - Remove IPV6 from OPTIONS_DEFAULT
  
  PR:		ports/181628
  Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com> (co-maintainer)

Modified:
  head/irc/bitchx/Makefile
  head/irc/bitchx/pkg-plist

Modified: head/irc/bitchx/Makefile
==============================================================================
--- head/irc/bitchx/Makefile	Sat Sep  7 18:26:26 2013	(r326678)
+++ head/irc/bitchx/Makefile	Sat Sep  7 18:38:25 2013	(r326679)
@@ -28,14 +28,12 @@ PORTDOCS=	*
 DATADIR=	${PREFIX}/share/bx
 MAN1=		BitchX.1
 
-OPTIONS_DEFINE=	ESOUND GNOME IPV6 LATIN PLUGINS SSL XMMS
+OPTIONS_DEFINE=	IPV6 LATIN PLUGINS SSL DOCS
 
-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
+OPTIONS_DEFAULT=PLUGINS SSL
 
 .include <bsd.port.options.mk>
 
@@ -47,20 +45,6 @@ CONFIGURE_ARGS+=	--enable-ipv6
 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
@@ -69,14 +53,6 @@ PLIST_SUB+=	PLUGINS=""
 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
@@ -91,12 +67,8 @@ post-patch:
 	${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}

Modified: head/irc/bitchx/pkg-plist
==============================================================================
--- head/irc/bitchx/pkg-plist	Sat Sep  7 18:26:26 2013	(r326678)
+++ head/irc/bitchx/pkg-plist	Sat Sep  7 18:38:25 2013	(r326679)
@@ -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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"