Index: head/net-p2p/mktorrent/files/patch-init.c =================================================================== --- head/net-p2p/mktorrent/files/patch-init.c (revision 449356) +++ head/net-p2p/mktorrent/files/patch-init.c (nonexistent) @@ -1,112 +0,0 @@ ---- init.c.orig 2009-08-25 18:53:22 UTC -+++ init.c -@@ -277,7 +277,7 @@ static void print_help() - "Options:\n" - #ifdef USE_LONG_OPTIONS - "-a, --announce=[,]* : specify the full announce URLs\n" -- " at least one is required\n" -+ " at least one is required on private torrent\n" - " additional -a adds backup trackers\n" - "-c, --comment= : add a comment to the metainfo\n" - "-d, --no-date : don't write the creation date\n" -@@ -298,7 +298,7 @@ static void print_help() - " additional -w adds more URLs\n" - #else - "-a [,]* : specify the full announce URLs\n" -- " at least one is required\n" -+ " at least one is required on private torrent\n" - " additional -a adds backup trackers\n" - "-c : add a comment to the metainfo\n" - "-d : don't write the creation date\n" -@@ -343,7 +343,7 @@ static void print_announce_list(llist_t - */ - static void print_web_seed_list(slist_t *list) - { -- printf(" Web Seed URL: "); -+ printf(" Web Seed URLs: "); - - if (list == NULL) { - printf("none\n"); -@@ -361,17 +361,20 @@ static void print_web_seed_list(slist_t - static void dump_options(metafile_t *m) - { - printf("Options:\n" -- " Announce URLs:\n"); -+ " Announce URLs:"); - -- print_announce_list(m->announce_list); -+ if (m->announce_list) { -+ printf("\n"); -+ print_announce_list(m->announce_list); -+ } else -+ printf(" none\n"); - -- printf(" Torrent name: %s\n" -- " Metafile: %s\n" -- " Piece length: %u\n" -- " Be verbose: yes\n", -+ printf(" Torrent name: %s\n" -+ " Metafile: %s\n" -+ " Piece length: %u\n", - m->torrent_name, m->metainfo_file_path, m->piece_length); - -- printf(" Write date: "); -+ printf(" Write date: "); - if (m->no_creation_date) - printf("no\n"); - else -@@ -379,11 +382,17 @@ static void dump_options(metafile_t *m) - - print_web_seed_list(m->web_seed_list); - -- printf(" Comment: "); -+ printf(" Comment: "); - if (m->comment == NULL) -- printf("none\n\n"); -+ printf("none\n"); - else -- printf("\"%s\"\n\n", m->comment); -+ printf("\"%s\"\n", m->comment); -+ -+ printf(" Private: "); -+ if (m->private) -+ printf("yes\n\n"); -+ else -+ printf("no\n\n"); - } - - /* -@@ -495,22 +504,25 @@ EXPORT void init(metafile_t *m, int argc - - /* set the correct piece length. - default is 2^18 = 256kb. */ -- if (m->piece_length < 15 || m->piece_length > 28) { -+ if (m->piece_length < 15 || m->piece_length > 30) { - fprintf(stderr, - "The piece length must be a number between " -- "15 and 28.\n"); -+ "15 and 30.\n"); - exit(EXIT_FAILURE); - } - m->piece_length = 1 << m->piece_length; - -- /* user must specify at least one announce URL as it wouldn't make -- * any sense to have a default for this */ -+ /* user must specify at least one announce URL when private flag set -+ as it wouldn't make any sense to have a default for this */ - if (m->announce_list == NULL) { -- fprintf(stderr, "Must specify an announce URL. " -- "Use -h for help.\n"); -- exit(EXIT_FAILURE); -+ if (m->private == 1) { -+ fprintf(stderr, "Must specify an announce URL. " -+ "Use -h for help.\n"); -+ exit(EXIT_FAILURE); -+ } -+ } else { -+ announce_last->next = NULL; - } -- announce_last->next = NULL; - - /* ..and a file or directory from which to create the torrent */ - if (optind >= argc) { Property changes on: head/net-p2p/mktorrent/files/patch-init.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-p2p/mktorrent/files/patch-output.c =================================================================== --- head/net-p2p/mktorrent/files/patch-output.c (revision 449356) +++ head/net-p2p/mktorrent/files/patch-output.c (nonexistent) @@ -1,32 +0,0 @@ ---- output.c.orig 2009-08-25 18:53:22 UTC -+++ output.c -@@ -119,15 +119,20 @@ EXPORT void write_metainfo(FILE *f, meta - printf("Writing metainfo file... "); - fflush(stdout); - -- /* every metainfo file is one big dictonary -- and the first entry is the announce URL */ -- fprintf(f, "d8:announce%lu:%s", -- (unsigned long)strlen(m->announce_list->l->s), -- m->announce_list->l->s); -- /* write the announce-list entry if we have -- more than one announce URL */ -- if (m->announce_list->next || m->announce_list->l->next) -- write_announce_list(f, m->announce_list); -+ /* every metainfo file is one big dictonary */ -+ fprintf(f, "d"); -+ -+ /* first entry is the announce URL (optional) */ -+ if (m->announce_list != NULL) { -+ fprintf(f, "8:announce%lu:%s", -+ (unsigned long)strlen(m->announce_list->l->s), -+ m->announce_list->l->s); -+ /* write the announce-list entry if we have -+ more than one announce URL */ -+ if (m->announce_list->next || m->announce_list->l->next) -+ write_announce_list(f, m->announce_list); -+ } -+ - /* add the comment if one is specified */ - if (m->comment != NULL) - fprintf(f, "7:comment%lu:%s", Property changes on: head/net-p2p/mktorrent/files/patch-output.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-p2p/mktorrent/Makefile =================================================================== --- head/net-p2p/mktorrent/Makefile (revision 449356) +++ head/net-p2p/mktorrent/Makefile (revision 449357) @@ -1,38 +1,41 @@ # Created by: Damian Gerow # $FreeBSD$ PORTNAME= mktorrent -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.1 CATEGORIES= net-p2p -MASTER_SITES= SF +MASTER_SITES= https://github.com/Rudde/mktorrent/archive/ +DISTNAME= v${PORTVERSION} +DIST_SUBDIR= ${PORTNAME} -MAINTAINER= dgerow@afflictions.org +MAINTAINER= ports@FreeBSD.org COMMENT= Command-line utility for creating BitTorrent metainfo files LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAKEFILE= BSDmakefile MAKE_ARGS= USE_LONG_OPTIONS=1 PLIST_FILES= bin/mktorrent OPTIONS_DEFINE= THREADS OPENSSL HASHCHECK OPTIONS_DEFAULT= THREADS OPENSSL HASHCHECK OPENSSL_DESC= Use OpenSSL for hashing HASHCHECK_DESC= Verify file hashes OPENSSL_USES= ssl OPENSSL_CFLAGS= -I${OPENSSLINC} OPENSSL_LDFLAGS= -L${OPENSSLLIB} THREADS_MAKE_ARGS= USE_PTHREADS=1 OPENSSL_MAKE_ARGS= USE_OPENSSL=1 HASHCHECK_MAKE_ARGS= NO_HASH_CHECK=1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include Index: head/net-p2p/mktorrent/distinfo =================================================================== --- head/net-p2p/mktorrent/distinfo (revision 449356) +++ head/net-p2p/mktorrent/distinfo (revision 449357) @@ -1,2 +1,3 @@ -SHA256 (mktorrent-1.0.tar.gz) = 6f8e562af6366e0d9bde76e434f740b55722c6c3c555860dbe80083f9d1d119f -SIZE (mktorrent-1.0.tar.gz) = 23089 +TIMESTAMP = 1504724523 +SHA256 (mktorrent/v1.1.tar.gz) = d0f47500192605d01b5a2569c605e51ed319f557d24cfcbcb23a26d51d6138c9 +SIZE (mktorrent/v1.1.tar.gz) = 23314 Index: head/net-p2p/mktorrent/pkg-descr =================================================================== --- head/net-p2p/mktorrent/pkg-descr (revision 449356) +++ head/net-p2p/mktorrent/pkg-descr (revision 449357) @@ -1,5 +1,5 @@ mktorrent is a simple command-line utility to create BitTorrent metainfo files. It supports multiple trackers, private trackers, custom comments, and is multi-threaded to support multiple CPUs. -WWW: http://mktorrent.sourceforge.net/ +WWW: https://github.com/Rudde/mktorrent