diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2013-09-08 02:38:25 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2013-09-08 02:38:25 +0800 |
| commit | a3bd5714afc3df78194e61788d409ab3c097b02c (patch) | |
| tree | 763c4dc6d7acc17764a809b891584643b72d7a4b /irc | |
| parent | 965cc0aa1158b61ade7c9ca04e23a592a37c552e (diff) | |
| download | freebsd-ports-gnome-a3bd5714afc3df78194e61788d409ab3c097b02c.tar.gz freebsd-ports-gnome-a3bd5714afc3df78194e61788d409ab3c097b02c.tar.zst freebsd-ports-gnome-a3bd5714afc3df78194e61788d409ab3c097b02c.zip | |
- 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)
Diffstat (limited to 'irc')
| -rw-r--r-- | irc/bitchx/Makefile | 32 | ||||
| -rw-r--r-- | irc/bitchx/pkg-plist | 11 |
2 files changed, 6 insertions, 37 deletions
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile index 12f5f24cc800..d725991432da 100644 --- a/irc/bitchx/Makefile +++ b/irc/bitchx/Makefile @@ -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} diff --git a/irc/bitchx/pkg-plist b/irc/bitchx/pkg-plist index fbc52582e3df..4bfa5d367745 100644 --- a/irc/bitchx/pkg-plist +++ b/irc/bitchx/pkg-plist @@ -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 |