diff options
31 files changed, 478 insertions, 611 deletions
diff --git a/lang/erlang-doc/Makefile b/lang/erlang-doc/Makefile index d16c28c..73c779c 100644 --- a/lang/erlang-doc/Makefile +++ b/lang/erlang-doc/Makefile @@ -6,67 +6,66 @@ # PORTNAME= erlang-doc -PORTVERSION= r9c -PORTREVISION= 4 +PORTVERSION= r10b2 PORTEPOCH= 1 CATEGORIES= lang -MASTER_SITES= http://www.erlang.org/doc/r9c/pdf/ \ +MASTER_SITES= http://www.erlang.se/doc/doc-5.4.3/pdf/ \ http://erlang.org/download/ \ http://www.erlang.se/doc/ \ http://www.sics.se/~joe/thesis/ \ http://www.st.se/telecom/eng/projects/ -DISTFILES= appmon-2.1.2.pdf \ - asn1-1.4.2.pdf \ - compiler-4.2.pdf \ +DISTFILES= appmon-2.1.3.pdf \ + asn1-1.4.4.4.pdf \ + compiler-4.3.2.pdf \ cosEvent-2.1.pdf \ cosEventDomain-1.1.pdf \ - cosFileTransfer-1.1.pdf \ - cosNotification-1.1.pdf \ - cosProperty-1.1.pdf \ + cosFileTransfer-1.1.2.pdf \ + cosNotification-1.1.1.pdf \ + cosProperty-1.1.1.pdf \ cosTime-1.1.pdf \ cosTransactions-1.2.pdf \ - crypto-1.2.pdf \ - debugger-2.2.pdf \ - design_principles-5.3.pdf \ - efficiency_guide-5.3.pdf \ - embedded-5.3.pdf \ - erl_interface-3.4.pdf \ - erts-5.3.pdf \ + crypto-1.2.2.pdf \ + debugger-2.3.1.pdf \ + design_principles-5.4.3.pdf \ + efficiency_guide-5.4.3.pdf \ + embedded-5.4.3.pdf \ + erl_interface-3.5.pdf \ + erts-5.4.3.pdf \ et-1.0.pdf \ - eva-2.0.4.pdf \ - getting_started-5.3.pdf \ - gs-1.5.2.pdf \ - ic-4.2.1.pdf \ - inets-3.0.6.pdf \ - installation_guide-5.3.pdf \ - jinterface-1.2.1.1.pdf \ - kernel-2.9.pdf \ - megaco-1.2.3.pdf \ + getting_started-5.4.3.pdf \ + gs-1.5.3.pdf \ + ic-4.2.7.pdf \ + inets-4.0.1.pdf \ + installation_guide-5.4.3.pdf \ + jinterface-1.3.pdf \ + kernel-2.10.3.pdf \ + megaco-2.1.7.pdf \ mnemosyne-1.2.5.pdf \ - mnesia-4.1.4.pdf \ + mnesia-4.2.pdf \ mnesia_session-1.1.5.pdf \ - oam-5.3.pdf \ - observer-0.9.5.pdf \ - odbc-1.0.8.pdf \ - orber-3.4.2.pdf \ - os_mon-1.6.1.pdf \ - otp_mibs-1.0.pdf \ - parsetools-1.2.pdf \ - pman-2.4.1.pdf \ - programming_examples-5.3.pdf \ - reference_manual-5.3.pdf \ - runtime_tools-1.4.pdf \ - sasl-1.10.pdf \ - snmp-3.4.pdf \ - ssl-3.0.1.pdf \ - stdlib-1.12.pdf \ - system_architecture_intro-5.3.pdf \ - system_principles-5.3.pdf \ - toolbar-1.1.0.pdf \ - tools-2.3.pdf \ - tutorial-5.3.pdf \ - tv-2.0.5.pdf \ - webtool-0.8.1.pdf \ + oam-5.4.3.pdf \ + observer-0.9.6.pdf \ + odbc-2.0.2.pdf \ + orber-3.5.3.pdf \ + os_mon-1.7.1.pdf \ + otp_mibs-1.0.4.pdf \ + parsetools-1.3.pdf \ + pman-2.5.1.pdf \ + programming_examples-5.4.3.pdf \ + reference_manual-5.4.3.pdf \ + runtime_tools-1.5.pdf \ + sasl-2.0.pdf \ + snmp-4.0.4.pdf \ + ssl-3.0.4.pdf \ + stdlib-1.13.3.pdf \ + system_architecture_intro-5.4.3.pdf \ + system_principles-5.4.3.pdf \ + toolbar-1.2.pdf \ + tools-2.4.pdf \ + tutorial-5.4.3.pdf \ + tv-2.1.1.pdf \ + webtool-0.8.2.pdf \ + xmerl-1.0.pdf \ course.pdf \ erlang-book-part1.pdf \ programming_rules.pdf \ diff --git a/lang/erlang-doc/distinfo b/lang/erlang-doc/distinfo index ae57409..4ac21f2 100644 --- a/lang/erlang-doc/distinfo +++ b/lang/erlang-doc/distinfo @@ -1,107 +1,107 @@ -MD5 (erlang/appmon-2.1.2.pdf) = 9951ddce966001eda3ad2832650cd910 -SIZE (erlang/appmon-2.1.2.pdf) = 61097 -MD5 (erlang/asn1-1.4.2.pdf) = 5ae7009e573d26b3d65741e2b148f9f3 -SIZE (erlang/asn1-1.4.2.pdf) = 179808 -MD5 (erlang/compiler-4.2.pdf) = 6355d124319cb9f15a86184dff5abb80 -SIZE (erlang/compiler-4.2.pdf) = 45380 -MD5 (erlang/cosEvent-2.1.pdf) = fc29686d2966c427fa55804b52aa88dd -SIZE (erlang/cosEvent-2.1.pdf) = 111190 -MD5 (erlang/cosEventDomain-1.1.pdf) = f5103e1e066c36053088d5e6e7bcbee0 -SIZE (erlang/cosEventDomain-1.1.pdf) = 106121 -MD5 (erlang/cosFileTransfer-1.1.pdf) = d4dba44b0a67611253eaf7f7283c400b -SIZE (erlang/cosFileTransfer-1.1.pdf) = 94419 -MD5 (erlang/cosNotification-1.1.pdf) = ca6311f7707c3854e6154c1aba17bec4 -SIZE (erlang/cosNotification-1.1.pdf) = 379676 -MD5 (erlang/cosProperty-1.1.pdf) = 07c9347199adab4ecbd80af22236525e -SIZE (erlang/cosProperty-1.1.pdf) = 96001 -MD5 (erlang/cosTime-1.1.pdf) = e2a9436f5a65dd4bd69945630e9b69d9 -SIZE (erlang/cosTime-1.1.pdf) = 84651 -MD5 (erlang/cosTransactions-1.2.pdf) = 325bc29b53463db4e0884134df5485fe -SIZE (erlang/cosTransactions-1.2.pdf) = 119118 -MD5 (erlang/crypto-1.2.pdf) = 1eb2d1ad851a21972df749fef39e16e5 -SIZE (erlang/crypto-1.2.pdf) = 66967 -MD5 (erlang/debugger-2.2.pdf) = 6d4c4c1a8a9b5d6081386ed3ef2ed153 -SIZE (erlang/debugger-2.2.pdf) = 163742 -MD5 (erlang/design_principles-5.3.pdf) = 6cbc27460ad6a0baebfa1a060a0d5f18 -SIZE (erlang/design_principles-5.3.pdf) = 290925 -MD5 (erlang/efficiency_guide-5.3.pdf) = ae2182d95f17094f3796c5a1bf3bee61 -SIZE (erlang/efficiency_guide-5.3.pdf) = 141964 -MD5 (erlang/embedded-5.3.pdf) = 184b88a296780be233ed8cb5056f5af4 -SIZE (erlang/embedded-5.3.pdf) = 78799 -MD5 (erlang/erl_interface-3.4.pdf) = 0918ed2bd28c82e4b05cf3fc91572699 -SIZE (erlang/erl_interface-3.4.pdf) = 366767 -MD5 (erlang/erts-5.3.pdf) = 49f299543d3ba0d261b95ca75745aae0 -SIZE (erlang/erts-5.3.pdf) = 435307 -MD5 (erlang/et-1.0.pdf) = 8b53c588164d78efc00eb8c65fbcdb73 -SIZE (erlang/et-1.0.pdf) = 267614 -MD5 (erlang/eva-2.0.4.pdf) = 9947570551ff520380b32082f150b623 -SIZE (erlang/eva-2.0.4.pdf) = 246620 -MD5 (erlang/getting_started-5.3.pdf) = 3f8676af8accb62025983d2e97e684be -SIZE (erlang/getting_started-5.3.pdf) = 177943 -MD5 (erlang/gs-1.5.2.pdf) = 25ecc9d01cbeeb6561bec90b0f0b6490 -SIZE (erlang/gs-1.5.2.pdf) = 266528 -MD5 (erlang/ic-4.2.1.pdf) = 07a39a16772b36f9c7450adf859e94c4 -SIZE (erlang/ic-4.2.1.pdf) = 324555 -MD5 (erlang/inets-3.0.6.pdf) = 92114568f27db2eef796c5a43efacb68 -SIZE (erlang/inets-3.0.6.pdf) = 414289 -MD5 (erlang/installation_guide-5.3.pdf) = 23597b80b0ff13a228a53bb02fcb0834 -SIZE (erlang/installation_guide-5.3.pdf) = 31808 -MD5 (erlang/jinterface-1.2.1.1.pdf) = 51b40ed2815298cd32da0f587d05c790 -SIZE (erlang/jinterface-1.2.1.1.pdf) = 60068 -MD5 (erlang/kernel-2.9.pdf) = 87abe585e0f078a2b70314bbd66db67e -SIZE (erlang/kernel-2.9.pdf) = 891743 -MD5 (erlang/megaco-1.2.3.pdf) = b0cd63ea147ea1b8a9d271d66d9a78a1 -SIZE (erlang/megaco-1.2.3.pdf) = 397297 -MD5 (erlang/mnemosyne-1.2.5.pdf) = 6f997b57f2c788871c9a90df82d81783 -SIZE (erlang/mnemosyne-1.2.5.pdf) = 118305 -MD5 (erlang/mnesia-4.1.4.pdf) = 2b2533a332d5380e5b785de0e1068ceb -SIZE (erlang/mnesia-4.1.4.pdf) = 579748 -MD5 (erlang/mnesia_session-1.1.5.pdf) = e88e1414783084eaa3e50da8d9b2ac4e -SIZE (erlang/mnesia_session-1.1.5.pdf) = 106150 -MD5 (erlang/oam-5.3.pdf) = 94122f3f453a70d7bcb46d7151f463a3 -SIZE (erlang/oam-5.3.pdf) = 42505 -MD5 (erlang/observer-0.9.5.pdf) = d268f9bf2e47992778e42328b91009ac -SIZE (erlang/observer-0.9.5.pdf) = 174906 -MD5 (erlang/odbc-1.0.8.pdf) = fce9d4914342e6c19614099213767f65 -SIZE (erlang/odbc-1.0.8.pdf) = 161092 -MD5 (erlang/orber-3.4.2.pdf) = 6ac6d9c039f79b92c45681d376dd66d1 -SIZE (erlang/orber-3.4.2.pdf) = 1103962 -MD5 (erlang/os_mon-1.6.1.pdf) = cab16d15a79c1b19827269116b51fd02 -SIZE (erlang/os_mon-1.6.1.pdf) = 87238 -MD5 (erlang/otp_mibs-1.0.pdf) = bddbceb15ac0a80d241520f136f522cf -SIZE (erlang/otp_mibs-1.0.pdf) = 28431 -MD5 (erlang/parsetools-1.2.pdf) = 0ea472ba35d531a3c274a91cd0e4159c -SIZE (erlang/parsetools-1.2.pdf) = 57883 -MD5 (erlang/pman-2.4.1.pdf) = 9b2dfb1fc7ae90c0690070c215ddf087 -SIZE (erlang/pman-2.4.1.pdf) = 72585 -MD5 (erlang/programming_examples-5.3.pdf) = 6e68659db1dc24329a60a75d1827a147 -SIZE (erlang/programming_examples-5.3.pdf) = 98764 -MD5 (erlang/reference_manual-5.3.pdf) = 9a871e8749c3897715c9a67ce092ff11 -SIZE (erlang/reference_manual-5.3.pdf) = 176486 -MD5 (erlang/runtime_tools-1.4.pdf) = 357eae4d2e255ddf217d3ffb932073e1 -SIZE (erlang/runtime_tools-1.4.pdf) = 104856 -MD5 (erlang/sasl-1.10.pdf) = 12466a1fa45458122e3cf524a74a0df9 -SIZE (erlang/sasl-1.10.pdf) = 304681 -MD5 (erlang/snmp-3.4.pdf) = 5e98105684f5e217c92543fa8cacbc5a -SIZE (erlang/snmp-3.4.pdf) = 602937 -MD5 (erlang/ssl-3.0.1.pdf) = d94454a4046a99e1fe58fb8b5c9ff182 -SIZE (erlang/ssl-3.0.1.pdf) = 196835 -MD5 (erlang/stdlib-1.12.pdf) = 08532d0f4da7a0687343431128938126 -SIZE (erlang/stdlib-1.12.pdf) = 1216959 -MD5 (erlang/system_architecture_intro-5.3.pdf) = 232a6ff370c3e4d4872a75f4ef0456e1 -SIZE (erlang/system_architecture_intro-5.3.pdf) = 28859 -MD5 (erlang/system_principles-5.3.pdf) = 5e7ddcce8a67c2b32cd17405881474a1 -SIZE (erlang/system_principles-5.3.pdf) = 61529 -MD5 (erlang/toolbar-1.1.0.pdf) = cdb59f070b29bc5169ccff4f2f1d0729 -SIZE (erlang/toolbar-1.1.0.pdf) = 45324 -MD5 (erlang/tools-2.3.pdf) = 45e7e34bd9302f89a45137ecfef402f2 -SIZE (erlang/tools-2.3.pdf) = 422444 -MD5 (erlang/tutorial-5.3.pdf) = 13f9426c6f254aed2a4b983733d7c0fe -SIZE (erlang/tutorial-5.3.pdf) = 122311 -MD5 (erlang/tv-2.0.5.pdf) = 9a13ab15503b4188d33553a7e166665c -SIZE (erlang/tv-2.0.5.pdf) = 180474 -MD5 (erlang/webtool-0.8.1.pdf) = 88f59ad07f8b4efa79866dcb40269648 -SIZE (erlang/webtool-0.8.1.pdf) = 52106 +MD5 (erlang/appmon-2.1.3.pdf) = 8deb3e5e2a8a6332e54dffea3f093994 +SIZE (erlang/appmon-2.1.3.pdf) = 58581 +MD5 (erlang/asn1-1.4.4.4.pdf) = cba190bdcabb5b55df68e1a6bd74e8e9 +SIZE (erlang/asn1-1.4.4.4.pdf) = 267103 +MD5 (erlang/compiler-4.3.2.pdf) = 14324ccebfd8a6218fddb90c9b1da6bb +SIZE (erlang/compiler-4.3.2.pdf) = 53991 +MD5 (erlang/cosEvent-2.1.pdf) = 5c34add0a14618aa603712425b89e0bb +SIZE (erlang/cosEvent-2.1.pdf) = 109646 +MD5 (erlang/cosEventDomain-1.1.pdf) = 01fe068bbe96c1e812ff9de10cc76f45 +SIZE (erlang/cosEventDomain-1.1.pdf) = 106323 +MD5 (erlang/cosFileTransfer-1.1.2.pdf) = 041a49b46feb46b1a256f24d07c2ec4c +SIZE (erlang/cosFileTransfer-1.1.2.pdf) = 96787 +MD5 (erlang/cosNotification-1.1.1.pdf) = 33019148bace1ddd9495f5d258e16bee +SIZE (erlang/cosNotification-1.1.1.pdf) = 370033 +MD5 (erlang/cosProperty-1.1.1.pdf) = dcfca5d9f023af8e10a6a4f4bae236ed +SIZE (erlang/cosProperty-1.1.1.pdf) = 97515 +MD5 (erlang/cosTime-1.1.pdf) = db7faf03e280ec25c53664408ffa777d +SIZE (erlang/cosTime-1.1.pdf) = 87450 +MD5 (erlang/cosTransactions-1.2.pdf) = fd8add6fdd9cc9011e20678cd4e55599 +SIZE (erlang/cosTransactions-1.2.pdf) = 119886 +MD5 (erlang/crypto-1.2.2.pdf) = 76c57378e4080b75dff1ef731207faa5 +SIZE (erlang/crypto-1.2.2.pdf) = 72443 +MD5 (erlang/debugger-2.3.1.pdf) = 2bf3e15d11ee291b440d8b09b6ac0e46 +SIZE (erlang/debugger-2.3.1.pdf) = 163523 +MD5 (erlang/design_principles-5.4.3.pdf) = 9fafe6a0cbf0e776f8adb030727c508c +SIZE (erlang/design_principles-5.4.3.pdf) = 272451 +MD5 (erlang/efficiency_guide-5.4.3.pdf) = cfa911f14ee2b05bb5048b778375c22b +SIZE (erlang/efficiency_guide-5.4.3.pdf) = 140419 +MD5 (erlang/embedded-5.4.3.pdf) = 5b850179d0ba41c20fe6839ea8adb3aa +SIZE (erlang/embedded-5.4.3.pdf) = 79534 +MD5 (erlang/erl_interface-3.5.pdf) = 8f78bb97e13e7bae9aa1c1e6fda81e3a +SIZE (erlang/erl_interface-3.5.pdf) = 380326 +MD5 (erlang/erts-5.4.3.pdf) = 6b40b3cec5b8c08e4f7e13304703305a +SIZE (erlang/erts-5.4.3.pdf) = 431935 +MD5 (erlang/et-1.0.pdf) = 30941b2294a7fd9b111a9130fbac549a +SIZE (erlang/et-1.0.pdf) = 267151 +MD5 (erlang/getting_started-5.4.3.pdf) = a73ed59c393e94361f86e815534f2a53 +SIZE (erlang/getting_started-5.4.3.pdf) = 190614 +MD5 (erlang/gs-1.5.3.pdf) = 9a0b7a6bba8f8a74258cd99feb190508 +SIZE (erlang/gs-1.5.3.pdf) = 267436 +MD5 (erlang/ic-4.2.7.pdf) = 6602dc33a96528dba08e78196b1d041c +SIZE (erlang/ic-4.2.7.pdf) = 236783 +MD5 (erlang/inets-4.0.1.pdf) = 651cff9f631965f52cf8cd43c27d1262 +SIZE (erlang/inets-4.0.1.pdf) = 413205 +MD5 (erlang/installation_guide-5.4.3.pdf) = 683f3ab188b215e21e0cdf27612e21f4 +SIZE (erlang/installation_guide-5.4.3.pdf) = 35954 +MD5 (erlang/jinterface-1.3.pdf) = 172c4f9cb1ce15f67c18d6868407f78f +SIZE (erlang/jinterface-1.3.pdf) = 56407 +MD5 (erlang/kernel-2.10.3.pdf) = 473647bd0ad846fec8a51b638fc53d8e +SIZE (erlang/kernel-2.10.3.pdf) = 903264 +MD5 (erlang/megaco-2.1.7.pdf) = 80ddfb3bbbe95e2bfb303e200534eafe +SIZE (erlang/megaco-2.1.7.pdf) = 374367 +MD5 (erlang/mnemosyne-1.2.5.pdf) = da5f6c94c91f6e82ec8ce9720bfb3543 +SIZE (erlang/mnemosyne-1.2.5.pdf) = 118147 +MD5 (erlang/mnesia-4.2.pdf) = 6d88f34534a655f4d68fc138110fce6d +SIZE (erlang/mnesia-4.2.pdf) = 558955 +MD5 (erlang/mnesia_session-1.1.5.pdf) = 46b067989128c073904bc201c8d031bc +SIZE (erlang/mnesia_session-1.1.5.pdf) = 105607 +MD5 (erlang/oam-5.4.3.pdf) = de70884c9f746527b776131ad408bb29 +SIZE (erlang/oam-5.4.3.pdf) = 47856 +MD5 (erlang/observer-0.9.6.pdf) = 537e3796fc195ea0c0e8af7b49a5e3a2 +SIZE (erlang/observer-0.9.6.pdf) = 173552 +MD5 (erlang/odbc-2.0.2.pdf) = 64f71f2df5269151deea197b4881e802 +SIZE (erlang/odbc-2.0.2.pdf) = 110451 +MD5 (erlang/orber-3.5.3.pdf) = f15ca0add04ba770df2ee2da2f8685d1 +SIZE (erlang/orber-3.5.3.pdf) = 1062068 +MD5 (erlang/os_mon-1.7.1.pdf) = ec91555d818bcceef879b264cca2a4c2 +SIZE (erlang/os_mon-1.7.1.pdf) = 93493 +MD5 (erlang/otp_mibs-1.0.4.pdf) = eebe0c625351e3181cbce5fc0dbb8518 +SIZE (erlang/otp_mibs-1.0.4.pdf) = 29093 +MD5 (erlang/parsetools-1.3.pdf) = f9a5759249efb8c956c499f3f3da76dc +SIZE (erlang/parsetools-1.3.pdf) = 57738 +MD5 (erlang/pman-2.5.1.pdf) = de33d1c3d00536423bb6e194629ef33e +SIZE (erlang/pman-2.5.1.pdf) = 69888 +MD5 (erlang/programming_examples-5.4.3.pdf) = e2b94f8b978f41ca9e13e197a14e5626 +SIZE (erlang/programming_examples-5.4.3.pdf) = 95855 +MD5 (erlang/reference_manual-5.4.3.pdf) = 476f057f23a17591258915882eec1f55 +SIZE (erlang/reference_manual-5.4.3.pdf) = 215444 +MD5 (erlang/runtime_tools-1.5.pdf) = b3627d593a48c010863c480cf38ed789 +SIZE (erlang/runtime_tools-1.5.pdf) = 104458 +MD5 (erlang/sasl-2.0.pdf) = fa4fc40c0179810743ca827cc59c1f8c +SIZE (erlang/sasl-2.0.pdf) = 176783 +MD5 (erlang/snmp-4.0.4.pdf) = baf8f367fabcb839074dcf09b7d10864 +SIZE (erlang/snmp-4.0.4.pdf) = 658100 +MD5 (erlang/ssl-3.0.4.pdf) = 0a780d168e11f1ac80fd82faabbb5304 +SIZE (erlang/ssl-3.0.4.pdf) = 195580 +MD5 (erlang/stdlib-1.13.3.pdf) = 99aaf3cfadad8558a1b3d40e25737640 +SIZE (erlang/stdlib-1.13.3.pdf) = 1293053 +MD5 (erlang/system_architecture_intro-5.4.3.pdf) = 75af9d7ac3f3494f142b7f499be1fd5f +SIZE (erlang/system_architecture_intro-5.4.3.pdf) = 27862 +MD5 (erlang/system_principles-5.4.3.pdf) = 0fe272a63a89b0b39561f053b02bafb8 +SIZE (erlang/system_principles-5.4.3.pdf) = 73774 +MD5 (erlang/toolbar-1.2.pdf) = 69a743c04e7efff313936a0190fe21a0 +SIZE (erlang/toolbar-1.2.pdf) = 43613 +MD5 (erlang/tools-2.4.pdf) = a86a1361c86a72bb5264c3f548ca0622 +SIZE (erlang/tools-2.4.pdf) = 407613 +MD5 (erlang/tutorial-5.4.3.pdf) = 41271c7fd019e5b4774f6ff6685c17ff +SIZE (erlang/tutorial-5.4.3.pdf) = 120907 +MD5 (erlang/tv-2.1.1.pdf) = 6c2a479346bb90ed8d85082219b2d62b +SIZE (erlang/tv-2.1.1.pdf) = 177425 +MD5 (erlang/webtool-0.8.2.pdf) = bab7a0d63dc7390ceed4fa9e9bab9c45 +SIZE (erlang/webtool-0.8.2.pdf) = 56584 +MD5 (erlang/xmerl-1.0.pdf) = 7f121e273671221cf7824a59b3078d50 +SIZE (erlang/xmerl-1.0.pdf) = 118337 MD5 (erlang/course.pdf) = b8cc807f308bd67db9ff2b0b978e8e39 SIZE (erlang/course.pdf) = 183953 MD5 (erlang/erlang-book-part1.pdf) = deacbb9aa7cd03d18983ec15043eee84 diff --git a/lang/erlang-doc/pkg-plist b/lang/erlang-doc/pkg-plist index b73e086..f9ceb2f 100644 --- a/lang/erlang-doc/pkg-plist +++ b/lang/erlang-doc/pkg-plist @@ -1,58 +1,58 @@ -share/doc/erlang/appmon-2.1.2.pdf +share/doc/erlang/appmon-2.1.3.pdf share/doc/erlang/armstrong_thesis_2003.pdf -share/doc/erlang/asn1-1.4.2.pdf -share/doc/erlang/compiler-4.2.pdf +share/doc/erlang/asn1-1.4.4.3.pdf +share/doc/erlang/compiler-4.3.pdf share/doc/erlang/cosEvent-2.1.pdf share/doc/erlang/cosEventDomain-1.1.pdf -share/doc/erlang/cosFileTransfer-1.1.pdf -share/doc/erlang/cosNotification-1.1.pdf -share/doc/erlang/cosProperty-1.1.pdf +share/doc/erlang/cosFileTransfer-1.1.2.pdf +share/doc/erlang/cosNotification-1.1.1.pdf +share/doc/erlang/cosProperty-1.1.1.pdf share/doc/erlang/cosTime-1.1.pdf share/doc/erlang/cosTransactions-1.2.pdf share/doc/erlang/course.pdf -share/doc/erlang/crypto-1.2.pdf -share/doc/erlang/debugger-2.2.pdf -share/doc/erlang/design_principles-5.3.pdf -share/doc/erlang/efficiency_guide-5.3.pdf -share/doc/erlang/embedded-5.3.pdf -share/doc/erlang/erl_interface-3.4.pdf +share/doc/erlang/crypto-1.2.1.pdf +share/doc/erlang/debugger-2.3.pdf +share/doc/erlang/design_principles-5.4.pdf +share/doc/erlang/efficiency_guide-5.4.pdf +share/doc/erlang/embedded-5.4.pdf +share/doc/erlang/erl_interface-3.5.pdf share/doc/erlang/erlang-book-part1.pdf -share/doc/erlang/erts-5.3.pdf +share/doc/erlang/erts-5.4.pdf share/doc/erlang/et-1.0.pdf -share/doc/erlang/eva-2.0.4.pdf -share/doc/erlang/getting_started-5.3.pdf -share/doc/erlang/gs-1.5.2.pdf -share/doc/erlang/ic-4.2.1.pdf -share/doc/erlang/inets-3.0.6.pdf -share/doc/erlang/installation_guide-5.3.pdf -share/doc/erlang/jinterface-1.2.1.1.pdf -share/doc/erlang/kernel-2.9.pdf +share/doc/erlang/getting_started-5.4.pdf +share/doc/erlang/gs-1.5.3.pdf +share/doc/erlang/ic-4.2.7.pdf +share/doc/erlang/inets-4.0.pdf +share/doc/erlang/installation_guide-5.4.pdf +share/doc/erlang/jinterface-1.3.pdf +share/doc/erlang/kernel-2.10.pdf share/doc/erlang/master_thesis_patterns.pdf -share/doc/erlang/megaco-1.2.3.pdf +share/doc/erlang/megaco-2.1.5.pdf share/doc/erlang/mnemosyne-1.2.5.pdf -share/doc/erlang/mnesia-4.1.4.pdf +share/doc/erlang/mnesia-4.2.pdf share/doc/erlang/mnesia_session-1.1.5.pdf -share/doc/erlang/oam-5.3.pdf -share/doc/erlang/observer-0.9.5.pdf -share/doc/erlang/odbc-1.0.8.pdf -share/doc/erlang/orber-3.4.2.pdf -share/doc/erlang/os_mon-1.6.1.pdf -share/doc/erlang/otp_mibs-1.0.pdf -share/doc/erlang/parsetools-1.2.pdf -share/doc/erlang/pman-2.4.1.pdf -share/doc/erlang/programming_examples-5.3.pdf +share/doc/erlang/oam-5.4.pdf +share/doc/erlang/observer-0.9.6.pdf +share/doc/erlang/odbc-2.0.2.pdf +share/doc/erlang/orber-3.5.3.pdf +share/doc/erlang/os_mon-1.7.pdf +share/doc/erlang/otp_mibs-1.0.3.pdf +share/doc/erlang/parsetools-1.3.pdf +share/doc/erlang/pman-2.5.pdf +share/doc/erlang/programming_examples-5.4.pdf share/doc/erlang/programming_rules.pdf -share/doc/erlang/reference_manual-5.3.pdf -share/doc/erlang/runtime_tools-1.4.pdf -share/doc/erlang/sasl-1.10.pdf -share/doc/erlang/snmp-3.4.pdf -share/doc/erlang/ssl-3.0.1.pdf -share/doc/erlang/stdlib-1.12.pdf -share/doc/erlang/system_architecture_intro-5.3.pdf -share/doc/erlang/system_principles-5.3.pdf -share/doc/erlang/toolbar-1.1.0.pdf -share/doc/erlang/tools-2.3.pdf -share/doc/erlang/tutorial-5.3.pdf -share/doc/erlang/tv-2.0.5.pdf -share/doc/erlang/webtool-0.8.1.pdf +share/doc/erlang/reference_manual-5.4.pdf +share/doc/erlang/runtime_tools-1.5.pdf +share/doc/erlang/sasl-2.0.pdf +share/doc/erlang/snmp-4.0.pdf +share/doc/erlang/ssl-3.0.4.pdf +share/doc/erlang/stdlib-1.13.pdf +share/doc/erlang/system_architecture_intro-5.4.pdf +share/doc/erlang/system_principles-5.4.pdf +share/doc/erlang/toolbar-1.2.pdf +share/doc/erlang/tools-2.4.pdf +share/doc/erlang/tutorial-5.4.pdf +share/doc/erlang/tv-2.1.pdf +share/doc/erlang/webtool-0.8.2.pdf +share/doc/erlang/xmerl-1.0.pdf @dirrm share/doc/erlang diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 56755c4..156b2f4 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -6,15 +6,16 @@ # PORTNAME= erlang -PORTVERSION= r9c2 -PORTREVISION= 1 +PORTVERSION= r10b2 PORTEPOCH= 1 CATEGORIES= lang parallel -MASTER_SITES= ftp://ftp.erlang.org/pub/download/ \ +MASTER_SITES= http://www.erlang.org/download/ \ + ftp://ftp.erlang.org/pub/download/ \ http://www.erlang.org/download/ \ http://erlang.stacken.kth.se/download/ \ http://www.csd.uu.se/ftp/mirror/erlang/download/ -DISTNAME= otp_src_R9C-2 +DISTNAME= otp_src_R10B-2 + DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS} DIST_SUBDIR= erlang EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -30,9 +31,9 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 JAVABINDIR?= ${LOCALBASE}/jdk1.4.2/bin JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk14 -ERLANG_MAN= otp_man_R9C-2.tar.gz +ERLANG_MAN= otp_doc_man_R10B-2.tar.gz .if !defined(NOPORTDOCS) -ERLANG_DOCS= otp_html_R9C-2.tar.gz +ERLANG_DOCS= otp_doc_html_R10B-2.tar.gz .endif USE_GMAKE= yes @@ -104,13 +105,13 @@ pre-configure: # rest, not in share/doc/erlang as it should, because of relative # links in the documentation. post-install: - @for SCRIPT in ecc elink ear escript; do \ - ${REINPLACE_CMD} -e "s@ERLANG_EARS=.*@ERLANG_EARS=${LOCALBASE}/lib/erlang/erts-${ERTS_VSN}@" ${LOCALBASE}/bin/$${SCRIPT}; \ - done - - @for SCRIPT in ecc elink; do \ - ${REINPLACE_CMD} -e "s@exec .*beam_evm@exec beam_evm@" ${LOCALBASE}/bin/$${SCRIPT}; \ - done +# @for SCRIPT in ecc elink ear escript; do \ +# ${REINPLACE_CMD} -e "s@ERLANG_EARS=.*@ERLANG_EARS=${LOCALBASE}/lib/erlang/erts-${ERTS_VSN}@" ${LOCALBASE}/bin/$${SCRIPT}; \ +# done + +# @for SCRIPT in ecc elink; do \ +# ${REINPLACE_CMD} -e "s@exec .*beam_evm@exec beam_evm@" ${LOCALBASE}/bin/$${SCRIPT}; \ +# done @${LN} -sf ${LOCALBASE}/lib/erlang/lib/erl_interface-*/bin/erl_call ${LOCALBASE}/bin/erl_call @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib index 367bdcd..3a9e062 100644 --- a/lang/erlang/Makefile.lib +++ b/lang/erlang/Makefile.lib @@ -1,43 +1,46 @@ # $FreeBSD$ -ERTS_VSN= 5.3.6.3 -OTP_LIBS= appmon-2.1.2 \ - asn1-1.4.4.2 \ - compiler-4.2.3 \ +ERTS_VSN= 5.4.3 +OTP_LIBS= appmon-2.1.3 \ + asn1-1.4.4.4 \ + compiler-4.3.2 \ cosEvent-2.1 \ cosEventDomain-1.1 \ - cosFileTransfer-1.1 \ + cosFileTransfer-1.1.2 \ cosNotification-1.1.1 \ cosProperty-1.1.1 \ cosTime-1.1 \ cosTransactions-1.2 \ - crypto-1.2 \ - debugger-2.2.2 \ - erl_interface-3.4.5 \ + crypto-1.2.2 \ + debugger-2.3.1 \ + edoc-0.6.1 \ + erl_interface-3.5 \ et-1.0 \ - eva-2.0.4 \ - gs-1.5.2 \ - ic-4.2.6 \ - inets-3.0.7 \ - jinterface-1.2.1.2 \ - kernel-2.9.6.6 \ - megaco-2.1.3 \ + gs-1.5.3 \ + hipe-3.0.1 \ + ic-4.2.7 \ + inets-4.0.1 \ + jinterface-1.3 \ + kernel-2.10.3 \ + megaco-2.1.7 \ mnemosyne-1.2.5 \ - mnesia-4.1.12 \ + mnesia-4.2 \ mnesia_session-1.1.5 \ - observer-0.9.5 \ - odbc-2.0 \ - orber-3.5.1 \ - os_mon-1.6.2 \ - otp_mibs-1.0.2 \ - parsetools-1.2 \ - pman-2.4.1 \ - runtime_tools-1.4 \ - sasl-1.10 \ - snmp-3.4.8 \ - ssl-3.0.2 \ - stdlib-1.12.8 \ - toolbar-1.1.0 \ - tools-2.3 \ - tv-2.0.5 \ - webtool-0.8.1 + observer-0.9.6 \ + odbc-2.0.2 \ + orber-3.5.3 \ + os_mon-1.7.1 \ + otp_mibs-1.0.4 \ + parsetools-1.3 \ + pman-2.5.1 \ + runtime_tools-1.5 \ + sasl-2.0 \ + snmp-4.0.4 \ + ssl-3.0.4 \ + stdlib-1.13.3 \ + syntax_tools-1.4.1 \ + toolbar-1.2 \ + tools-2.4 \ + tv-2.1.1 \ + webtool-0.8.2 \ + xmerl-1.0 diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man index 5fec01b..f0af050 100644 --- a/lang/erlang/Makefile.man +++ b/lang/erlang/Makefile.man @@ -147,12 +147,6 @@ MAN3= CosEventChannelAdmin.3 \ et_viewer.3 \ etop.3 \ ets.3 \ - eva.3 \ - eva_log.3 \ - eva_log_snmp.3 \ - eva_server.3 \ - eva_snmp_adaptation.3 \ - eva_sup.3 \ file.3 \ file_sorter.3 \ filelib.3 \ @@ -171,6 +165,8 @@ MAN3= CosEventChannelAdmin.3 \ global_group.3 \ gs.3 \ heart.3 \ + http.3 \ + http_base_64.3 \ httpd.3 \ httpd_conf.3 \ httpd_core.3 \ @@ -191,11 +187,7 @@ MAN3= CosEventChannelAdmin.3 \ lists.3 \ lname.3 \ lname_component.3 \ - log.3 \ log_mf_h.3 \ - log_server.3 \ - log_snmp.3 \ - log_snmpea.3 \ make.3 \ math.3 \ megaco.3 \ @@ -243,15 +235,18 @@ MAN3= CosEventChannelAdmin.3 \ ordsets.3 \ os.3 \ os_mon.3 \ + os_mon_mib.3 \ os_sup.3 \ otp_mib.3 \ overload.3 \ + packages.3 \ pg.3 \ pg2.3 \ pman.3 \ pool.3 \ proc_lib.3 \ proplists.3 \ + qlc.3 \ queue.3 \ random.3 \ rb.3 \ @@ -266,22 +261,30 @@ MAN3= CosEventChannelAdmin.3 \ slave.3 \ snmp.3 \ snmp_community_mib.3 \ - snmp_error.3 \ - snmp_error_io.3 \ - snmp_error_report.3 \ snmp_framework_mib.3 \ snmp_generic.3 \ snmp_index.3 \ - snmp_local_db.3 \ - snmp_mgr.3 \ - snmp_mpd.3 \ snmp_notification_mib.3 \ snmp_pdus.3 \ snmp_standard_mib.3 \ - snmp_supervisor.3 \ snmp_target_mib.3 \ snmp_user_based_sm_mib.3 \ snmp_view_based_acm_mib.3 \ + snmpa.3 \ + snmpa_error.3 \ + snmpa_error_io.3 \ + snmpa_error_logger.3 \ + snmpa_error_report.3 \ + snmpa_local_db.3 \ + snmpa_mpd.3 \ + snmpa_network_interface.3 \ + snmpa_notification_filter.3 \ + snmpa_supervisor.3 \ + snmpc.3 \ + snmpm.3 \ + snmpm_mpd.3 \ + snmpm_network_interface.3 \ + snmpm_user.3 \ sofs.3 \ ssl.3 \ ssl_pkix.3 \ @@ -299,9 +302,14 @@ MAN3= CosEventChannelAdmin.3 \ webtool.3 \ win32reg.3 \ wrap_log_reader.3 \ + xmerl.3 \ + xmerl_eventp.3 \ + xmerl_scan.3 \ + xmerl_xpath.3 \ + xmerl_xs.3 \ xref.3 \ yecc.3 - + MAN4= app.4 \ appup.4 \ config.4 \ @@ -310,11 +318,10 @@ MAN4= app.4 \ script.4 MAN6= crypto.6 \ - eva.6 \ - inets.6 \ kernel.6 \ observer.6 \ runtime_tools.6 \ sasl.6 \ snmp.6 \ ssl.6 + diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo index bcab375..08b2351 100644 --- a/lang/erlang/distinfo +++ b/lang/erlang/distinfo @@ -1,6 +1,6 @@ -MD5 (erlang/otp_src_R9C-2.tar.gz) = 3cdb1c58671995d6b334e0f8da414816 -SIZE (erlang/otp_src_R9C-2.tar.gz) = 8669987 -MD5 (erlang/otp_man_R9C-2.tar.gz) = 08f0459871e5bc08cc1099483f4bcc90 -SIZE (erlang/otp_man_R9C-2.tar.gz) = 572023 -MD5 (erlang/otp_html_R9C-2.tar.gz) = 532554f358059f19ea2ef691d7ee906b -SIZE (erlang/otp_html_R9C-2.tar.gz) = 4497077 +MD5 (erlang/otp_src_R10B-2.tar.gz) = 318f5e61872035290c5939c47631cd83 +SIZE (erlang/otp_src_R10B-2.tar.gz) = 9452827 +MD5 (erlang/otp_doc_man_R10B-2.tar.gz) = c073820c7e97988aa9483618fe67aaf0 +SIZE (erlang/otp_doc_man_R10B-2.tar.gz) = 591524 +MD5 (erlang/otp_doc_html_R10B-2.tar.gz) = 118a44d4d70c8900dc7c43aeaf8b8d0b +SIZE (erlang/otp_doc_html_R10B-2.tar.gz) = 4559646 diff --git a/lang/erlang/files/patch-Makefile.in b/lang/erlang/files/patch-Makefile.in index f3c31ac..86bb7e1 100644 --- a/lang/erlang/files/patch-Makefile.in +++ b/lang/erlang/files/patch-Makefile.in @@ -1,32 +1,21 @@ $FreeBSD$ ---- Makefile.in.orig Fri Dec 19 13:55:58 2003 -+++ Makefile.in Sat Jun 26 20:25:23 2004 -@@ -534,14 +534,20 @@ +--- Makefile.in.orig Tue Sep 14 13:46:54 2004 ++++ Makefile.in Thu Oct 7 14:36:38 2004 +@@ -528,14 +528,9 @@ # Erlang base public files # install.bin: - rm -f $(BINDIR)/erl $(BINDIR)/erlc \ - $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -+ rm -f $(BINDIR)/erl $(BINDIR)/erlc $(BINDIR)/run_erl \ -+ $(BINDIR)/to_erl $(BINDIR)/beam_evm $(BINDIR)/ear \ -+ $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/erlexec \ -+ $(BINDIR)/escript ++ rm -f $(BINDIR)/erl $(BINDIR)/erlc ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc - ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc - ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink - ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear - ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript -+ ${LN_S} $(ERLANG_BINDIR)/run_erl $(BINDIR)/run_erl -+ ${LN_S} $(ERLANG_BINDIR)/to_erl $(BINDIR)/to_erl -+ ${LN_S} $(ERLANG_ERTSBINDIR)/beam_evm $(BINDIR)/beam_evm -+ ${LN_S} $(ERLANG_ERTSBINDIR)/ear $(BINDIR)/ear -+ ${LN_S} $(ERLANG_ERTSBINDIR)/ecc $(BINDIR)/ecc -+ ${LN_S} $(ERLANG_ERTSBINDIR)/elink $(BINDIR)/elink -+ ${LN_S} $(ERLANG_ERTSBINDIR)/erlexec $(BINDIR)/erlexec -+ ${LN_S} $(ERLANG_ERTSBINDIR)/escript $(BINDIR)/escript # # Directories needed before we can install diff --git a/lang/erlang/files/patch-aj b/lang/erlang/files/patch-aj index 6b8104c..c3b2f87 100644 --- a/lang/erlang/files/patch-aj +++ b/lang/erlang/files/patch-aj @@ -1,19 +1,9 @@ $FreeBSD$ ---- erts/etc/unix/Install.src.orig Wed Mar 5 17:20:07 2003 -+++ erts/etc/unix/Install.src Wed Mar 5 17:21:04 2003 -@@ -119,7 +119,8 @@ - sed -e "s;%EMU%;%EMULATOR%%EMULATOR_NUMBER%;" $ERL_ROOT/erts-%I_VSN%/bin/start_erl.src > start_erl - chmod 755 start_erl - --if [ -d $ERL_ROOT/lib/sasl* ] -+set $ERL_ROOT/lib/sasl* -+if [ -d $1 ] - then - (cd $ERL_ROOT/releases - echo %I_VSN% %I_SYSTEM_VSN% > start_erl.data) -@@ -193,4 +194,4 @@ +--- erts/etc/unix/Install.src.orig Thu Oct 7 15:45:43 2004 ++++ erts/etc/unix/Install.src Thu Oct 7 15:45:59 2004 +@@ -157,4 +157,4 @@ ./misc/format_man_pages $ERL_ROOT fi diff --git a/lang/erlang/files/patch-erts_emulator_Makefile.in b/lang/erlang/files/patch-erts_emulator_Makefile.in deleted file mode 100644 index cae12b8..0000000 --- a/lang/erlang/files/patch-erts_emulator_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- erts/emulator/Makefile.in.orig Sat Jun 26 13:57:01 2004 -+++ erts/emulator/Makefile.in Sat Jun 26 13:57:39 2004 -@@ -220,6 +220,7 @@ - $(INSTALL_DATA) $(RELEASE_INCLUDES) $(RELSYSDIR)/src - $(INSTALL_PROGRAM) $(BINDIR)/$(EMULATOR_EXECUTABLE) $(RELSYSDIR)/bin - ifeq ($(ERLANG_OSTYPE), unix) -+ $(INSTALL_PROGRAM) $(BINDIR)/$(EMULATOR_EXECUTABLE_SAE) $(RELSYSDIR)/bin - $(INSTALL_PROGRAM) $(BINDIR)/$(EMULATOR_EXECUTABLE_ELIB) $(RELSYSDIR)/bin - $(INSTALL_PROGRAM) $(BINDIR)/$(CS_EXECUTABLE) $(RELSYSDIR)/bin - endif diff --git a/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in new file mode 100644 index 0000000..81e0ce9 --- /dev/null +++ b/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- lib/crypto/c_src/Makefile.in.orig Thu Oct 7 12:11:06 2004 ++++ lib/crypto/c_src/Makefile.in Thu Oct 7 12:11:07 2004 +@@ -121,7 +121,7 @@ + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/obj + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_PROGRAM) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj ++ $(INSTALL_DATA) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj + $(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj + $(INSTALL_PROGRAM) $(DYN_DRIVER) $(RELSYSDIR)/priv/lib + diff --git a/lang/erlang/files/patch-lib_gs_src_tool__utils.erl b/lang/erlang/files/patch-lib_gs_src_tool__utils.erl index 4f4482b..883ff33 100644 --- a/lang/erlang/files/patch-lib_gs_src_tool__utils.erl +++ b/lang/erlang/files/patch-lib_gs_src_tool__utils.erl @@ -1,8 +1,8 @@ $FreeBSD$ ---- lib/gs/src/tool_utils.erl.orig Thu Sep 4 23:01:37 2003 -+++ lib/gs/src/tool_utils.erl Fri Sep 5 00:16:20 2003 +--- lib/gs/src/tool_utils.erl.orig Tue Oct 12 22:14:23 2004 ++++ lib/gs/src/tool_utils.erl Tue Oct 12 22:17:17 2004 @@ -27,6 +27,9 @@ -export([file_dialog/1]). -export([notify/2, confirm/2, confirm_yesno/2, request/2]). @@ -13,29 +13,31 @@ $FreeBSD$ %%---------------------------------------------------------------------- %% open_help(GS, File) %% GS = gsobj() (GS root object returned by gs:start/0,1) -@@ -51,7 +54,7 @@ - local -> - Cmd = case os:type() of +@@ -65,7 +68,8 @@ + local -> + case os:type() of {unix,_AnyType} -> - "netscape -remote \"openURL(file:" ++ File ++ ")\""; + unix_url_command("file:" ++ File); - ++ {win32,_AnyType} -> - "start " ++ filename:nativename(File) -@@ -62,7 +65,7 @@ - remote -> - Cmd = case os:type() of + "start " ++ filename:nativename(File); + +@@ -77,7 +81,7 @@ + remote -> + case os:type() of {unix,_AnyType} -> - "netscape -remote \"openURL(" ++ File ++ ")\""; -+ unix_url_command(File); ++ unix_url_command("file:" ++ File); {win32,_AnyType} -> - "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/") -@@ -307,3 +310,54 @@ + "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/"); +@@ -337,3 +341,54 @@ [Last]; insert_newlines(Other) -> Other. + ++ +%% find_browser(BrowserList) => string() | false +%% BrowserList - [string()] +%% Given a list of basenames, find the first available executable. @@ -61,28 +63,27 @@ $FreeBSD$ + Template = "BROWSER -remote \"openURL(" ++ URL ++ ")\" || BROWSER " ++ URL ++ "&", + + case os:getenv("BROWSER") of -+ false -> -+ %% look for a compatible browser -+ case find_browser(?BROWSERS) of -+ false -> -+ ""; -+ Browser -> -+ case regexp:gsub(Template, "BROWSER", Browser) of -+ {ok, Command, 0} -> -+ %% Template does not contain "BROWSER" placeholder -+ ""; -+ {ok, Command, _} -> -+ Command -+ end -+ end; ++ false -> ++ %% look for a compatible browser ++ case find_browser(?BROWSERS) of ++ false -> ++ ""; ++ Browser -> ++ case regexp:gsub(Template, "BROWSER", Browser) of ++ {ok, Command, 0} -> ++ %% Template does not contain "BROWSER" placeholder ++ ""; ++ {ok, Command, _} -> ++ Command ++ end ++ end; + -+ Value -> -+ case regexp:gsub(Template, "BROWSER", Value) of -+ {ok, Command2, 0} -> -+ %% no placeholder -+ ""; -+ {ok, Command2, _} -> -+ Command2 -+ end ++ Value -> ++ case regexp:gsub(Template, "BROWSER", Value) of ++ {ok, Command2, 0} -> ++ %% no placeholder ++ ""; ++ {ok, Command2, _} -> ++ Command2 ++ end + end. -+ diff --git a/lang/erlang/files/patch-lib_kernel_src_inet__config.erl b/lang/erlang/files/patch-lib_kernel_src_inet__config.erl deleted file mode 100644 index 362a217..0000000 --- a/lang/erlang/files/patch-lib_kernel_src_inet__config.erl +++ /dev/null @@ -1,19 +0,0 @@ - -$FreeBSD$ - ---- lib/kernel/src/inet_config.erl.orig Mon Jul 7 14:06:28 2003 -+++ lib/kernel/src/inet_config.erl Fri Sep 19 14:21:14 2003 -@@ -78,7 +78,12 @@ - error("can't set lookup to native: ~p", [Reason]) - end; - freebsd -> %% we may have to check version (2.2.2) -- load_resolv(filename:join(Etc,"host.conf"), host_conf_freebsd); -+ case os:version() of -+ {Major,_,_} when Major >= 5 -> -+ load_resolv(filename:join(Etc,"nsswitch.conf"), nsswitch_conf); -+ _ -> -+ load_resolv(filename:join(Etc,"host.conf"), host_conf_freebsd) -+ end; - 'bsd/os' -> - load_resolv(filename:join(Etc,"irs.conf"), host_conf_bsdos); - linux -> diff --git a/lang/erlang/files/patch-lib_ssl_src_ssl__broker.erl b/lang/erlang/files/patch-lib_ssl_src_ssl__broker.erl deleted file mode 100644 index e91c911..0000000 --- a/lang/erlang/files/patch-lib_ssl_src_ssl__broker.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/ssl/src/ssl_broker.erl.orig Thu Mar 11 17:58:12 2004 -+++ lib/ssl/src/ssl_broker.erl Thu Mar 11 18:00:07 2004 -@@ -330,6 +330,8 @@ - case gen_tcp:recv(St#st.proxysock, Length, Timeout) of - {ok, Data} -> - {reply, {ok, Data}, St}; -+ {error, timeout} -> -+ {reply, {error, timeout}, St}; - {error, Reason} -> - {reply, {error, Reason}, St#st{status = closing}} - end diff --git a/lang/erlang/files/patch-lib_stdlib_src_filelib.erl b/lang/erlang/files/patch-lib_stdlib_src_filelib.erl deleted file mode 100644 index 2b26e8e..0000000 --- a/lang/erlang/files/patch-lib_stdlib_src_filelib.erl +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- lib/stdlib/src/filelib.erl.orig Thu Mar 11 21:05:33 2004 -+++ lib/stdlib/src/filelib.erl Thu Mar 11 21:06:40 2004 -@@ -84,7 +84,10 @@ - false -> - fold_files(T, Dir, RegExp, Recursive, Fun, Acc0) - end -- end. -+ end; -+ -+fold_files([], _, _, _, _, Acc) -> -+ Acc. - - last_modified(File) -> - case file:read_file_info(File) of diff --git a/lang/erlang/pkg-message b/lang/erlang/pkg-message index 1fd1cd3..1e6e061 100644 --- a/lang/erlang/pkg-message +++ b/lang/erlang/pkg-message @@ -7,7 +7,7 @@ Installation tips: You can find an emacs mode for Erlang here: - ${LOCALBASE}/lib/erlang/lib/tools-2.3/emacs + ${LOCALBASE}/lib/erlang/lib/tools-2.4/emacs You may wish to add the following line to /etc/manpath.config: diff --git a/lang/erlang/pkg-plist b/lang/erlang/pkg-plist index 49046c4..022066e 100644 --- a/lang/erlang/pkg-plist +++ b/lang/erlang/pkg-plist @@ -1,14 +1,6 @@ -bin/beam_evm -bin/ear -bin/ecc -bin/elink bin/erl bin/erl_call bin/erlc -bin/erlexec -bin/escript -bin/run_erl -bin/to_erl @comment Insert PLIST.lib-erlang here @comment -=[ begin PLIST.lib-erlang ]=- @comment -=[ end PLIST.lib-erlang ]=- diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index 56755c4..156b2f4 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -6,15 +6,16 @@ # PORTNAME= erlang -PORTVERSION= r9c2 -PORTREVISION= 1 +PORTVERSION= r10b2 PORTEPOCH= 1 CATEGORIES= lang parallel -MASTER_SITES= ftp://ftp.erlang.org/pub/download/ \ +MASTER_SITES= http://www.erlang.org/download/ \ + ftp://ftp.erlang.org/pub/download/ \ http://www.erlang.org/download/ \ http://erlang.stacken.kth.se/download/ \ http://www.csd.uu.se/ftp/mirror/erlang/download/ -DISTNAME= otp_src_R9C-2 +DISTNAME= otp_src_R10B-2 + DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS} DIST_SUBDIR= erlang EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -30,9 +31,9 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 JAVABINDIR?= ${LOCALBASE}/jdk1.4.2/bin JAVAPORT?= ${JAVABINDIR}/javac:${PORTSDIR}/java/jdk14 -ERLANG_MAN= otp_man_R9C-2.tar.gz +ERLANG_MAN= otp_doc_man_R10B-2.tar.gz .if !defined(NOPORTDOCS) -ERLANG_DOCS= otp_html_R9C-2.tar.gz +ERLANG_DOCS= otp_doc_html_R10B-2.tar.gz .endif USE_GMAKE= yes @@ -104,13 +105,13 @@ pre-configure: # rest, not in share/doc/erlang as it should, because of relative # links in the documentation. post-install: - @for SCRIPT in ecc elink ear escript; do \ - ${REINPLACE_CMD} -e "s@ERLANG_EARS=.*@ERLANG_EARS=${LOCALBASE}/lib/erlang/erts-${ERTS_VSN}@" ${LOCALBASE}/bin/$${SCRIPT}; \ - done - - @for SCRIPT in ecc elink; do \ - ${REINPLACE_CMD} -e "s@exec .*beam_evm@exec beam_evm@" ${LOCALBASE}/bin/$${SCRIPT}; \ - done +# @for SCRIPT in ecc elink ear escript; do \ +# ${REINPLACE_CMD} -e "s@ERLANG_EARS=.*@ERLANG_EARS=${LOCALBASE}/lib/erlang/erts-${ERTS_VSN}@" ${LOCALBASE}/bin/$${SCRIPT}; \ +# done + +# @for SCRIPT in ecc elink; do \ +# ${REINPLACE_CMD} -e "s@exec .*beam_evm@exec beam_evm@" ${LOCALBASE}/bin/$${SCRIPT}; \ +# done @${LN} -sf ${LOCALBASE}/lib/erlang/lib/erl_interface-*/bin/erl_call ${LOCALBASE}/bin/erl_call @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ diff --git a/lang/erlang14/Makefile.lib b/lang/erlang14/Makefile.lib index 367bdcd..3a9e062 100644 --- a/lang/erlang14/Makefile.lib +++ b/lang/erlang14/Makefile.lib @@ -1,43 +1,46 @@ # $FreeBSD$ -ERTS_VSN= 5.3.6.3 -OTP_LIBS= appmon-2.1.2 \ - asn1-1.4.4.2 \ - compiler-4.2.3 \ +ERTS_VSN= 5.4.3 +OTP_LIBS= appmon-2.1.3 \ + asn1-1.4.4.4 \ + compiler-4.3.2 \ cosEvent-2.1 \ cosEventDomain-1.1 \ - cosFileTransfer-1.1 \ + cosFileTransfer-1.1.2 \ cosNotification-1.1.1 \ cosProperty-1.1.1 \ cosTime-1.1 \ cosTransactions-1.2 \ - crypto-1.2 \ - debugger-2.2.2 \ - erl_interface-3.4.5 \ + crypto-1.2.2 \ + debugger-2.3.1 \ + edoc-0.6.1 \ + erl_interface-3.5 \ et-1.0 \ - eva-2.0.4 \ - gs-1.5.2 \ - ic-4.2.6 \ - inets-3.0.7 \ - jinterface-1.2.1.2 \ - kernel-2.9.6.6 \ - megaco-2.1.3 \ + gs-1.5.3 \ + hipe-3.0.1 \ + ic-4.2.7 \ + inets-4.0.1 \ + jinterface-1.3 \ + kernel-2.10.3 \ + megaco-2.1.7 \ mnemosyne-1.2.5 \ - mnesia-4.1.12 \ + mnesia-4.2 \ mnesia_session-1.1.5 \ - observer-0.9.5 \ - odbc-2.0 \ - orber-3.5.1 \ - os_mon-1.6.2 \ - otp_mibs-1.0.2 \ - parsetools-1.2 \ - pman-2.4.1 \ - runtime_tools-1.4 \ - sasl-1.10 \ - snmp-3.4.8 \ - ssl-3.0.2 \ - stdlib-1.12.8 \ - toolbar-1.1.0 \ - tools-2.3 \ - tv-2.0.5 \ - webtool-0.8.1 + observer-0.9.6 \ + odbc-2.0.2 \ + orber-3.5.3 \ + os_mon-1.7.1 \ + otp_mibs-1.0.4 \ + parsetools-1.3 \ + pman-2.5.1 \ + runtime_tools-1.5 \ + sasl-2.0 \ + snmp-4.0.4 \ + ssl-3.0.4 \ + stdlib-1.13.3 \ + syntax_tools-1.4.1 \ + toolbar-1.2 \ + tools-2.4 \ + tv-2.1.1 \ + webtool-0.8.2 \ + xmerl-1.0 diff --git a/lang/erlang14/Makefile.man b/lang/erlang14/Makefile.man index 5fec01b..f0af050 100644 --- a/lang/erlang14/Makefile.man +++ b/lang/erlang14/Makefile.man @@ -147,12 +147,6 @@ MAN3= CosEventChannelAdmin.3 \ et_viewer.3 \ etop.3 \ ets.3 \ - eva.3 \ - eva_log.3 \ - eva_log_snmp.3 \ - eva_server.3 \ - eva_snmp_adaptation.3 \ - eva_sup.3 \ file.3 \ file_sorter.3 \ filelib.3 \ @@ -171,6 +165,8 @@ MAN3= CosEventChannelAdmin.3 \ global_group.3 \ gs.3 \ heart.3 \ + http.3 \ + http_base_64.3 \ httpd.3 \ httpd_conf.3 \ httpd_core.3 \ @@ -191,11 +187,7 @@ MAN3= CosEventChannelAdmin.3 \ lists.3 \ lname.3 \ lname_component.3 \ - log.3 \ log_mf_h.3 \ - log_server.3 \ - log_snmp.3 \ - log_snmpea.3 \ make.3 \ math.3 \ megaco.3 \ @@ -243,15 +235,18 @@ MAN3= CosEventChannelAdmin.3 \ ordsets.3 \ os.3 \ os_mon.3 \ + os_mon_mib.3 \ os_sup.3 \ otp_mib.3 \ overload.3 \ + packages.3 \ pg.3 \ pg2.3 \ pman.3 \ pool.3 \ proc_lib.3 \ proplists.3 \ + qlc.3 \ queue.3 \ random.3 \ rb.3 \ @@ -266,22 +261,30 @@ MAN3= CosEventChannelAdmin.3 \ slave.3 \ snmp.3 \ snmp_community_mib.3 \ - snmp_error.3 \ - snmp_error_io.3 \ - snmp_error_report.3 \ snmp_framework_mib.3 \ snmp_generic.3 \ snmp_index.3 \ - snmp_local_db.3 \ - snmp_mgr.3 \ - snmp_mpd.3 \ snmp_notification_mib.3 \ snmp_pdus.3 \ snmp_standard_mib.3 \ - snmp_supervisor.3 \ snmp_target_mib.3 \ snmp_user_based_sm_mib.3 \ snmp_view_based_acm_mib.3 \ + snmpa.3 \ + snmpa_error.3 \ + snmpa_error_io.3 \ + snmpa_error_logger.3 \ + snmpa_error_report.3 \ + snmpa_local_db.3 \ + snmpa_mpd.3 \ + snmpa_network_interface.3 \ + snmpa_notification_filter.3 \ + snmpa_supervisor.3 \ + snmpc.3 \ + snmpm.3 \ + snmpm_mpd.3 \ + snmpm_network_interface.3 \ + snmpm_user.3 \ sofs.3 \ ssl.3 \ ssl_pkix.3 \ @@ -299,9 +302,14 @@ MAN3= CosEventChannelAdmin.3 \ webtool.3 \ win32reg.3 \ wrap_log_reader.3 \ + xmerl.3 \ + xmerl_eventp.3 \ + xmerl_scan.3 \ + xmerl_xpath.3 \ + xmerl_xs.3 \ xref.3 \ yecc.3 - + MAN4= app.4 \ appup.4 \ config.4 \ @@ -310,11 +318,10 @@ MAN4= app.4 \ script.4 MAN6= crypto.6 \ - eva.6 \ - inets.6 \ kernel.6 \ observer.6 \ runtime_tools.6 \ sasl.6 \ snmp.6 \ ssl.6 + diff --git a/lang/erlang14/distinfo b/lang/erlang14/distinfo index bcab375..08b2351 100644 --- a/lang/erlang14/distinfo +++ b/lang/erlang14/distinfo @@ -1,6 +1,6 @@ -MD5 (erlang/otp_src_R9C-2.tar.gz) = 3cdb1c58671995d6b334e0f8da414816 -SIZE (erlang/otp_src_R9C-2.tar.gz) = 8669987 -MD5 (erlang/otp_man_R9C-2.tar.gz) = 08f0459871e5bc08cc1099483f4bcc90 -SIZE (erlang/otp_man_R9C-2.tar.gz) = 572023 -MD5 (erlang/otp_html_R9C-2.tar.gz) = 532554f358059f19ea2ef691d7ee906b -SIZE (erlang/otp_html_R9C-2.tar.gz) = 4497077 +MD5 (erlang/otp_src_R10B-2.tar.gz) = 318f5e61872035290c5939c47631cd83 +SIZE (erlang/otp_src_R10B-2.tar.gz) = 9452827 +MD5 (erlang/otp_doc_man_R10B-2.tar.gz) = c073820c7e97988aa9483618fe67aaf0 +SIZE (erlang/otp_doc_man_R10B-2.tar.gz) = 591524 +MD5 (erlang/otp_doc_html_R10B-2.tar.gz) = 118a44d4d70c8900dc7c43aeaf8b8d0b +SIZE (erlang/otp_doc_html_R10B-2.tar.gz) = 4559646 diff --git a/lang/erlang14/files/patch-Makefile.in b/lang/erlang14/files/patch-Makefile.in index f3c31ac..86bb7e1 100644 --- a/lang/erlang14/files/patch-Makefile.in +++ b/lang/erlang14/files/patch-Makefile.in @@ -1,32 +1,21 @@ $FreeBSD$ ---- Makefile.in.orig Fri Dec 19 13:55:58 2003 -+++ Makefile.in Sat Jun 26 20:25:23 2004 -@@ -534,14 +534,20 @@ +--- Makefile.in.orig Tue Sep 14 13:46:54 2004 ++++ Makefile.in Thu Oct 7 14:36:38 2004 +@@ -528,14 +528,9 @@ # Erlang base public files # install.bin: - rm -f $(BINDIR)/erl $(BINDIR)/erlc \ - $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript -+ rm -f $(BINDIR)/erl $(BINDIR)/erlc $(BINDIR)/run_erl \ -+ $(BINDIR)/to_erl $(BINDIR)/beam_evm $(BINDIR)/ear \ -+ $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/erlexec \ -+ $(BINDIR)/escript ++ rm -f $(BINDIR)/erl $(BINDIR)/erlc ${LN_S} $(ERLANG_BINDIR)/erl $(BINDIR)/erl ${LN_S} $(ERLANG_BINDIR)/erlc $(BINDIR)/erlc - ${LN_S} $(ERLANG_BINDIR)/ecc $(BINDIR)/ecc - ${LN_S} $(ERLANG_BINDIR)/elink $(BINDIR)/elink - ${LN_S} $(ERLANG_BINDIR)/ear $(BINDIR)/ear - ${LN_S} $(ERLANG_BINDIR)/escript $(BINDIR)/escript -+ ${LN_S} $(ERLANG_BINDIR)/run_erl $(BINDIR)/run_erl -+ ${LN_S} $(ERLANG_BINDIR)/to_erl $(BINDIR)/to_erl -+ ${LN_S} $(ERLANG_ERTSBINDIR)/beam_evm $(BINDIR)/beam_evm -+ ${LN_S} $(ERLANG_ERTSBINDIR)/ear $(BINDIR)/ear -+ ${LN_S} $(ERLANG_ERTSBINDIR)/ecc $(BINDIR)/ecc -+ ${LN_S} $(ERLANG_ERTSBINDIR)/elink $(BINDIR)/elink -+ ${LN_S} $(ERLANG_ERTSBINDIR)/erlexec $(BINDIR)/erlexec -+ ${LN_S} $(ERLANG_ERTSBINDIR)/escript $(BINDIR)/escript # # Directories needed before we can install diff --git a/lang/erlang14/files/patch-aj b/lang/erlang14/files/patch-aj index 6b8104c..c3b2f87 100644 --- a/lang/erlang14/files/patch-aj +++ b/lang/erlang14/files/patch-aj @@ -1,19 +1,9 @@ $FreeBSD$ ---- erts/etc/unix/Install.src.orig Wed Mar 5 17:20:07 2003 -+++ erts/etc/unix/Install.src Wed Mar 5 17:21:04 2003 -@@ -119,7 +119,8 @@ - sed -e "s;%EMU%;%EMULATOR%%EMULATOR_NUMBER%;" $ERL_ROOT/erts-%I_VSN%/bin/start_erl.src > start_erl - chmod 755 start_erl - --if [ -d $ERL_ROOT/lib/sasl* ] -+set $ERL_ROOT/lib/sasl* -+if [ -d $1 ] - then - (cd $ERL_ROOT/releases - echo %I_VSN% %I_SYSTEM_VSN% > start_erl.data) -@@ -193,4 +194,4 @@ +--- erts/etc/unix/Install.src.orig Thu Oct 7 15:45:43 2004 ++++ erts/etc/unix/Install.src Thu Oct 7 15:45:59 2004 +@@ -157,4 +157,4 @@ ./misc/format_man_pages $ERL_ROOT fi diff --git a/lang/erlang14/files/patch-erts_emulator_Makefile.in b/lang/erlang14/files/patch-erts_emulator_Makefile.in deleted file mode 100644 index cae12b8..0000000 --- a/lang/erlang14/files/patch-erts_emulator_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- erts/emulator/Makefile.in.orig Sat Jun 26 13:57:01 2004 -+++ erts/emulator/Makefile.in Sat Jun 26 13:57:39 2004 -@@ -220,6 +220,7 @@ - $(INSTALL_DATA) $(RELEASE_INCLUDES) $(RELSYSDIR)/src - $(INSTALL_PROGRAM) $(BINDIR)/$(EMULATOR_EXECUTABLE) $(RELSYSDIR)/bin - ifeq ($(ERLANG_OSTYPE), unix) -+ $(INSTALL_PROGRAM) $(BINDIR)/$(EMULATOR_EXECUTABLE_SAE) $(RELSYSDIR)/bin - $(INSTALL_PROGRAM) $(BINDIR)/$(EMULATOR_EXECUTABLE_ELIB) $(RELSYSDIR)/bin - $(INSTALL_PROGRAM) $(BINDIR)/$(CS_EXECUTABLE) $(RELSYSDIR)/bin - endif diff --git a/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in new file mode 100644 index 0000000..81e0ce9 --- /dev/null +++ b/lang/erlang14/files/patch-lib_crypto_c__src_Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- lib/crypto/c_src/Makefile.in.orig Thu Oct 7 12:11:06 2004 ++++ lib/crypto/c_src/Makefile.in Thu Oct 7 12:11:07 2004 +@@ -121,7 +121,7 @@ + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/obj + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_PROGRAM) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj ++ $(INSTALL_DATA) $(DRV_MAKEFILE) $(RELSYSDIR)/priv/obj + $(INSTALL_PROGRAM) $(OBJS) $(RELSYSDIR)/priv/obj + $(INSTALL_PROGRAM) $(DYN_DRIVER) $(RELSYSDIR)/priv/lib + diff --git a/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl b/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl index 4f4482b..883ff33 100644 --- a/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl +++ b/lang/erlang14/files/patch-lib_gs_src_tool__utils.erl @@ -1,8 +1,8 @@ $FreeBSD$ ---- lib/gs/src/tool_utils.erl.orig Thu Sep 4 23:01:37 2003 -+++ lib/gs/src/tool_utils.erl Fri Sep 5 00:16:20 2003 +--- lib/gs/src/tool_utils.erl.orig Tue Oct 12 22:14:23 2004 ++++ lib/gs/src/tool_utils.erl Tue Oct 12 22:17:17 2004 @@ -27,6 +27,9 @@ -export([file_dialog/1]). -export([notify/2, confirm/2, confirm_yesno/2, request/2]). @@ -13,29 +13,31 @@ $FreeBSD$ %%---------------------------------------------------------------------- %% open_help(GS, File) %% GS = gsobj() (GS root object returned by gs:start/0,1) -@@ -51,7 +54,7 @@ - local -> - Cmd = case os:type() of +@@ -65,7 +68,8 @@ + local -> + case os:type() of {unix,_AnyType} -> - "netscape -remote \"openURL(file:" ++ File ++ ")\""; + unix_url_command("file:" ++ File); - ++ {win32,_AnyType} -> - "start " ++ filename:nativename(File) -@@ -62,7 +65,7 @@ - remote -> - Cmd = case os:type() of + "start " ++ filename:nativename(File); + +@@ -77,7 +81,7 @@ + remote -> + case os:type() of {unix,_AnyType} -> - "netscape -remote \"openURL(" ++ File ++ ")\""; -+ unix_url_command(File); ++ unix_url_command("file:" ++ File); {win32,_AnyType} -> - "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/") -@@ -307,3 +310,54 @@ + "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/"); +@@ -337,3 +341,54 @@ [Last]; insert_newlines(Other) -> Other. + ++ +%% find_browser(BrowserList) => string() | false +%% BrowserList - [string()] +%% Given a list of basenames, find the first available executable. @@ -61,28 +63,27 @@ $FreeBSD$ + Template = "BROWSER -remote \"openURL(" ++ URL ++ ")\" || BROWSER " ++ URL ++ "&", + + case os:getenv("BROWSER") of -+ false -> -+ %% look for a compatible browser -+ case find_browser(?BROWSERS) of -+ false -> -+ ""; -+ Browser -> -+ case regexp:gsub(Template, "BROWSER", Browser) of -+ {ok, Command, 0} -> -+ %% Template does not contain "BROWSER" placeholder -+ ""; -+ {ok, Command, _} -> -+ Command -+ end -+ end; ++ false -> ++ %% look for a compatible browser ++ case find_browser(?BROWSERS) of ++ false -> ++ ""; ++ Browser -> ++ case regexp:gsub(Template, "BROWSER", Browser) of ++ {ok, Command, 0} -> ++ %% Template does not contain "BROWSER" placeholder ++ ""; ++ {ok, Command, _} -> ++ Command ++ end ++ end; + -+ Value -> -+ case regexp:gsub(Template, "BROWSER", Value) of -+ {ok, Command2, 0} -> -+ %% no placeholder -+ ""; -+ {ok, Command2, _} -> -+ Command2 -+ end ++ Value -> ++ case regexp:gsub(Template, "BROWSER", Value) of ++ {ok, Command2, 0} -> ++ %% no placeholder ++ ""; ++ {ok, Command2, _} -> ++ Command2 ++ end + end. -+ diff --git a/lang/erlang14/files/patch-lib_kernel_src_inet__config.erl b/lang/erlang14/files/patch-lib_kernel_src_inet__config.erl deleted file mode 100644 index 362a217..0000000 --- a/lang/erlang14/files/patch-lib_kernel_src_inet__config.erl +++ /dev/null @@ -1,19 +0,0 @@ - -$FreeBSD$ - ---- lib/kernel/src/inet_config.erl.orig Mon Jul 7 14:06:28 2003 -+++ lib/kernel/src/inet_config.erl Fri Sep 19 14:21:14 2003 -@@ -78,7 +78,12 @@ - error("can't set lookup to native: ~p", [Reason]) - end; - freebsd -> %% we may have to check version (2.2.2) -- load_resolv(filename:join(Etc,"host.conf"), host_conf_freebsd); -+ case os:version() of -+ {Major,_,_} when Major >= 5 -> -+ load_resolv(filename:join(Etc,"nsswitch.conf"), nsswitch_conf); -+ _ -> -+ load_resolv(filename:join(Etc,"host.conf"), host_conf_freebsd) -+ end; - 'bsd/os' -> - load_resolv(filename:join(Etc,"irs.conf"), host_conf_bsdos); - linux -> diff --git a/lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl b/lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl deleted file mode 100644 index e91c911..0000000 --- a/lang/erlang14/files/patch-lib_ssl_src_ssl__broker.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/ssl/src/ssl_broker.erl.orig Thu Mar 11 17:58:12 2004 -+++ lib/ssl/src/ssl_broker.erl Thu Mar 11 18:00:07 2004 -@@ -330,6 +330,8 @@ - case gen_tcp:recv(St#st.proxysock, Length, Timeout) of - {ok, Data} -> - {reply, {ok, Data}, St}; -+ {error, timeout} -> -+ {reply, {error, timeout}, St}; - {error, Reason} -> - {reply, {error, Reason}, St#st{status = closing}} - end diff --git a/lang/erlang14/files/patch-lib_stdlib_src_filelib.erl b/lang/erlang14/files/patch-lib_stdlib_src_filelib.erl deleted file mode 100644 index 2b26e8e..0000000 --- a/lang/erlang14/files/patch-lib_stdlib_src_filelib.erl +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- lib/stdlib/src/filelib.erl.orig Thu Mar 11 21:05:33 2004 -+++ lib/stdlib/src/filelib.erl Thu Mar 11 21:06:40 2004 -@@ -84,7 +84,10 @@ - false -> - fold_files(T, Dir, RegExp, Recursive, Fun, Acc0) - end -- end. -+ end; -+ -+fold_files([], _, _, _, _, Acc) -> -+ Acc. - - last_modified(File) -> - case file:read_file_info(File) of diff --git a/lang/erlang14/pkg-message b/lang/erlang14/pkg-message index 1fd1cd3..1e6e061 100644 --- a/lang/erlang14/pkg-message +++ b/lang/erlang14/pkg-message @@ -7,7 +7,7 @@ Installation tips: You can find an emacs mode for Erlang here: - ${LOCALBASE}/lib/erlang/lib/tools-2.3/emacs + ${LOCALBASE}/lib/erlang/lib/tools-2.4/emacs You may wish to add the following line to /etc/manpath.config: diff --git a/lang/erlang14/pkg-plist b/lang/erlang14/pkg-plist index 49046c4..022066e 100644 --- a/lang/erlang14/pkg-plist +++ b/lang/erlang14/pkg-plist @@ -1,14 +1,6 @@ -bin/beam_evm -bin/ear -bin/ecc -bin/elink bin/erl bin/erl_call bin/erlc -bin/erlexec -bin/escript -bin/run_erl -bin/to_erl @comment Insert PLIST.lib-erlang here @comment -=[ begin PLIST.lib-erlang ]=- @comment -=[ end PLIST.lib-erlang ]=- |
