- Update to 20120808

- Make dependency on devel/ncurses optional [1]
- Fix SASL option and its description
- Add secondary master site

Requested by:	Peter Jeremy <peter@rulingia.com> [1]
Approved by:	flo (mentor)
This commit is contained in:
Jase Thew 2012-08-15 15:22:04 +00:00
parent 8270937d87
commit 059de50524
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=302582
4 changed files with 33 additions and 14 deletions

View file

@ -6,9 +6,11 @@
# #
PORTNAME= weechat PORTNAME= weechat
PORTVERSION= 20120707 PORTVERSION= 20120808
CATEGORIES= irc CATEGORIES= irc
MASTER_SITES= http://perturb.me.uk/distfiles/ MASTER_SITES= http://perturb.me.uk/distfiles/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jase
PKGNAMESUFFIX= -devel PKGNAMESUFFIX= -devel
DISTNAME= weechat-devel-${GITREV} DISTNAME= weechat-devel-${GITREV}
@ -22,22 +24,20 @@ CONFLICTS= weechat-0.3*
USE_ICONV= yes USE_ICONV= yes
USE_LDCONFIG= yes USE_LDCONFIG= yes
USE_NCURSES= yes USE_NCURSES= yes
WITH_NCURSES_PORT= yes
USE_CMAKE= yes USE_CMAKE= yes
CMAKE_ARGS+= -DNCURSES_INCLUDE_PATH=${LOCALBASE}/include/ncurses
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
WANT_PERL= yes WANT_PERL= yes
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
GITREV= 92aa9bf GITREV= 3c615a9
WRKSRC= ${WRKDIR}/${PORTNAME}-${GITREV} WRKSRC= ${WRKDIR}/${PORTNAME}-${GITREV}
# Please note: the DEBUG option is *NOT* empty, it is utilised by # Please note: the DEBUG option is *NOT* empty, it is utilised by
# bsd.cmake.mk to set the cmake build type to Debug instead of # bsd.cmake.mk to set the cmake build type to Debug instead of
# Release. # Release.
OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE DEBUG ASPELL GNUTLS NLS DOCUMENTATION SASL OPTIONS_DEFINE= RUBY PYTHON PERL TCL LUA GUILE CHARSET BACKTRACE DEBUG ASPELL GNUTLS NLS DOCUMENTATION SASL COLOR256
OPTIONS_DEFAULT=CHARSET BACKTRACE DEBUG OPTIONS_DEFAULT=CHARSET BACKTRACE DEBUG
BACKTRACE_DESC= Provide crash backtraces BACKTRACE_DESC= Provide crash backtraces
@ -49,6 +49,8 @@ PERL_DESC= Perl scripting support
PYTHON_DESC= Python scripting support PYTHON_DESC= Python scripting support
RUBY_DESC= Ruby scripting support RUBY_DESC= Ruby scripting support
TCL_DESC= Tcl scripting support TCL_DESC= Tcl scripting support
SASL_DESC= SASL with DH-Blowfish support
COLOR256_DESC= Use ncurses port for 256 color support
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
@ -157,10 +159,15 @@ LIB_DEPENDS+= execinfo:${PORTSDIR}/devel/libexecinfo
LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt
PLIST_SUB+= SASL="" PLIST_SUB+= SASL=""
.else .else
CMAKE_ARGS+= -DENABLE_SASL=no CMAKE_ARGS+= -DENABLE_GCRYPT=no
PLIST_SUB+= SASL="@comment " PLIST_SUB+= SASL="@comment "
.endif .endif
.if ${PORT_OPTIONS:MCOLOR256}
WITH_NCURSES_PORT= yes
CMAKE_ARGS+= -DNCURSES_INCLUDE_PATH=${LOCALBASE}/include/ncurses
.endif
MAN1= weechat-curses.1 MAN1= weechat-curses.1
post-patch: post-patch:
@ -173,6 +180,17 @@ post-patch:
@${REINPLACE_CMD} -e '/IF.*FreeBSD/,/ENDIF.*FreeBSD/d' ${WRKSRC}/src/core/CMakeLists.txt @${REINPLACE_CMD} -e '/IF.*FreeBSD/,/ENDIF.*FreeBSD/d' ${WRKSRC}/src/core/CMakeLists.txt
.endif .endif
pre-configure:
.if ${PORT_OPTIONS:MCOLOR256}
@${ECHO_MSG} ""
@${ECHO_MSG} "==> You have selected the ncurses 256 color option. Please ensure that"
@${ECHO_MSG} "==> the devel/ncurses port is built with the EXTCOLORS option enabled."
@${ECHO_MSG} "==>"
@${ECHO_MSG} "==> Ctrl-C now if you'd like to reconfigure."
@${ECHO_MSG} ""
@sleep 5
.endif
post-install: post-install:
${INSTALL_MAN} ${WRKSRC}/doc/weechat-curses.1 ${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/weechat-curses.1 ${MAN1PREFIX}/man/man1

View file

@ -1,2 +1,2 @@
SHA256 (weechat-devel-92aa9bf.tar.gz) = accf76561ea0192c968d3094ad6ebdf35d1e72caeb9b374ccd1529b13ca18adf SHA256 (weechat-devel-3c615a9.tar.gz) = f0ef85a540e887819d58649008d68ae42f10b20d57a61138a2a37a0d8d4b0095
SIZE (weechat-devel-92aa9bf.tar.gz) = 2229030 SIZE (weechat-devel-3c615a9.tar.gz) = 2340064

View file

@ -1,10 +1,10 @@
--- cmake/FindPython.cmake.orig 2010-12-20 18:43:34.102131358 +0000 --- cmake/FindPython.cmake.orig 2012-08-11 14:06:55.086663842 +0100
+++ cmake/FindPython.cmake 2010-12-20 19:16:11.918184057 +0000 +++ cmake/FindPython.cmake 2012-08-11 14:23:55.301504695 +0100
@@ -34,8 +34,7 @@ @@ -34,8 +34,7 @@
ENDIF(PYTHON_FOUND) ENDIF(PYTHON_FOUND)
FIND_PROGRAM(PYTHON_EXECUTABLE FIND_PROGRAM(PYTHON_EXECUTABLE
- NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 - NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python
- PATHS /usr/bin /usr/local/bin /usr/pkg/bin - PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+ NAMES ${BSD_PYTHON_CMD} + NAMES ${BSD_PYTHON_CMD}
) )
@ -14,7 +14,7 @@
) )
FIND_LIBRARY(PYTHON_LIBRARY FIND_LIBRARY(PYTHON_LIBRARY
- NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 - NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python
+ NAMES ${BSD_PYTHON_VER} + NAMES ${BSD_PYTHON_VER}
PATHS ${PYTHON_POSSIBLE_LIB_PATH} PATHS ${PYTHON_POSSIBLE_LIB_PATH}
) )

View file

@ -48,6 +48,7 @@ libdata/pkgconfig/weechat.pc
%%DOCUMENTATION%%share/doc/weechat/weechat_user.en.html %%DOCUMENTATION%%share/doc/weechat/weechat_user.en.html
%%DOCUMENTATION%%share/doc/weechat/weechat_user.fr.html %%DOCUMENTATION%%share/doc/weechat/weechat_user.fr.html
%%DOCUMENTATION%%share/doc/weechat/weechat_user.it.html %%DOCUMENTATION%%share/doc/weechat/weechat_user.it.html
%%DOCUMENTATION%%share/doc/weechat/weechat_user.ja.html
%%NLS%%share/locale/cs/LC_MESSAGES/weechat.mo %%NLS%%share/locale/cs/LC_MESSAGES/weechat.mo
%%NLS%%share/locale/de/LC_MESSAGES/weechat.mo %%NLS%%share/locale/de/LC_MESSAGES/weechat.mo
%%NLS%%share/locale/es/LC_MESSAGES/weechat.mo %%NLS%%share/locale/es/LC_MESSAGES/weechat.mo