Attachment 79697 Details for Bug 114453 – xchat-2.8.4_1.patch

[patch] xchat-2.8.4_1.patch

xchat-2.8.4_1.patch (text/plain), 7.60 KB, created by Yuri Pankov on 2007-07-09 18:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Pankov

Created: 2007-07-09 18:30:03 UTC

Size: 7.60 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/irc/xchat.orig/Makefile /usr/ports/irc/xchat/Makefile
>--- /usr/ports/irc/xchat.orig/Makefile	2007-07-09 18:27:13.000000000 +0400
>+++ /usr/ports/irc/xchat/Makefile	2007-07-09 20:50:56.000000000 +0400
>@@ -8,6 +8,7 @@
> 
> PORTNAME=	xchat
> PORTVERSION=	2.8.4
>+PORTREVISION=	1
> CATEGORIES=	irc gnome ipv6
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
> 		http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
>@@ -16,46 +17,27 @@
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	An X11 IRC client using the GTK+ 2 toolkit
> 
>+CONFLICTS=	xchat-1* xchat-systray-plugin-[0-9]*
>+
> USE_BZIP2=	yes
> USE_GMAKE=	yes
> USE_GNOME=	gnomehack gtk20
>-USE_GETTEXT=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
> 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
>-CONFIGURE_ARGS=	--enable-nls \
>-		--enable-ipv6
>+CONFIGURE_ARGS=	--enable-ipv6
> 
>-CONFLICTS=	xchat-1* xchat-systray-plugin-[0-9]*
>-
>-.if defined(WITH_SOCKS)
>-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
>-CONFIGURE_ARGS+=	--enable-socks
>-.endif
>-
>-# openssl in now default in configure
>-
>-.if defined(WITH_PYTHON)
>-USE_PYTHON=		yes
>-CONFIGURE_ARGS+=	--enable-python
>-PLIST_SUB+=		PYTHON=""
>-.else
>-CONFIGURE_ARGS+=	--disable-python
>-PLIST_SUB+=		PYTHON="@comment "
>-.endif
>+OPTIONS=	DBUS "Enable DBUS support" on \
>+		GTKSPELL "Enable spell check support using gtkspell" off \
>+		LIBSEXY "Enable spell check support using libsexy" off \
>+		NOTIFY "Depend on libnotify for notifications" off \
>+		NLS "Enable National Language Support" on \
>+		PERL "Enable Perl support" on \
>+		PYTHON "Enable Python support" off \
>+		TCL "Enable TCL support" off \
>+		SOCKS "Build with socks5 support" off
> 
>-.if defined(WITH_TCL)
>-LIB_DEPENDS+=	tcl83.1:${PORTSDIR}/lang/tcl83
>-CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3
>-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
>-		-I${LOCALBASE}/include/tcl8.3" \
>-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
>-		-L${LOCALBASE}/lib/tcl8.3"
>-PLIST_SUB+=	TCL=""
>-.else
>-CONFIGURE_ARGS+=--enable-tcl=no
>-PLIST_SUB+=	TCL="@comment "
>-.endif
>+.include <bsd.port.pre.mk>
> 
> .if !defined(WITHOUT_DBUS)
> LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
>@@ -68,16 +50,41 @@
> PLIST_SUB+=	DBUS="@comment "
> .endif
> 
>-.if !defined(WITHOUT_GTKSPELL)
>+.if defined(WITH_GTKSPELL)
>+.if defined(WITH_LIBSEXY)
>+BROKEN=		You can select only one of GTKSPELL and LIBSEXY for spell check support
>+.endif
> LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
> CONFIGURE_ARGS+=--enable-spell=gtkspell
>-.else
>-CONFIGURE_ARGS+=--disable-spell
> .endif
> 
>-.include <bsd.port.pre.mk>
>+.if defined(WITH_LIBSEXY)
>+.if defined(WITH_GTKSPELL)
>+BROKEN=		You can select only one of GTKSPELL and LIBSEXY for spell check support
>+.endif
>+LIB_DEPENDS+=	sexy.2:${PORTSDIR}/x11-toolkits/libsexy
>+CONFIGURE_ARGS+=--enable-spell=libsexy
>+.endif
>+
>+.if !defined(WITH_GTKSPELL) && !defined(WITH_LIBSEXY)
>+CONFIGURE_ARGS+=--enable-spell=none
>+.endif
> 
>-.if ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL)
>+.if defined(WITH_NOTIFY)
>+RUN_DEPENDS+=	notify-send:${PORTSDIR}/devel/libnotify \
>+		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
>+.endif
>+
>+.if !defined(WITHOUT_NLS)
>+USE_GETTEXT=	yes
>+CONFIGURE_ARGS+=--enable-nls
>+PLIST_SUB+=	NLS=""
>+.else
>+CONFIGURE_ARGS+=--disable-nls
>+PLIST_SUB+=	NLS="@comment "
>+.endif
>+
>+.if defined(WITHOUT_PERL)
> CONFIGURE_ARGS+=--disable-perl
> PLIST_SUB+=	PERL="@comment "
> .else
>@@ -86,28 +93,32 @@
> PLIST_SUB+=	PERL=""
> .endif
> 
>-pre-everything::
>-.if !defined(WITH_PYTHON) || !defined(WITH_SOCKS) || !defined(WITH_TCL) || !defined(WITHOUT_PERL) || !defined(WITHOUT_DBUS) || !defined(WITHOUT_GTKSPELL)
>-	@${ECHO_MSG} "You may specify the following on the command line:"
>-	@${ECHO_MSG} ""
>-.endif
>-.if !defined(WITH_PYTHON)
>-	@${ECHO_MSG} "WITH_PYTHON=yes for Python support"
>-.endif
>-.if !defined(WITH_SOCKS)
>-	@${ECHO_MSG} "WITH_SOCKS=yes for SOCKS5 proxy support"
>-.endif
>-.if !defined(WITH_TCL)
>-	@${ECHO_MSG} "WITH_TCL=yes for tcl support"
>-.endif
>-.if !defined(WITHOUT_PERL)
>-	@${ECHO_MSG} "WITHOUT_PERL=yes to disable Perl support"
>+.if defined(WITH_PYTHON)
>+USE_PYTHON=	yes
>+.include "${PORTSDIR}/Mk/bsd.python.mk"
>+CONFIGURE_ARGS+=--enable-python
>+PLIST_SUB+=	PYTHON=""
>+.else
>+CONFIGURE_ARGS+=--disable-python
>+PLIST_SUB+=	PYTHON="@comment "
> .endif
>-.if !defined(WITHOUT_DBUS)
>-	@${ECHO_MSG} "WITHOUT_DBUS=yes to disable dbus support"
>+
>+.if defined(WITH_TCL)
>+LIB_DEPENDS+=	tcl84.1:${PORTSDIR}/lang/tcl84
>+CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.4
>+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
>+		-I${LOCALBASE}/include/tcl8.4" \
>+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
>+		-L${LOCALBASE}/lib/tcl8.4"
>+PLIST_SUB+=	TCL=""
>+.else
>+CONFIGURE_ARGS+=--enable-tcl=no
>+PLIST_SUB+=	TCL="@comment "
> .endif
>-.if !defined(WITHOUT_GTKSPELL)
>-	@${ECHO_MSG} "WITHOUT_GTKSPELL=yes to disable spell check support"
>+
>+.if defined(WITH_SOCKS)
>+BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
>+CONFIGURE_ARGS+=--enable-socks
> .endif
> 
> post-patch:
>diff -ruN --exclude=CVS /usr/ports/irc/xchat.orig/pkg-plist /usr/ports/irc/xchat/pkg-plist
>--- /usr/ports/irc/xchat.orig/pkg-plist	2007-07-09 18:27:13.000000000 +0400
>+++ /usr/ports/irc/xchat/pkg-plist	2007-07-09 19:45:57.000000000 +0400
>@@ -7,32 +7,32 @@
> %%TCL%%lib/xchat/plugins/tcl.so
> share/applications/xchat.desktop
> %%DBUS%%share/dbus-1/services/org.xchat.service.service
>-share/locale/be/LC_MESSAGES/xchat.mo
>-share/locale/ca/LC_MESSAGES/xchat.mo
>-share/locale/cs/LC_MESSAGES/xchat.mo
>-share/locale/de/LC_MESSAGES/xchat.mo
>-share/locale/el/LC_MESSAGES/xchat.mo
>-share/locale/es/LC_MESSAGES/xchat.mo
>-share/locale/fi/LC_MESSAGES/xchat.mo
>-share/locale/fr/LC_MESSAGES/xchat.mo
>-share/locale/gl/LC_MESSAGES/xchat.mo
>-share/locale/hu/LC_MESSAGES/xchat.mo
>-share/locale/it/LC_MESSAGES/xchat.mo
>-share/locale/ja/LC_MESSAGES/xchat.mo
>-share/locale/ko/LC_MESSAGES/xchat.mo
>-share/locale/lt/LC_MESSAGES/xchat.mo
>-share/locale/mk/LC_MESSAGES/xchat.mo
>-share/locale/nl/LC_MESSAGES/xchat.mo
>-share/locale/pa/LC_MESSAGES/xchat.mo
>-share/locale/pt/LC_MESSAGES/xchat.mo
>-share/locale/ru/LC_MESSAGES/xchat.mo
>-share/locale/sq/LC_MESSAGES/xchat.mo
>-share/locale/sr/LC_MESSAGES/xchat.mo
>-share/locale/sv/LC_MESSAGES/xchat.mo
>-share/locale/uk/LC_MESSAGES/xchat.mo
>-share/locale/vi/LC_MESSAGES/xchat.mo
>-share/locale/zh_CN/LC_MESSAGES/xchat.mo
>-share/locale/zh_TW/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/be/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/ca/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/cs/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/de/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/el/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/es/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/fi/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/fr/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/gl/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/hu/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/it/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/ja/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/ko/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/lt/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/mk/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/nl/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/pa/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/pt/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/ru/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/sq/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/sr/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/sv/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/uk/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/vi/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xchat.mo
>+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xchat.mo
> share/pixmaps/xchat.png
> @dirrmtry share/applications
> @exec mkdir -p %D/lib/xchat/plugins

Actions: View | Diff

Attachments on bug 114453: 79697