Attachment 130289 Details for Bug 174190 – file.diff

[patch] file.diff

file.diff (text/plain), 4.92 KB, created by tkato432 on 2012-12-05 18:10:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-12-05 18:10:10 UTC

Size: 4.92 KB

patch

obsolete

>diff -urN /usr/ports/irc/minbif/Makefile irc/minbif/Makefile
>--- /usr/ports/irc/minbif/Makefile	2012-11-08 07:08:31.000000000 +0900
>+++ irc/minbif/Makefile	2012-12-03 23:52:20.000000000 +0900
>@@ -1,51 +1,51 @@
>-# New ports collection makefile for:	minbif
>-# Date created:				2010-06-03
>-# Whom:					Frank Steinborn <steinex@nognu.de>
>-#
>+# Created by: Frank Steinborn <steinex@nognu.de>
> # $FreeBSD: head/irc/minbif/Makefile 300896 2012-07-14 13:54:48Z beat $
>-#
> 
> PORTNAME=	minbif
>-PORTVERSION=	1.0.3
>-PORTREVISION=	5
>+PORTVERSION=	1.0.5
> CATEGORIES=	irc net-im
>-MASTER_SITES=	http://symlink.me/attachments/download/50/
>+MASTER_SITES=	https://symlink.me/attachments/download/148/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	An IRC to instant messaging gateway
> 
>-LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple
>+LICENSE=	GPLv2
>+
>+LIB_DEPENDS=	purple:${PORTSDIR}/net-im/libpurple
>+
>+# right now PLUGINS installs prpl-coincoin and prpl-gayattitude
>+OPTIONS_DEFINE=	CACA GNUTLS VIDEO PLUGINS DOCS
>+OPTIONS_DEFAULT=	CACA
>+CACA_DESC=	Buddy icon display using libcaca
>+VIDEO_DESC=	Webcam display using libcaca (depends on CACA)
>+PLUGINS_DESC=	Compile additional libpurple-plugins
>+
>+USE_RC_SUBR=	minbif
>+USE_GNOME=	glib20
>+USE_EFL=	imlib2
>+USE_CMAKE=	yes
>+CMAKE_ARGS=	-DENABLE_IMLIB:BOOL=ON
>+MAKE_JOBS_SAFE=	yes
>+
>+CFLAGS+=	${PTHREAD_CFLAGS} -DX_DISPLAY_MISSING
>+LDFLAGS+=	${PTHREAD_LIBS}
> 
> USERS=		minbif
> GROUPS=		minbif
> 
> SUB_FILES=	pkg-message
>-MAN8=		minbif.8
>+SUB_LIST=	USERS="${USERS}"
> 
>+MAN8=		minbif.8
>+PORTDOCS=	*
> PLIST_FILES=	bin/minbif %%ETCDIR%%/minbif.conf-dist \
> 		%%ETCDIR%%/minbif.motd-dist
> PLIST_DIRS=	%%ETCDIR%%
> 
>-USE_EFL=	imlib2
>-USE_CMAKE=	yes
>-CMAKE_ARGS=	-DENABLE_IMLIB:BOOL=ON -DCMAKE_CXX_FLAGS=-DX_DISPLAY_MISSING
>-USE_RC_SUBR=	minbif
>-PKGMESSAGE=	${WRKDIR}/pkg-message
>-PORTDOCS=	*
>-
>-# right now WITH_PLUGINS installs prpl-coincoin and prpl-gayattitude
>-OPTIONS_DEFINE=	CACA GNUTLS VIDEO PLUGINS DOCS
>-OPTIONS_DEFAULT=	CACA
>-CACA_DESC=	Buddy icon display using libcaca
>-VIDEO_DESC=	Webcam display using libcaca (depends on CACA)
>-PLUGINS_DESC=	Compile additional libpurple-plugins
>-
>-SUB_LIST+=	USERS=${USERS}
>-
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MCACA}
>-LIB_DEPENDS+=	caca.0:${PORTSDIR}/graphics/libcaca
>+LIB_DEPENDS+=	caca:${PORTSDIR}/graphics/libcaca
> CMAKE_ARGS+=	-DENABLE_CACA:BOOL=ON
> .else
> CMAKE_ARGS+=	-DENABLE_CACA:BOOL=OFF
>@@ -53,7 +53,7 @@
> 
> .if ${PORT_OPTIONS:MVIDEO} && !empty(PORT_OPTIONS:MCACA)
> USE_GSTREAMER+=	core good
>-LIB_DEPENDS+=	gstfarsight-0.10.0:${PORTSDIR}/net-im/farsight2
>+LIB_DEPENDS+=	gstfarsight-0.10:${PORTSDIR}/net-im/farsight2
> CMAKE_ARGS+=	-DENABLE_VIDEO:BOOL=ON
> .else
> CMAKE_ARGS+=	-DENABLE_VIDEO:BOOL=OFF
>@@ -65,6 +65,7 @@
> .endif
> 
> .if ${PORT_OPTIONS:MPLUGINS}
>+USE_GNOME+=	libxml2
> CMAKE_ARGS+=	-DENABLE_PLUGIN:BOOL=ON
> PLIST_FILES+=	lib/purple-2/libcoincoin.so \
> 		lib/purple-2/libgayattitude.so
>@@ -73,10 +74,18 @@
> .endif
> 
> .if ${PORT_OPTIONS:MGNUTLS}
>-LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
>-CMAKE_ARGS+=	-DENABLE_GNUTLS:BOOL=ON
>+LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
>+CMAKE_ARGS+=	-DENABLE_TLS:BOOL=ON
>+.else
>+CMAKE_ARGS+=	-DENABLE_TLS:BOOL=OFF
> .endif
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e \
>+		's|"-lpthread -lstdc++"||' ${WRKSRC}/src/CMakeLists.txt
>+	@${REINPLACE_CMD} -e \
>+		'/pam_misc.h/d' ${WRKSRC}/src/im/auth_pam.h
>+
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/man/minbif.8 ${MAN8PREFIX}/man/man8
>@@ -90,7 +99,6 @@
> .if ${PORT_OPTIONS:MDOCS}
> 	${MKDIR} ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/doc/minbif.xinetd ${DOCSDIR}
> .endif
> 	@${CAT} ${PKGMESSAGE}
>diff -urN /usr/ports/irc/minbif/distinfo irc/minbif/distinfo
>--- /usr/ports/irc/minbif/distinfo	2012-11-08 07:08:31.000000000 +0900
>+++ irc/minbif/distinfo	2012-11-02 04:30:53.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (minbif-1.0.3.tar.gz) = fede0da71f673ee7d2a71673875724b8caac53618394711ed55406b3250145d6
>-SIZE (minbif-1.0.3.tar.gz) = 168238
>+SHA256 (minbif-1.0.5.tar.gz) = 88271af203a89556165a9ebb4e00e55ea5b649146aea855dd799a79bd9e4befd
>+SIZE (minbif-1.0.5.tar.gz) = 176039
>diff -urN /usr/ports/irc/minbif/files/patch-CMakeLists.txt irc/minbif/files/patch-CMakeLists.txt
>--- /usr/ports/irc/minbif/files/patch-CMakeLists.txt	2012-11-08 07:08:31.000000000 +0900
>+++ irc/minbif/files/patch-CMakeLists.txt	1970-01-01 09:00:00.000000000 +0900
>@@ -1,15 +0,0 @@
>-diff -r -u CMakeLists.txt.old CMakeLists.txt
>---- CMakeLists.txt.old	2010-05-16 00:37:39.000000000 -0700
>-+++ CMakeLists.txt	2010-06-20 14:48:01.000000000 -0700
>-@@ -43,6 +43,11 @@
>- 
>- 		IF(IMLIB_FOUND)
>- 			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_IMLIB")
>-+
>-+			INCLUDE(FindX11)
>-+			IF(NOT X11_FOUND)
>-+				ADD_DEFINITIONS(-DX_DISPLAY_MISSING)
>-+			ENDIF(NOT X11_FOUND)
>- 		ELSE(IMLIB_FOUND)
>- 			MESSAGE(FATAL_ERROR "Unable to find the imlib2 library. To disable use of imlib2, run 'make ENABLE_IMLIB=OFF'")
>- 		ENDIF(IMLIB_FOUND)

Actions: View | Diff

Attachments on bug 174190: 130289