October 2015 - macports-changes - lists.macosforge.org

[MacPorts] PortfileRecipes modified
by MacPorts 14 Oct '15

14 Oct '15

Page "PortfileRecipes" was changed by ryandesign(a)macports.org Diff URL: <https://trac.macports.org/wiki/PortfileRecipes?action=diff&version=90> Revision 90 Comment: minor improvements to the replaced_by section Changes: -------8<------8<------8<------8<------8<------8<------8<------8<-------- Index: PortfileRecipes ========================================================================= --- PortfileRecipes (version: 89) +++ PortfileRecipes (version: 90) @@ -578,7 +578,7 @@ The old port (osxvnc) should be kept around for a year, and converted into a stub port marked as having been replaced by the new port, so that users who already had the old port installed will learn about the new port and will be prompted (via `port outdated`) to upgrade to it. There are several steps to this process: 1. Add the `replaced_by` line, indicating the name of the port by which this port has been replaced, for example `replaced_by vineserver`. This causes MacPorts, when running `sudo port upgrade osxvnc`, to deactivate osxvnc and to install vineserver in its place. - 1. Use the obsolete 1.0 PortGroup. This will take care of things like removing livecheck and giving the user a message stating that the port is indeed obsolete. + 1. Use the obsolete 1.0 PortGroup. This will take care of things like removing livecheck and giving the user a message stating that the port is indeed obsolete. Note that the `replaced_by` line must precede the `PortGroup obsolete 1.0` line. 1. In a comment, mention the date, one year in the future, that the port can be removed. 1. In order for osxvnc to appear in `port outdated`, increase the port's `version`, `revision` or `epoch`. Customarily, the old port's version is set to the version of the replacement port. So, when osxvnc @3.0_1 was replaced by vineserver @3.1_0, osxvnc's `version` was set to 3.1 and its `revision` dropped to 0 to match the new vineserver port. If the software was only renamed, without changing its version number, then increase the old port's `revision`. 1. Remove all directives related to fetching and verifying files: `master_sites`, `patch_sites`, `checksums`, `fetch.*`, `cvs.*`, `svn.*`, `hg.*`, `git.*`, or `bzr.*` directives. @@ -609,6 +609,7 @@ The reason for leaving a stub port (rather than deleting the old port immediately) is to provide a seamless upgrade process for people who installed the port under its old name. So the stub port should not be deleted until after most users can be expected to have used `sudo port selfupdate` and `sudo port upgrade outdated`. Since some users do not update frequently, it is recommended that the old port remain for no less than one year after the `replaced_by` line is added. Sometimes a port is replaced because a [ticket:14540 -devel port] was created but will no longer be updated and is being replaced by a corresponding non-devel port. (For example, the xz-devel port was replaced by the xz port.) +Ensure that the replacement port does not declare a conflict with the replaced port, as that would prevent the upgrade from succeeding. == Specifying a license == #license -------8<------8<------8<------8<------8<------8<------8<------8<-------- -- Page URL: <https://trac.macports.org/wiki/PortfileRecipes> MacPorts <https://www.macports.org/> Ports system for OS X This is an automated message. Someone added your email address to be notified of changes on 'PortfileRecipes' page. If it was not you, please report to .

1 0

[141278] trunk/dports/net
by ryandesign＠macports.org 14 Oct '15

14 Oct '15

Revision: 141278 https://trac.macports.org/changeset/141278 Author: ryandesign(a)macports.org Date: 2015-10-13 23:32:32 -0700 (Tue, 13 Oct 2015) Log Message: ----------- docsis: new port, version 0.9.6 (#49268) Added Paths: ----------- trunk/dports/net/docsis/ trunk/dports/net/docsis/Portfile trunk/dports/net/docsis/files/ trunk/dports/net/docsis/files/net-snmp-5.4.patch trunk/dports/net/docsis/files/prog_name.patch Added: trunk/dports/net/docsis/Portfile =================================================================== --- trunk/dports/net/docsis/Portfile (rev 0) +++ trunk/dports/net/docsis/Portfile 2015-10-14 06:32:32 UTC (rev 141278) @@ -0,0 +1,36 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 +PortGroup github 1.0 + +github.setup rlaager docsis 0.9.6 upstream/ +categories net +platforms darwin +maintainers ryandesign openmaintainer +license GPL-2+ + +description generates binary configuration files for DOCSIS-compliant cable modems + +long_description This program encodes text configuration files which contain Configuration \ + File Settings into binary configuration files, as specified by the DOCSIS \ + Radio Frequency Interface Specification, Appendix C. \ + It supports most DOCSIS 2.0 Configuration Settings. + +checksums rmd160 6fde2a520120a5aa9867101ed044a05c57566801 \ + sha256 7f75fb1332b1e788ed111f64b65a702df5f23b280d0f2622c6321d6a4d2dad50 + +depends_build port:autoconf \ + port:automake \ + port:bison \ + port:flex \ + path:bin/glib-gettextize:glib2 \ + port:libtool + +depends_lib path:lib/libssl.dylib:openssl \ + port:net-snmp + +patchfiles net-snmp-5.4.patch \ + prog_name.patch + +configure.cmd ./autogen.sh Property changes on: trunk/dports/net/docsis/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: trunk/dports/net/docsis/files/net-snmp-5.4.patch =================================================================== --- trunk/dports/net/docsis/files/net-snmp-5.4.patch (rev 0) +++ trunk/dports/net/docsis/files/net-snmp-5.4.patch 2015-10-14 06:32:32 UTC (rev 141278) @@ -0,0 +1,15 @@ +Fix build with net-snmp 5.4 +http://docsis.org/node/1334 +https://sourceforge.net/p/docsis/bugs/17/ +https://github.com/rlaager/docsis/commit/ed9180b94919ee9f3cceeccc8a4bf538a0ad10b5 +--- src/docsis.c.orig 2010-06-14 14:24:40.000000000 -0500 ++++ src/docsis.c 2015-10-14 00:48:44.000000000 -0500 +@@ -401,7 +401,7 @@ + #endif /* DEBUG */ + + setenv ("MIBS", "ALL", 1); +- init_mib (); ++ netsnmp_init_mib (); + if (!netsnmp_ds_get_boolean + (NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_OIDS)) + { Added: trunk/dports/net/docsis/files/prog_name.patch =================================================================== --- trunk/dports/net/docsis/files/prog_name.patch (rev 0) +++ trunk/dports/net/docsis/files/prog_name.patch 2015-10-14 06:32:32 UTC (rev 141278) @@ -0,0 +1,200 @@ +Remove prog_name, which was causing a duplicate symbol compile failure +https://sourceforge.net/p/docsis/bugs/14/ +https://github.com/rlaager/docsis/commit/1c0abdfc8536165d1e91791a4cae38dcbf66b3d5 +--- src/docsis.c.orig ++++ src/docsis.c +@@ -113,7 +113,7 @@ add_cmts_mic (unsigned char *tlvbuf, unsigned int tlvbuflen, + else + { + if ( cp[0] == 64 ) { +- printf("%s: warning: TLV64 (length > 255) not allowed in DOCSIS config files\n", prog_name); ++ printf("docsis: warning: TLV64 (length > 255) not allowed in DOCSIS config files\n"); + cp = cp + (size_t) ntohs(*((unsigned short *)(cp+1))) + 3; + } else { + cp = cp + cp[1] + 2; +@@ -134,11 +134,11 @@ add_cmts_mic (unsigned char *tlvbuf, unsigned int tlvbuflen, + } + + #ifdef __GNUC__ +-static void usage (char *prog_name) __attribute__((__noreturn__)); ++static void usage () __attribute__((__noreturn__)); + #endif + + static void +-usage (char *prog_name) ++usage () + { + printf ("DOCSIS Configuration File creator, version %s\n", VERSION); + printf +@@ -147,19 +147,14 @@ usage (char *prog_name) + ("Copyright (c) 2002,2003,2004,2005 Evvolve Media SRL, docsis(a)evvolve.com \n\n"); + + printf +- ("To encode a cable modem configuration file: \n\t %s -e <modem_cfg_file> <key_file> <output_file>\n", +- prog_name); ++ ("To encode a cable modem configuration file: \n\t docsis -e <modem_cfg_file> <key_file> <output_file>\n"); + printf +- ("To encode multiple cable modem configuration files: \n\t %s -m <modem_cfg_file1> ... <key_file> <new_extension>\n", +- prog_name); ++ ("To encode multiple cable modem configuration files: \n\t docsis -m <modem_cfg_file1> ... <key_file> <new_extension>\n"); + printf +- ("To encode a MTA configuration file: \n\t %s -p <mta_cfg_file> <output_file>\n", +- prog_name); ++ ("To encode a MTA configuration file: \n\t docsis -p <mta_cfg_file> <output_file>\n"); + printf +- ("To encode multiple MTA configuration files: \n\t %s -m -p <mta_file1> ... <new_extension>\n", +- prog_name); +- printf ("To decode a CM or MTA config file: \n\t %s -d <binary_file>\n", +- prog_name); ++ ("To encode multiple MTA configuration files: \n\t docsis -m -p <mta_file1> ... <new_extension>\n"); ++ printf ("To decode a CM or MTA config file: \n\t docsis -d <binary_file>\n"); + printf + ("\nWhere:\n<cfg_file>\t\t= name of text (human readable) cable modem or MTA \n\t\t\t configuration file\n<key_file>\t\t= text file containing the authentication key \n\t\t\t (shared secret) to be used for the CMTS MIC\n<output_file> \t\t= name of output file where the binary data will\n\t\t\t be written to (if it does not exist it is created).\n<binary_file>\t\t= name of binary file to be decoded\n<new_extension>\t\t= new extension to be used when encoding multiple files\n"); + printf ("\nSee examples/*.cfg for configuration file format.\n"); +@@ -179,17 +174,14 @@ main (int argc, char *argv[]) + unsigned int encode_docsis = FALSE, decode_bin = FALSE; + int i; + +- memset (prog_name, 0, 255); +- strncpy (prog_name, argv[0], 254); +- + if (argc < 2 ) { +- usage(prog_name); ++ usage(); + exit (10); + } + + if (!strcmp (argv[1], "-m") ){ /* variable number of args, encoding multiple files */ + if (argc < 5 ) { +- usage(prog_name); ++ usage(); + exit (10); + } + extension_string = argv[argc-1]; +@@ -204,21 +196,21 @@ main (int argc, char *argv[]) + { + case 3: + if (strcmp (argv[1], "-d")) +- usage (prog_name); ++ usage (); + decode_bin = TRUE; + config_file = argv[2]; + break; + ;; + case 4: + if (strcmp (argv[1], "-p")) +- usage (prog_name); ++ usage (); + config_file = argv[2]; + output_file = argv[3]; + break; + ;; + case 5: + if (strcmp (argv[1], "-e")) +- usage (prog_name); ++ usage (); + encode_docsis = TRUE; + config_file = argv[2]; + key_file = argv[3]; +@@ -226,7 +218,7 @@ main (int argc, char *argv[]) + break; + ;; + default: +- usage (prog_name); ++ usage (); + exit (10); + } + } +@@ -235,7 +227,7 @@ main (int argc, char *argv[]) + { + if ((kf = fopen (key_file, "r")) == NULL) + { +- printf ("%s: error: can't open keyfile %s\n", prog_name, key_file); ++ printf ("docsis: error: can't open keyfile %s\n", key_file); + exit (-5); + } + keylen = fread (key, sizeof (unsigned char), 64, kf); +@@ -307,7 +299,7 @@ int encode_one_file ( char *input_file, char *output_file, + + if (!strcmp (input_file, output_file)) + { +- printf ("%s: Error: source file is the same as destination file\n", prog_name); ++ printf ("docsis: Error: source file is the same as destination file\n"); + return -1; + } + +@@ -350,7 +342,7 @@ int encode_one_file ( char *input_file, char *output_file, + decode_main_aggregate (buffer, buflen); + if ((of = fopen (output_file, "wb")) == NULL) + { +- printf ("%s: error: can't open output file %s\n", prog_name, output_file); ++ printf ("docsis: error: can't open output file %s\n", output_file); + return -2; + } + fwrite (buffer, sizeof (unsigned char), buflen, of); +--- src/docsis_encode.c.orig ++++ src/docsis_encode.c +@@ -33,7 +33,6 @@ + #include <math.h> + + #include "docsis_common.h" +-#include "docsis_globals.h" + #include "docsis_encode.h" + #include "docsis_snmp.h" + #include "ethermac.h" +@@ -57,7 +56,7 @@ int encode_uint ( unsigned char *buf, void *tval, struct symbol_entry *sym_ptr ) + helper = (union t_val *) tval; + if ( sym_ptr->low_limit || sym_ptr->high_limit ) { + if ( helper->uintval < sym_ptr->low_limit || helper->uintval > sym_ptr->high_limit ) { +- printf ("%s: at line %d, %s value %d out of range %hd-%hd\n ", prog_name,line,sym_ptr->sym_ident,helper->uintval,sym_ptr->low_limit, sym_ptr->high_limit); ++ printf ("docsis: at line %d, %s value %d out of range %hd-%hd\n ", line,sym_ptr->sym_ident,helper->uintval,sym_ptr->low_limit, sym_ptr->high_limit); + exit(-15); + } + } +@@ -86,7 +85,7 @@ int encode_ushort ( unsigned char *buf, void *tval, struct symbol_entry *sym_ptr + helper = (union t_val *) tval; + if ( sym_ptr->low_limit || sym_ptr->high_limit ) { + if ( helper->uintval < sym_ptr->low_limit || helper->uintval > sym_ptr->high_limit ) { +- printf ("%s: at line %d, %s value %d out of range %hd-%hd\n ", prog_name,line,sym_ptr->sym_ident,helper->uintval,sym_ptr->low_limit, sym_ptr->high_limit); ++ printf ("docsis: at line %d, %s value %d out of range %hd-%hd\n ", line,sym_ptr->sym_ident,helper->uintval,sym_ptr->low_limit, sym_ptr->high_limit); + exit(-15); + } + } +@@ -118,7 +117,7 @@ int encode_uchar ( unsigned char *buf, void *tval, struct symbol_entry *sym_ptr + + if ( sym_ptr->low_limit || sym_ptr->high_limit ) { + if ( helper->uintval < sym_ptr->low_limit || helper->uintval > sym_ptr->high_limit ) { +- printf ("%s: at line %d, %s value %d out of range %hd-%hd\n ", prog_name,line,sym_ptr->sym_ident,helper->uintval,sym_ptr->low_limit, sym_ptr->high_limit); ++ printf ("docsis: at line %d, %s value %d out of range %hd-%hd\n ", line,sym_ptr->sym_ident,helper->uintval,sym_ptr->low_limit, sym_ptr->high_limit); + exit(-15); + } + } +--- src/docsis_globals.h.orig ++++ src/docsis_globals.h +@@ -23,7 +23,6 @@ + #ifndef _DOCSIS_GLOBALS_H + #define _DOCSIS_GLOBALS_H + +-char prog_name[255]; + struct tlv *global_tlvtree_head; + symbol_type *global_symtable; + +--- src/docsis_yy.y.orig ++++ src/docsis_yy.y +@@ -37,7 +37,6 @@ extern unsigned int line; /* current line number, defined in a.l */ + extern struct tlv *global_tlvtree_head; /* Global list of all config TLVs */ + extern symbol_type *global_symtable; + extern FILE *yyin; +-extern char prog_name[255]; + + struct tlv *_my_tlvtree_head; + +@@ -620,7 +619,7 @@ int parse_config_file ( char *file, struct tlv **parse_tree_result ) + + if ( (cf = fopen ( file, "r" ))== NULL ) + { +- printf ("%s: Can't open input file %s\n", prog_name, file ); ++ printf ("docsis: Can't open input file %s\n", file ); + return -1; + } +

1 0

[141277] trunk/dports/net/net-snmp
by ryandesign＠macports.org 14 Oct '15

14 Oct '15

Revision: 141277 https://trac.macports.org/changeset/141277 Author: ryandesign(a)macports.org Date: 2015-10-13 23:08:22 -0700 (Tue, 13 Oct 2015) Log Message: ----------- net-snmp: fix OS names in darwin 11 through 15 headers and actually install them (because some programs include the platform header) Modified Paths: -------------- trunk/dports/net/net-snmp/Portfile trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin14.h.diff trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin15.h.diff Added Paths: ----------- trunk/dports/net/net-snmp/files/patch-Makefile.in.diff trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin11.h.diff trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin12.h.diff trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin13.h.diff Modified: trunk/dports/net/net-snmp/Portfile =================================================================== --- trunk/dports/net/net-snmp/Portfile 2015-10-14 05:41:57 UTC (rev 141276) +++ trunk/dports/net/net-snmp/Portfile 2015-10-14 06:08:22 UTC (rev 141277) @@ -5,6 +5,7 @@ name net-snmp version 5.7.3 +revision 1 categories net license BSD platforms darwin @@ -39,8 +40,12 @@ } patchfiles patch-configure.diff +patchfiles-append patch-include-net-snmp-system-darwin11.h.diff +patchfiles-append patch-include-net-snmp-system-darwin12.h.diff +patchfiles-append patch-include-net-snmp-system-darwin13.h.diff patchfiles-append patch-include-net-snmp-system-darwin14.h.diff patchfiles-append patch-include-net-snmp-system-darwin15.h.diff +patchfiles-append patch-Makefile.in.diff configure.env-append PERLPROG=${prefix}/bin/perl${perl_version} Added: trunk/dports/net/net-snmp/files/patch-Makefile.in.diff =================================================================== --- trunk/dports/net/net-snmp/files/patch-Makefile.in.diff (rev 0) +++ trunk/dports/net/net-snmp/files/patch-Makefile.in.diff 2015-10-14 06:08:22 UTC (rev 141277) @@ -0,0 +1,12 @@ +--- Makefile.in.orig 2014-12-08 14:23:22.000000000 -0600 ++++ Makefile.in 2015-10-14 00:33:20.000000000 -0500 +@@ -18,7 +18,8 @@ + INSTALLHEADERS=version.h net-snmp-features.h + INCLUDESUBDIR=system + INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \ +- darwin.h darwin7.h darwin8.h darwin9.h darwin10.h dragonfly.h dynix.h \ ++ darwin.h darwin7.h darwin8.h darwin9.h darwin10.h darwin11.h \ ++ darwin12.h darwin13.h darwin14.h darwin15.h dragonfly.h dynix.h \ + freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h \ + freebsd7.h freebsd8.h freebsd9.h freebsd10.h freebsd11.h \ + freebsd12.h freebsd.h \ Added: trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin11.h.diff =================================================================== --- trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin11.h.diff (rev 0) +++ trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin11.h.diff 2015-10-14 06:08:22 UTC (rev 141277) @@ -0,0 +1,9 @@ +--- include/net-snmp/system/darwin11.h.orig 2014-12-08 14:23:22.000000000 -0600 ++++ include/net-snmp/system/darwin11.h 2015-10-14 00:23:08.000000000 -0500 +@@ -1,5 +1,5 @@ + /* +- * While Darwin 10 (aka, Mac OS X 10.6 Snow Leopard) is "BSD-like", it differs ++ * While Darwin 11 (aka, Mac OS X 10.7 Lion) is "BSD-like", it differs + * substantially enough to not warrant pretending it is a BSD flavor. + * This first section are the vestigal BSD remnants. + */ Added: trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin12.h.diff =================================================================== --- trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin12.h.diff (rev 0) +++ trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin12.h.diff 2015-10-14 06:08:22 UTC (rev 141277) @@ -0,0 +1,9 @@ +--- include/net-snmp/system/darwin12.h.orig 2014-12-08 14:23:22.000000000 -0600 ++++ include/net-snmp/system/darwin12.h 2015-10-14 00:22:57.000000000 -0500 +@@ -1,5 +1,5 @@ + /* +- * While Darwin 10 (aka, Mac OS X 10.6 Snow Leopard) is "BSD-like", it differs ++ * While Darwin 12 (aka, OS X 10.8 Mountain Lion) is "BSD-like", it differs + * substantially enough to not warrant pretending it is a BSD flavor. + * This first section are the vestigal BSD remnants. + */ Added: trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin13.h.diff =================================================================== --- trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin13.h.diff (rev 0) +++ trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin13.h.diff 2015-10-14 06:08:22 UTC (rev 141277) @@ -0,0 +1,9 @@ +--- include/net-snmp/system/darwin13.h.orig 2014-12-08 14:23:22.000000000 -0600 ++++ include/net-snmp/system/darwin13.h 2015-10-14 00:22:42.000000000 -0500 +@@ -1,5 +1,5 @@ + /* +- * While Darwin 10 (aka, Mac OS X 10.6 Snow Leopard) is "BSD-like", it differs ++ * While Darwin 13 (aka, OS X 10.9 Mavericks) is "BSD-like", it differs + * substantially enough to not warrant pretending it is a BSD flavor. + * This first section are the vestigal BSD remnants. + */ Modified: trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin14.h.diff =================================================================== --- trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin14.h.diff 2015-10-14 05:41:57 UTC (rev 141276) +++ trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin14.h.diff 2015-10-14 06:08:22 UTC (rev 141277) @@ -1,5 +1,12 @@ ---- include/net-snmp/system/darwin14.h 2013-10-09 17:28:58.000000000 -0500 -+++ include/net-snmp/system/darwin14.h 2014-10-24 00:58:04.000000000 -0500 +--- include/net-snmp/system/darwin14.h.orig 2014-12-08 14:23:22.000000000 -0600 ++++ include/net-snmp/system/darwin14.h 2015-10-14 00:28:27.000000000 -0500 +@@ -1,5 +1,5 @@ + /* +- * While Darwin 10 (aka, Mac OS X 10.6 Snow Leopard) is "BSD-like", it differs ++ * While Darwin 14 (aka, OS X 10.10 Yosemite) is "BSD-like", it differs + * substantially enough to not warrant pretending it is a BSD flavor. + * This first section are the vestigal BSD remnants. + */ @@ -44,9 +44,9 @@ /* * This section defines Mac OS X 10.5 (and later) specific additions. Modified: trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin15.h.diff =================================================================== --- trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin15.h.diff 2015-10-14 05:41:57 UTC (rev 141276) +++ trunk/dports/net/net-snmp/files/patch-include-net-snmp-system-darwin15.h.diff 2015-10-14 06:08:22 UTC (rev 141277) @@ -1,5 +1,12 @@ ---- include/net-snmp/system/darwin15.h 2013-10-09 17:28:58.000000000 -0500 -+++ include/net-snmp/system/darwin15.h 2014-10-24 00:58:04.000000000 -0500 +--- include/net-snmp/system/darwin15.h.orig 2014-12-08 14:23:22.000000000 -0600 ++++ include/net-snmp/system/darwin15.h 2015-10-14 00:28:27.000000000 -0500 +@@ -1,5 +1,5 @@ + /* +- * While Darwin 10 (aka, Mac OS X 10.6 Snow Leopard) is "BSD-like", it differs ++ * While Darwin 15 (aka, OS X 10.11 El Capitan) is "BSD-like", it differs + * substantially enough to not warrant pretending it is a BSD flavor. + * This first section are the vestigal BSD remnants. + */ @@ -44,9 +44,9 @@ /* * This section defines Mac OS X 10.5 (and later) specific additions.

1 0

[141276] trunk/dports/science/root5/Portfile
by ryandesign＠macports.org 14 Oct '15

14 Oct '15

Revision: 141276 https://trac.macports.org/changeset/141276 Author: ryandesign(a)macports.org Date: 2015-10-13 22:41:57 -0700 (Tue, 13 Oct 2015) Log Message: ----------- root5: make gcc5 the default variant (#49211; maintainer) Modified Paths: -------------- trunk/dports/science/root5/Portfile Modified: trunk/dports/science/root5/Portfile =================================================================== --- trunk/dports/science/root5/Portfile 2015-10-14 05:27:31 UTC (rev 141275) +++ trunk/dports/science/root5/Portfile 2015-10-14 05:41:57 UTC (rev 141276) @@ -574,7 +574,7 @@ # ======================================================================================== set gcc_versions { 4.3 4.4 4.5 4.6 4.7 4.8 4.9 5 } -set default_fortran_variant +gcc48 +set default_fortran_variant +gcc5 foreach ver ${gcc_versions} { set ver_no_dot [join [split ${ver} "."] ""]

1 0

propchange - r141100 svn:log
by ryandesign＠macports.org 14 Oct '15

14 Oct '15

Author: ryandesign(a)macports.org (original author: mojca(a)macports.org) Revision: 141100 Property Name: svn:log @@ -1 +1 @@ -root5: upgrade to 5.34.34 and fix the livecheck that probably worked with the old site (before switching to github) +root5: upgrade to 5.34.34 (#49211) and fix the livecheck that probably worked with the old site (before switching to github)

1 0

[141275] trunk/dports/aqua/TeXShop3/Portfile
by jwa＠macports.org 14 Oct '15

14 Oct '15

Revision: 141275 https://trac.macports.org/changeset/141275 Author: jwa(a)macports.org Date: 2015-10-13 22:27:31 -0700 (Tue, 13 Oct 2015) Log Message: ----------- TeXShop3: version bump to 3.56 Modified Paths: -------------- trunk/dports/aqua/TeXShop3/Portfile Modified: trunk/dports/aqua/TeXShop3/Portfile =================================================================== --- trunk/dports/aqua/TeXShop3/Portfile 2015-10-14 04:58:47 UTC (rev 141274) +++ trunk/dports/aqua/TeXShop3/Portfile 2015-10-14 05:27:31 UTC (rev 141275) @@ -1,3 +1,4 @@ + # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ @@ -6,7 +7,7 @@ name TeXShop3 conflicts TeXShop -version 3.54 +version 3.56 set major [lindex [split ${version} .] 0] categories aqua editors @@ -28,8 +29,8 @@ worksrcdir texshopsource[strsed ${version} {/\.//}] set propername TeXShop -checksums rmd160 4150370b744473cc79b9dcfc21fe285851e7dbae \ - sha256 cdc33bb75696399824d410b4244fcc484c2d7a95653bbd83af0e088f176b70fb +checksums rmd160 9bcc17e81994a8f4946a9eb330cbb080edef1340 \ + sha256 8150a90b1d32d8edff65ed0ef2e7af4c0af9d370e0cc82a8aebe104a18006008 pre-fetch { platform darwin {

1 0

[141274] trunk/dports/net/rabbitmq-server/Portfile
by ryandesign＠macports.org 14 Oct '15

14 Oct '15

Revision: 141274 https://trac.macports.org/changeset/141274 Author: ryandesign(a)macports.org Date: 2015-10-13 21:58:47 -0700 (Tue, 13 Oct 2015) Log Message: ----------- rabbitmq-server: update to 3.5.6 (#49276; maintainer) Modified Paths: -------------- trunk/dports/net/rabbitmq-server/Portfile Modified: trunk/dports/net/rabbitmq-server/Portfile =================================================================== --- trunk/dports/net/rabbitmq-server/Portfile 2015-10-14 03:52:39 UTC (rev 141273) +++ trunk/dports/net/rabbitmq-server/Portfile 2015-10-14 04:58:47 UTC (rev 141274) @@ -4,7 +4,7 @@ PortSystem 1.0 name rabbitmq-server -version 3.5.4 +version 3.5.6 categories net platforms darwin maintainers gmail.com:hayder.net @@ -25,11 +25,11 @@ checksums \ ${name}-${version}${extract.suffix} \ - rmd160 4e1cf0ca1889673c56872a6dfaf9e688899d1eda \ - sha256 f79814d5fd5574734f599ef570ddace02ce4e47a1441cd052c568cde4d6ca3a4 \ + rmd160 2fb2531f1c5aeb04f760d1e79394aa7eee9beae9 \ + sha256 24be1433234112db391e0c5ef32bfb2ca111e51b2e57998cc0f3d97ba361671f \ ${name}-generic-unix-${version}${extract.suffix} \ - rmd160 f178b3cb8d4ab9299f8ecabe338d2d2f79e82fb3 \ - sha256 24b6a4c0d5fec0ed63b756cdf96964d1729be88d5ec7934d4b4723ecdf9d3e2b + rmd160 4e8dad6a6bbec0b8da547cbd952e9d06ccaf782f \ + sha256 19d69c72bbb8c963ad3a0b8a12ed9c60bacbddb0038dde61e4cf04ad0c429039 depends_lib port:erlang

1 0

[141273] trunk/dports/_resources/port1.0/group/app-1.0.tcl
by ryandesign＠macports.org 14 Oct '15

14 Oct '15

Revision: 141273 https://trac.macports.org/changeset/141273 Author: ryandesign(a)macports.org Date: 2015-10-13 20:52:39 -0700 (Tue, 13 Oct 2015) Log Message: ----------- app-1.0.tcl: remove Tcl 8.4 workaround Modified Paths: -------------- trunk/dports/_resources/port1.0/group/app-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/app-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/app-1.0.tcl 2015-10-14 03:51:27 UTC (rev 141272) +++ trunk/dports/_resources/port1.0/group/app-1.0.tcl 2015-10-14 03:52:39 UTC (rev 141273) @@ -1,7 +1,7 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ # -# Copyright (c) 2011-2013 The MacPorts Project +# Copyright (c) 2011-2013, 2015 The MacPorts Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -143,19 +143,7 @@ return [regsub -all -nocase {[^a-z0-9.-]} [join ${identifier} .] ""] } -# Implement our own lreverse proc, if it doesn't already exist. This will be -# the case on Tiger and Leopard which have Tcl 8.4; lreverse is new in Tcl 8.5. -# Taken from http://wiki.tcl.tk/17188 -if {[info commands lreverse] == ""} { - proc lreverse l { - set r {} - set i [llength $l] - while {[incr i -1]} {lappend r [lindex $l $i]} - lappend r [lindex $l 0] - } -} - platform macosx { pre-destroot { if {[tbool app.create]} {

1 0

[141272] trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl
by ryandesign＠macports.org 14 Oct '15

14 Oct '15

Revision: 141272 https://trac.macports.org/changeset/141272 Author: ryandesign(a)macports.org Date: 2015-10-13 20:51:27 -0700 (Tue, 13 Oct 2015) Log Message: ----------- active_variants-1.1.tcl: update copyright date Modified Paths: -------------- trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl Modified: trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl 2015-10-14 03:36:25 UTC (rev 141271) +++ trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl 2015-10-14 03:51:27 UTC (rev 141272) @@ -1,6 +1,6 @@ # $Id$ # -# Copyright (c) 2012-2014 The MacPorts Project +# Copyright (c) 2012-2015 The MacPorts Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without

1 0

[141271] trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl
by dstrubbe＠macports.org 14 Oct '15

14 Oct '15

Revision: 141271 https://trac.macports.org/changeset/141271 Author: dstrubbe(a)macports.org Date: 2015-10-13 20:36:25 -0700 (Tue, 13 Oct 2015) Log Message: ----------- active_variants PortGroup: * Perform a check in the activate phase too, to catch the case that a port was deactivated, a dependency was installed with problematic variants, and then the port was reactivated. In this case a warning is written. * Typos. Modified Paths: -------------- trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl Modified: trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl 2015-10-14 03:34:29 UTC (rev 141270) +++ trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl 2015-10-14 03:36:25 UTC (rev 141271) @@ -51,7 +51,7 @@ # $required # is a list of variants that must be enabled for the test to succeed # (required; remember this can also be a space-separated string or just -# a string for a single value. It's iterpreted as list, though.) +# a string for a single value. It's interpreted as list, though.) # $forbidden # is a list of variants that may not be enabled for the test to succeed # (default is empty list, see description of $required for values that can be @@ -70,7 +70,7 @@ # } # # If all you want to do is bail out when the condition isn't fulfilled, there's -# a convience wrapper available. If the condition isn't met it will print an +# a convenience wrapper available. If the condition isn't met it will print an # error message and exit in a pre-configure phase. This can't be run any # earlier, because not all dependency types are installed before configure # phase. Previous versions of this PortGroup required you to manually put @@ -164,7 +164,7 @@ return 0 } -# global list holding all items the should be checked for and cause an error if +# global list holding all items should be checked for and cause an error if # not present set _require_active_variants_list [list] @@ -187,7 +187,8 @@ source { set deptypes "depends_fetch depends_extract depends_lib depends_build depends_run" } - archivefetch { + activate - + archivefetch { set deptypes "depends_lib depends_run" } default { @@ -197,7 +198,7 @@ # for each type we're considering foreach deptype $deptypes { - # check that there are any dependencies by that type + # check whether there are any dependencies of that type if {[info exists PortInfo($deptype)]} { # and for each dependency foreach depspec $PortInfo($deptype) { @@ -231,7 +232,12 @@ } if {[catch {set result [active_variants $depspec $required $forbidden]}] != 0} { - error "${port} is required, but not active." + set message "${port} is required, but not active." + if {$method == activate} { + ui_msg "Warning: $message" + } else { + error "$message" + } } if {!$result} { set str_required "" @@ -246,7 +252,12 @@ if {$str_required != "" && $str_forbidden != ""} { set str_combine " and " } - error "${port} must be installed ${str_required}${str_combine}${str_forbidden}." + set message "${port} must be installed ${str_required}${str_combine}${str_forbidden}." + if {$method == "activate"} { + ui_msg "Warning: $message" + } else { + error "$message" + } } } } @@ -262,3 +273,8 @@ pre-archivefetch { _check_require_active_variants archivefetch } + +# be sure that a required variant was not changed since this port was built or fetched +pre-activate { + _check_require_active_variants activate +}

1 0