[Midnightbsd-cvs] mports [20553] trunk/net-p2p: update transmission
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Oct 29 21:52:33 EDT 2015
Revision: 20553
http://svnweb.midnightbsd.org/mports/?rev=20553
Author: laffer1
Date: 2015-10-29 21:52:33 -0400 (Thu, 29 Oct 2015)
Log Message:
-----------
update transmission
Modified Paths:
--------------
trunk/net-p2p/ctorrent/Makefile
trunk/net-p2p/transmission/Makefile
trunk/net-p2p/transmission-cli/Makefile
trunk/net-p2p/transmission-cli/distinfo
trunk/net-p2p/transmission-cli/files/transmission.in
trunk/net-p2p/transmission-cli/pkg-plist
trunk/net-p2p/transmission-daemon/Makefile
trunk/net-p2p/transmission-daemon/pkg-plist
trunk/net-p2p/transmission-gtk/Makefile
trunk/net-p2p/transmission-gtk/pkg-plist
Modified: trunk/net-p2p/ctorrent/Makefile
===================================================================
--- trunk/net-p2p/ctorrent/Makefile 2015-10-30 01:48:47 UTC (rev 20552)
+++ trunk/net-p2p/ctorrent/Makefile 2015-10-30 01:52:33 UTC (rev 20553)
@@ -2,7 +2,7 @@
PORTNAME= ctorrent
PORTVERSION= 3.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-p2p
MASTER_SITES= http://www.rahul.net/dholmes/ctorrent/
DISTNAME= ${PORTNAME}-dnh${PORTVERSION}
Modified: trunk/net-p2p/transmission/Makefile
===================================================================
--- trunk/net-p2p/transmission/Makefile 2015-10-30 01:48:47 UTC (rev 20552)
+++ trunk/net-p2p/transmission/Makefile 2015-10-30 01:52:33 UTC (rev 20553)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= transmission
-PORTVERSION= 2.80
+PORTVERSION= 2.84
CATEGORIES= net-p2p
MASTER_SITES= # empty
DISTFILES= # empty
Modified: trunk/net-p2p/transmission-cli/Makefile
===================================================================
--- trunk/net-p2p/transmission-cli/Makefile 2015-10-30 01:48:47 UTC (rev 20552)
+++ trunk/net-p2p/transmission-cli/Makefile 2015-10-30 01:52:33 UTC (rev 20553)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME= transmission
-PORTVERSION= 2.80
-PORTREVISION?= 0
+PORTVERSION= 2.84
+PORTREVISION?= 2
CATEGORIES?= net-p2p
#MASTER_SITES= http://download.m0k.org/${PORTNAME}/files/
MASTER_SITES= http://transmission.cachefly.net/
@@ -19,10 +19,15 @@
.else
LICENSE= gpl2
.endif
+LICENSE_FILE= ${WRKSRC}/COPYING
+USES+= cpe tar:xz
+CPE_VENDOR= transmissionbt
+
CONFLICTS_INSTALL= ${PORTNAME}${PKGNAMESUFFIX}-2.5*
-OPTIONS_DEFINE= LITE
+OPTIONS_DEFINE= LITE DOCS
+EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party
.include <bsd.mport.options.mk>
@@ -30,18 +35,34 @@
LIB_DEPENDS?= ${GEN_LIB_DEPENDS}
# General dependencies
-GEN_LIB_DEPENDS=curl:${PORTSDIR}/ftp/curl \
- event-2.0.6:${PORTSDIR}/devel/libevent2
+GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl \
+ libdht.so:${PORTSDIR}/devel/jech-dht \
+ libminiupnpc.so:${PORTSDIR}/net/miniupnpc \
+ libnatpmp.so:${PORTSDIR}/net/libnatpmp \
+ libutp.so:${PORTSDIR}/net/libutp \
+ libevent.so:${PORTSDIR}/devel/libevent2
GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
-USE_GMAKE= yes
-USES= pkgconfig
+# This is master port of transmission-*, so don't override USES definition
+USES+= gmake iconv libtool pkgconfig
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -DWITH_UTP=1
LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= ${ICONV_LIB}
CONFIGURE_ARGS=--with-zlib=/usr \
+ --without-inotify \
+ --disable-utp \
+ --enable-external-natpmp \
${EXTRA_CONF_ARGS}
+CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
+ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
+ DHT_CFLAGS=" " \
+ DHT_LIBS="-ldht" \
+ LIBUTP_CFLAGS=" " \
+ LIBUTP_LIBS="-lutp" \
+ LIBUTP_LIBS_QT="-lutp"
+
EXTRA_CONF_ARGS?=--enable-cli \
--disable-daemon \
--without-gtk \
@@ -52,8 +73,6 @@
CONFIGURE_ARGS+=--enable-lightweight
.endif
-MAN1?= transmission-cli.1 transmission-create.1 transmission-edit.1 \
- transmission-show.1
EXTRA_PATCHES= ${PATCHDIR}/disable-web
.endif
@@ -70,9 +89,8 @@
${WRKSRC}/libtransmission/utils.h
.endif
@${REINPLACE_CMD} -e \
- 's|_pthread_flags=".*"|_pthread_flags="${PTHREAD_LIBS}"|g ; \
- s|rt_clock_gettime=yes|rt_clock_gettime=no|g ; \
- s|" == "|" = "|g ; s|$$with_ssl.*/usr;|${OPENSSLBASE};|g' \
+ 's|rt_clock_gettime=yes|rt_clock_gettime=no|g ; \
+ s|" == "|" = "|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|doc \\| \\|g' \
${WRKSRC}/Makefile.in
@@ -80,16 +98,22 @@
@${REINPLACE_CMD} -e 's|utils \\|\\|g' \
${WRKSRC}/Makefile.in
.endif
+# Don't conflict with patches but force system libraries
+ @${REINPLACE_CMD} -e 's|third-party \\|\\|g' \
+ ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -Ee '/^DHT_(CFLAGS|LIBS)=/d' \
+ -e 's|third-party/[^ ]*Makefile||g' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} \
+ -e 's,TRANSMISSION_TOP}/third-party/dht/libdht.a,DHT_LIBS},' \
+ ${WRKSRC}/qt/qtr.pro
+ @${ECHO_CMD} 'DHT_LIBS = @DHT_LIBS@' >>${WRKSRC}/qt/config.pri.in
post-patch: general-patch
general-install:
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
-.for i in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
+ (cd ${WRKSRC} && ${COPYTREE_SHARE} \
+ "${DOCS}" ${STAGEDIR}${DOCSDIR})
post-install: general-install
Modified: trunk/net-p2p/transmission-cli/distinfo
===================================================================
--- trunk/net-p2p/transmission-cli/distinfo 2015-10-30 01:48:47 UTC (rev 20552)
+++ trunk/net-p2p/transmission-cli/distinfo 2015-10-30 01:52:33 UTC (rev 20553)
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.80.tar.xz) = 0ea0bc62e3917ce4cb848582888ecdcd0c0dbe8ffb9482d7330c823e1ff15df3
-SIZE (transmission-2.80.tar.xz) = 3167136
+SHA256 (transmission-2.84.tar.xz) = a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb
+SIZE (transmission-2.84.tar.xz) = 3077836
Modified: trunk/net-p2p/transmission-cli/files/transmission.in
===================================================================
--- trunk/net-p2p/transmission-cli/files/transmission.in 2015-10-30 01:48:47 UTC (rev 20552)
+++ trunk/net-p2p/transmission-cli/files/transmission.in 2015-10-30 01:52:33 UTC (rev 20553)
@@ -3,7 +3,7 @@
# $MidnightBSD$
#
# PROVIDE: transmission
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf to enable this service:
@@ -22,6 +22,9 @@
# default.
# transmission_web_home: Use alternative directory for the web interface
# files, such as javascript, html and graphics.
+# transmission_chown: By default, transmission checks and fixes the
+# permissions for its home directory. If this
+# causes problems, set this variable to no.
#
. /etc/rc.subr
@@ -36,9 +39,11 @@
: ${transmission_download_dir=%%PREFIX%%/etc/transmission/home/Downloads}
: ${transmission_user:=transmission}
transmission_group=${transmission_group:-$transmission_user}
+: ${transmission_chown:=yes}
command=%%PREFIX%%/bin/transmission-daemon
pidfile=/var/run/transmission/daemon.pid
+extra_commands=reload
start_precmd=transmission_prestart
transmission_flags=" \
@@ -51,11 +56,13 @@
transmission_prestart()
{
install -d -o $transmission_user ${pidfile%/*}
- mkdir -p $transmission_conf_dir $transmission_download_dir
- chown $transmission_user:$transmission_group $transmission_download_dir
- chown -R $transmission_user:$transmission_group $transmission_conf_dir
- chgrp $transmission_group $transmission_conf_dir
- chmod 750 $transmission_conf_dir
+ if checkyesno transmission_chown; then
+ mkdir -p $transmission_conf_dir $transmission_download_dir
+ chown $transmission_user:$transmission_group $transmission_download_dir
+ chown -R $transmission_user:$transmission_group $transmission_conf_dir
+ chgrp $transmission_group $transmission_conf_dir
+ chmod 750 $transmission_conf_dir
+ fi
if [ -n "$transmission_web_home" ]; then
TRANSMISSION_WEB_HOME=$transmission_web_home
export TRANSMISSION_WEB_HOME
Modified: trunk/net-p2p/transmission-cli/pkg-plist
===================================================================
--- trunk/net-p2p/transmission-cli/pkg-plist 2015-10-30 01:48:47 UTC (rev 20552)
+++ trunk/net-p2p/transmission-cli/pkg-plist 2015-10-30 01:52:33 UTC (rev 20553)
@@ -2,7 +2,10 @@
bin/transmission-create
bin/transmission-edit
bin/transmission-show
+man/man1/transmission-cli.1.gz
+man/man1/transmission-create.1.gz
+man/man1/transmission-edit.1.gz
+man/man1/transmission-show.1.gz
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
Modified: trunk/net-p2p/transmission-daemon/Makefile
===================================================================
--- trunk/net-p2p/transmission-daemon/Makefile 2015-10-30 01:48:47 UTC (rev 20552)
+++ trunk/net-p2p/transmission-daemon/Makefile 2015-10-30 01:52:33 UTC (rev 20553)
@@ -1,6 +1,6 @@
# $MidnightBSD$
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -daemon
MAINTAINER= ports at MidnightBSD.org
@@ -23,6 +23,4 @@
--disable-mac \
--disable-nls
-MAN1= transmission-daemon.1 transmission-remote.1
-
.include "${MASTERDIR}/Makefile"
Modified: trunk/net-p2p/transmission-daemon/pkg-plist
===================================================================
--- trunk/net-p2p/transmission-daemon/pkg-plist 2015-10-30 01:48:47 UTC (rev 20552)
+++ trunk/net-p2p/transmission-daemon/pkg-plist 2015-10-30 01:52:33 UTC (rev 20553)
@@ -1,8 +1,8 @@
bin/transmission-daemon
bin/transmission-remote
+man/man1/transmission-daemon.1.gz
+man/man1/transmission-remote.1.gz
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrmtry %%ETCDIR%%/home
- at dirrmtry %%ETCDIR%%
+ at dir %%ETCDIR%%/home
Modified: trunk/net-p2p/transmission-gtk/Makefile
===================================================================
--- trunk/net-p2p/transmission-gtk/Makefile 2015-10-30 01:48:47 UTC (rev 20552)
+++ trunk/net-p2p/transmission-gtk/Makefile 2015-10-30 01:52:33 UTC (rev 20553)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PKGNAMESUFFIX= -gtk
-PORTREVISION= 1
+PORTREVISION= 2
MAINTAINER= ports at MidnightBSD.org
COMMENT= Fast and lightweight GTK+2 BitTorrent client
Modified: trunk/net-p2p/transmission-gtk/pkg-plist
===================================================================
--- trunk/net-p2p/transmission-gtk/pkg-plist 2015-10-30 01:48:47 UTC (rev 20552)
+++ trunk/net-p2p/transmission-gtk/pkg-plist 2015-10-30 01:52:33 UTC (rev 20553)
@@ -100,45 +100,3 @@
share/locale/zh_CN/LC_MESSAGES/transmission-gtk.mo
share/locale/zh_TW/LC_MESSAGES/transmission-gtk.mo
share/pixmaps/transmission.png
- at dirrmtry share/locale/ur/LC_MESSAGES
- at dirrmtry share/locale/ur
- at dirrmtry share/locale/ug/LC_MESSAGES
- at dirrmtry share/locale/ug
- at dirrmtry share/locale/tl/LC_MESSAGES
- at dirrmtry share/locale/tl
- at dirrmtry share/locale/te/LC_MESSAGES
- at dirrmtry share/locale/te
- at dirrmtry share/locale/ta_LK/LC_MESSAGES
- at dirrmtry share/locale/ta_LK
- at dirrmtry share/locale/sw/LC_MESSAGES
- at dirrmtry share/locale/sw
- at dirrmtry share/locale/oc/LC_MESSAGES
- at dirrmtry share/locale/oc
- at dirrmtry share/locale/mr/LC_MESSAGES
- at dirrmtry share/locale/mr
- at dirrmtry share/locale/ku/LC_MESSAGES
- at dirrmtry share/locale/ku
- at dirrmtry share/locale/kk/LC_MESSAGES
- at dirrmtry share/locale/kk
- at dirrmtry share/locale/gv/LC_MESSAGES
- at dirrmtry share/locale/gv
- at dirrmtry share/locale/fo/LC_MESSAGES
- at dirrmtry share/locale/fo
- at dirrmtry share/locale/fil/LC_MESSAGES
- at dirrmtry share/locale/fil
- at dirrmtry share/locale/ckb/LC_MESSAGES
- at dirrmtry share/locale/ckb
- at dirrmtry share/locale/ceb/LC_MESSAGES
- at dirrmtry share/locale/ceb
- at dirrmtry share/locale/bo/LC_MESSAGES
- at dirrmtry share/locale/bo
- at dirrmtry share/locale/be at latin/LC_MESSAGES
- at dirrmtry share/locale/be at latin
- at dirrmtry share/locale/ast/LC_MESSAGES
- at dirrmtry share/locale/ast
- at dirrmtry share/locale/an/LC_MESSAGES
- at dirrmtry share/locale/an
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrmtry share/applications
- at exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
More information about the Midnightbsd-cvs
mailing list