Index: head/net-im/tox/Makefile =================================================================== --- head/net-im/tox/Makefile (revision 371503) +++ head/net-im/tox/Makefile (revision 371504) @@ -1,82 +1,81 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= toxcore -PORTVERSION= 0.141012 -PORTREVISION= 1 +PORTVERSION= 0.141026 CATEGORIES= net-im net-p2p MAINTAINER= thierry@FreeBSD.org COMMENT= ProjectTox-Core library, a decentralized and secure messenger LICENSE= GPLv3 BUILD_DEPENDS= checkmk:${PORTSDIR}/devel/libcheck LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx \ libopus.so:${PORTSDIR}/audio/opus \ libv4l2.so:${PORTSDIR}/multimedia/libv4l \ libswscale.so:${PORTSDIR}/multimedia/ffmpeg USE_GITHUB= yes GH_ACCOUNT= irungentoo GH_PROJECT= ${PORTNAME} GH_TAGNAME= ${GH_COMMIT} -GH_COMMIT= 0444ca1 +GH_COMMIT= 9c480ac USE_AUTOTOOLS= libtoolize aclocal autoconf autoheader automake AUTOMAKE_ARGS= -a -c -f -CONFIGURE_ARGS= --enable-testing +CONFIGURE_ARGS= --enable-tests USES= libtool openal:soft pathfix pkgconfig USE_SDL= yes USE_LDCONFIG= yes PATHFIX_MAKEFILEIN= Makefile.am INSTALL_TARGET= install-strip OPTIONS_DEFINE= DAEMON OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= SODIUM NACL OPTIONS_DEFAULT= SODIUM OPTIONS_SUB= yes SODIUM_DESC= Prefer libsodium SODIUM_LIB_DEPENDS= libsodium.so:${PORTSDIR}/security/libsodium NACL_DESC= Prefer NaCl NACL_CONFIGURE_ENABLE= nacl NACL_CONFIGURE_ON= --with-nacl-libs=${LOCALBASE}/lib NACL_BUILD_DEPENDS= ${LOCALBASE}/lib/libnacl.a:${PORTSDIR}/security/nacl NACL_RUN_DEPENDS= ${LOCALBASE}/lib/libnacl.a:${PORTSDIR}/security/nacl DAEMON_DESC= Bootstrap daemon DAEMON_CONFIGURE_ENABLE=daemon DAEMON_LIB_DEPENDS= libconfig.so:${PORTSDIR}/devel/libconfig .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 USE_GCC= yes BROKEN_i386= '__stack_chk_fail_local' isn't defined .endif .if ${PORT_OPTIONS:MDAEMON} USERS= toxdht USE_RC_SUBR= tox-bootstrapd SUB_LIST= TOXDHT=${USERS} PLIST_SUB+= TOXDHT=${USERS} KEYS_DIR= /var/lib/tox-bootstrapd PID_DIR= /var/run/tox-bootstrapd PKGMESSAGE= ${PKGDIR}/pkg-message.daemon .endif pre-configure: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac post-install: .if ${PORT_OPTIONS:MDAEMON} ${INSTALL_DATA} ${WRKSRC}/other/bootstrap_daemon/tox-bootstrapd.conf \ ${STAGEDIR}${PREFIX}/etc/tox-bootstrapd.conf.sample ${MKDIR} ${STAGEDIR}${KEYS_DIR} ${MKDIR} ${STAGEDIR}${PID_DIR} .endif .include Index: head/net-im/tox/distinfo =================================================================== --- head/net-im/tox/distinfo (revision 371503) +++ head/net-im/tox/distinfo (revision 371504) @@ -1,2 +1,2 @@ -SHA256 (toxcore-0.141012.tar.gz) = 6b1ec20bc036ad63ca5633ccde4aa0e15109930d38f2618b4573fcb2a3bcd48e -SIZE (toxcore-0.141012.tar.gz) = 333266 +SHA256 (toxcore-0.141026.tar.gz) = 169f7517f7c9569a5aeed8bf9976b204905e23e8f0b5292e1c4a60b6c46989ad +SIZE (toxcore-0.141026.tar.gz) = 338782 Index: head/net-im/toxic/Makefile =================================================================== --- head/net-im/toxic/Makefile (revision 371503) +++ head/net-im/toxic/Makefile (revision 371504) @@ -1,53 +1,54 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= toxic -PORTVERSION= 0.5.2.141012 +PORTVERSION= 0.5.2.141025 CATEGORIES= net-im MAINTAINER= thierry@FreeBSD.org COMMENT= Console client for Tox LICENSE= GPLv3 BUILD_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx \ libopus.so:${PORTSDIR}/audio/opus \ libconfig.so:${PORTSDIR}/devel/libconfig RUN_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox USE_GITHUB= yes GH_ACCOUNT= tox GH_TAGNAME= ${GH_COMMIT} -GH_COMMIT= f7d46f1 +GH_COMMIT= e22b7a3 OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 X11_USE= XORG=x11 X11_MAKE_ARGS_OFF= DISABLE_X11=1 DISABLE_DESKTOP_NOTIFY=1 X11_LIB_DEPENDS=libnotify.so:${PORTSDIR}/devel/libnotify WRKSRC= ${WRKDIR}/Tox-${PORTNAME}-${GH_COMMIT} BUILD_WRKSRC= ${WRKSRC}/build INSTALL_WRKSRC= ${BUILD_WRKSRC} MAKE_ENV= USER_CFLAGS="${CFLAGS}" USER_LDFLAGS="${LDFLAGS}" SUB_FILES= pkg-message -USES= ncurses openal:al,alut gmake pkgconfig +USES= desktop-file-utils ncurses openal:al,alut gmake pkgconfig .include .if ${OSVERSION} < 900033 USE_BINUTILS= yes LDFLAGS+= -B${LOCALBASE}/bin .endif pre-configure: - ${REINPLACE_CMD} -e 's|PREFIX =|PREFIX?=|;s|$$(shell git rev-list HEAD --count)|${GH_COMMIT}|' \ + ${REINPLACE_CMD} -e 's|PREFIX =|PREFIX?=|;s|$$(shell git rev-list HEAD.*$$|${GH_COMMIT}|' \ ${WRKSRC}/cfg/global_vars.mk post-install: + ${RM} ${STAGEDIR}${MANPREFIX}/man/man1/toxic.1-e ${STAGEDIR}${MANPREFIX}/man/man5/toxic.conf.5-e ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/toxic .include Index: head/net-im/toxic/distinfo =================================================================== --- head/net-im/toxic/distinfo (revision 371503) +++ head/net-im/toxic/distinfo (revision 371504) @@ -1,2 +1,2 @@ -SHA256 (toxic-0.5.2.141012.tar.gz) = 34f7e541f4eb195b093b7424c10c7b5db2326da1d5c136223368156323cd6a1c -SIZE (toxic-0.5.2.141012.tar.gz) = 1095642 +SHA256 (toxic-0.5.2.141025.tar.gz) = e69eaa2ec68d31fff942997b13fd8e1e1e7937b6e37d69ca61a31942aa350793 +SIZE (toxic-0.5.2.141025.tar.gz) = 1098702 Index: head/net-im/toxic/files/patch-cfg_targets_install.mk =================================================================== --- head/net-im/toxic/files/patch-cfg_targets_install.mk (nonexistent) +++ head/net-im/toxic/files/patch-cfg_targets_install.mk (revision 371504) @@ -0,0 +1,11 @@ +--- cfg/targets/install.mk.orig 2014-10-21 15:20:51.000000000 +0200 ++++ cfg/targets/install.mk 2014-10-25 17:27:09.000000000 +0200 +@@ -23,7 +23,7 @@ + @echo "Installing man pages" + @mkdir -p $(abspath $(DESTDIR)/$(MANDIR)) + @for f in $(MANFILES) ; do \ +- if [ ! -e "$$f" ]; then \ ++ if [ ! -e "$(DOC_DIR)/$$f" ]; then \ + continue ;\ + fi ;\ + section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $$f | rev | cut -d "." -f 1` ;\ Property changes on: head/net-im/toxic/files/patch-cfg_targets_install.mk ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/toxic/pkg-plist =================================================================== --- head/net-im/toxic/pkg-plist (revision 371503) +++ head/net-im/toxic/pkg-plist (revision 371504) @@ -1,19 +1,18 @@ bin/toxic -man/man1/toxic.1-e.gz man/man1/toxic.1.gz -man/man5/toxic.conf.5-e.gz man/man5/toxic.conf.5.gz +share/applications/toxic.desktop %%DATADIR%%/DHTnodes %%DATADIR%%/DHTnodes-e %%DATADIR%%/DNSservers %%DATADIR%%/DNSservers-e %%DATADIR%%/sounds/ToxicContactOffline.wav %%DATADIR%%/sounds/ToxicContactOnline.wav %%DATADIR%%/sounds/ToxicError.wav %%DATADIR%%/sounds/ToxicIncomingCall.wav %%DATADIR%%/sounds/ToxicOutgoingCall.wav %%DATADIR%%/sounds/ToxicRecvMessage.wav %%DATADIR%%/sounds/ToxicTransferComplete.wav %%DATADIR%%/sounds/ToxicTransferStart.wav %%DATADIR%%/toxic.conf.example %%DATADIR%%/toxic.conf.example-e