Attachment 172464 Details for Bug 211083 – corrected patch

[patch] corrected patch

file_211083.txt (text/plain), 3.63 KB, created by Piotr Kubaj on 2016-07-13 15:30:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2016-07-13 15:30:12 UTC

Size: 3.63 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 418428)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	hexchat
>-PORTVERSION=	2.10.2
>+PORTVERSION=	2.12.1
> CATEGORIES=	irc gnome ipv6
> MASTER_SITES=	http://dl.hexchat.net/${PORTNAME}/
> 
>@@ -11,16 +11,20 @@
> 
> LICENSE=	GPLv2
> 
>-LIB_DEPENDS=	libproxy.so:net/libproxy
>+LIB_DEPENDS=	libproxy.so:net/libproxy \
>+		libfontconfig.so:x11-fonts/fontconfig \
>+		libdbus-1.so:devel/dbus \
>+		libfreetype.so:print/freetype2
> 
>-USES=		gmake desktop-file-utils libtool pkgconfig tar:xz
>-USE_GNOME=	gtk20 intltool libxml2
>+USES=		gmake desktop-file-utils libtool pkgconfig tar:xz ssl
>+USE_GNOME=	cairo gtk20 intltool libxml2
>+USE_XORG=	x11
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=--enable-openssl --enable-gtkfe --disable-sysinfo \
>-		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig
>+		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
>+		LUA=lua-${LUA_VER}
> INSTALLS_ICONS=	yes
> INSTALL_TARGET=	install-strip
>-USE_OPENSSL=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib -lX11
>@@ -29,10 +33,10 @@
> 
> PORTDOCS=	*
> 
>-OPTIONS_DEFINE=		CA_BUNDLE CANBERRA DBUS DOAT DOCS FISHLIM NLS NOTIFY \
>+OPTIONS_DEFINE=		CA_BUNDLE CANBERRA DBUS DOAT DOCS FISHLIM LUA NLS NOTIFY \
> 			PERL PYTHON SOCKS TEXTFE
> 
>-OPTIONS_DEFAULT=	CA_BUNDLE CANBERRA DBUS NOTIFY PERL PYTHON
>+OPTIONS_DEFAULT=	CA_BUNDLE CANBERRA DBUS LUA NOTIFY PERL PYTHON
> 
> OPTIONS_SUB=	yes
> 
>@@ -45,21 +49,25 @@
> 
> CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
> CANBERRA_LIB_DEPENDS=	libcanberra.so:audio/libcanberra
>-CANBERRA_CONFIGURE_ENABLE=	libcanberra
>+CANBERRA_CONFIGURE_ENABLE=libcanberra
> DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
> DBUS_CONFIGURE_ENABLE=	dbus
> DOAT_CONFIGURE_ENABLE=	doat
>-FISHLIM_CONFIGURE_ENABLE=	fishlim
>+FISHLIM_CONFIGURE_ENABLE=fishlim
>+LUA_CONFIGURE_ENABLE=	lua
>+LUA_USES=		lua
> NLS_CONFIGURE_ENABLE=	nls
> NLS_USES=		gettext
> NLS_USES_OFF=		gettext-tools # doesn't build otherwise
> NOTIFY_RUN_DEPENDS=	notify-send:devel/libnotify
>-NOTIFY_CONFIGURE_ENABLE=	libnotify
>+NOTIFY_CONFIGURE_ENABLE=libnotify
> PERL_CONFIGURE_ENABLE=	perl
>-PYTHON_CONFIGURE_ENABLE=	python
>+PERL_USES=		perl5
>+PYTHON_CONFIGURE_ENABLE=python
>+PYTHON_USES=		python
> SOCKS_LIB_DEPENDS=	libsocks.so:net/dante
> SOCKS_CONFIGURE_ENABLE=	socks
>-TEXTFE_CONFIGURE_ENABLE=	textfe
>+TEXTFE_CONFIGURE_ENABLE=textfe
> 
> .include <bsd.port.options.mk>
> 
>@@ -73,24 +81,20 @@
> CA_BUNDLE=	NULL
> .endif
> 
>-.if ${PORT_OPTIONS:MPYTHON}
>-USES+=	python
>+.if ${PORT_OPTIONS:MDBUS}
>+USE_GNOME+=	gconf2
> .endif
> 
>-.if ${PORT_OPTIONS:MPERL}
>-USES+=		perl5
>+.if ${PORT_OPTIONS:MLUA}
>+USE_GCC=	any
> .endif
> 
>-.if ${PORT_OPTIONS:MDBUS}
>-USE_GNOME+=	gconf2
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%CA_BUNDLE%%|${CA_BUNDLE}|' \
> 		${WRKSRC}/src/common/server.c
> 
> post-install:
>-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
>+	${LN} -sf ../share/icons/hicolor/48x48/apps/${PORTNAME}.png \
> 		${STAGEDIR}${PREFIX}/share/pixmaps/
> .if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 418428)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (hexchat-2.10.2.tar.xz) = 87ebf365c576656fa3f23f51d319b3a6d279e4a932f2f8961d891dd5a5e1b52c
>-SIZE (hexchat-2.10.2.tar.xz) = 1529732
>+TIMESTAMP = 1468413582
>+SHA256 (hexchat-2.12.1.tar.xz) = 5201b0c6d17dcb8c2cb79e9c39681f8e052999ba8f7b5986d5c1e7dc68fa7c6b
>+SIZE (hexchat-2.12.1.tar.xz) = 1585532

Actions: View | Diff

Attachments on bug 211083: 172463 | 172464 | 172500