From owner-freebsd-ports@FreeBSD.ORG Wed Oct 10 06:36:27 2012 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 547C9B2D for ; Wed, 10 Oct 2012 06:36:27 +0000 (UTC) (envelope-from robbak@gmail.com) Received: from mail-ia0-f182.google.com (mail-ia0-f182.google.com [209.85.210.182]) by mx1.freebsd.org (Postfix) with ESMTP id 15E838FC1A for ; Wed, 10 Oct 2012 06:36:26 +0000 (UTC) Received: by mail-ia0-f182.google.com with SMTP id k10so159010iag.13 for ; Tue, 09 Oct 2012 23:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:content-type; bh=4rbOgfwKFe5/TRmoPf6mnVaeu58gBDzm4vMl6Ovwi6g=; b=IBsd35NAWVlNFOEIlay8NVurEBFqfTqU3VR8Z7YcSonNoAeYEqB8cChoAGagCBXbqO +ri/e7J/bZssvdVAamPA+6PsiZu1mbogjM+68D+Q3RYgheT78MK/CB3Cw30f73BKBZmc 5f0icRw+3pASrjXeumEIVtQu6eBHht+AiZO0Tc9jphIYD1sGvnSuTtUrdGdnZOFMgjDH av7u1FWvbOQq4dASpvTJZ9v2cVBs/LC+Dnsl4FqcRlrym7AtqGq1/ElIKyDiCn0xEDHR r5GfyteLDS1ZMxRF7w11y+6IynuoO+8PSigoCBpgTI2tfNy0iGItD8l/ZHa/lfH6mCtT Mkuw== MIME-Version: 1.0 Received: by 10.43.84.130 with SMTP id ak2mr11820173icc.39.1349850986294; Tue, 09 Oct 2012 23:36:26 -0700 (PDT) Sender: robbak@gmail.com Received: by 10.64.63.43 with HTTP; Tue, 9 Oct 2012 23:36:26 -0700 (PDT) Date: Wed, 10 Oct 2012 16:36:26 +1000 X-Google-Sender-Auth: mzSJz3PTlr8kLvCx1ZIYvXZsIy8 Message-ID: Subject: net-p2p/bitcoin: How much of this sed script is actually required? From: Robert Backhaus To: ports@freebsd.org Content-Type: multipart/mixed; boundary=bcaec518253089ae8d04cbaeac06 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Oct 2012 06:36:27 -0000 --bcaec518253089ae8d04cbaeac06 Content-Type: text/plain; charset=ISO-8859-1 As the maintaner of this port, I'll be updating it soon, as the new version is currently in rc. I'd like to clean up this sed script applied to a makefile, but I don't know how much of it might be requred. For reference, the port builds and works with only the last one - removal of "-l dl". Are any of these things required for reasons I am not aware of? @cd ${WRKSRC}/src && ${CP} -p makefile.unix Makefile @${REINPLACE_CMD} \ -e 's|^CXXFLAGS=.*$$|CXXFLAGS += $$(DEFS)|' \ -e 's|^USE_UPNP.*$$||' \ -e 's|-l pthread|${PTHREAD_LIBS}|g' \ -e 's:-O3::' -e 's:-\(march=[A-Za-z0-9]*\)::g' \ -e 's:-l dl::' \ ${WRKSRC}/src/Makefile Also worthy of note: These changes only have an effect when this port is built as a command-line daemon. This Makefile is not used when building it as a Qt GUI (default, and most common). If there are any important items here, they could be applied to the GUI's makefile. Diff from original to processed Makefile: --- Makefile.bak 2012-10-05 12:30:57.000000000 +1000 +++ Makefile 2012-10-10 16:20:50.000000000 +1000 @@ -2,7 +2,7 @@ # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -USE_UPNP:=0 + USE_IPV6:=1 LINK:=$(CXX) @@ -51,8 +51,8 @@ LIBS+= \ -Wl,-B$(LMODE2) \ -l z \ - -l dl \ - -l pthread + \ + -pthread For reference, the original Makefile is attached. --bcaec518253089ae8d04cbaeac06 Content-Type: application/octet-stream; name="Makefile.bak" Content-Disposition: attachment; filename="Makefile.bak" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h8428yme0 IyBDb3B5cmlnaHQgKGMpIDIwMDktMjAxMCBTYXRvc2hpIE5ha2Ftb3RvCiMgRGlzdHJpYnV0ZWQg dW5kZXIgdGhlIE1JVC9YMTEgc29mdHdhcmUgbGljZW5zZSwgc2VlIHRoZSBhY2NvbXBhbnlpbmcK IyBmaWxlIENPUFlJTkcgb3IgaHR0cDovL3d3dy5vcGVuc291cmNlLm9yZy9saWNlbnNlcy9taXQt bGljZW5zZS5waHAuCgpVU0VfVVBOUDo9MApVU0VfSVBWNjo9MQoKTElOSzo9JChDWFgpCgpERUZT PS1EQk9PU1RfU1BJUklUX1RIUkVBRFNBRkUKCkRFRlMgKz0gJChhZGRwcmVmaXggLUksJChDVVJE SVIpICQoQ1VSRElSKS9vYmogJChCT09TVF9JTkNMVURFX1BBVEgpICQoQkRCX0lOQ0xVREVfUEFU SCkgJChPUEVOU1NMX0lOQ0xVREVfUEFUSCkpCkxJQlMgPSAkKGFkZHByZWZpeCAtTCwkKEJPT1NU X0xJQl9QQVRIKSAkKEJEQl9MSUJfUEFUSCkgJChPUEVOU1NMX0xJQl9QQVRIKSkKClRFU1RERUZT ID0gLURURVNUX0RBVEFfRElSPSQoYWJzcGF0aCB0ZXN0L2RhdGEpCgpMTU9ERSA9IGR5bmFtaWMK TE1PREUyID0gZHluYW1pYwppZmRlZiBTVEFUSUMKCUxNT0RFID0gc3RhdGljCglpZmVxICgke1NU QVRJQ30sIGFsbCkKCQlMTU9ERTIgPSBzdGF0aWMKCWVuZGlmCmVsc2UKCVRFU1RERUZTICs9IC1E Qk9PU1RfVEVTVF9EWU5fTElOSwplbmRpZgoKIyBmb3IgYm9vc3QgMS4zNywgYWRkIC1tdCB0byB0 aGUgYm9vc3QgbGlicmFyaWVzCkxJQlMgKz0gXAogLVdsLC1CJChMTU9ERSkgXAogICAtbCBib29z dF9zeXN0ZW0kKEJPT1NUX0xJQl9TVUZGSVgpIFwKICAgLWwgYm9vc3RfZmlsZXN5c3RlbSQoQk9P U1RfTElCX1NVRkZJWCkgXAogICAtbCBib29zdF9wcm9ncmFtX29wdGlvbnMkKEJPT1NUX0xJQl9T VUZGSVgpIFwKICAgLWwgYm9vc3RfdGhyZWFkJChCT09TVF9MSUJfU1VGRklYKSBcCiAgIC1sIGRi X2N4eCQoQkRCX0xJQl9TVUZGSVgpIFwKICAgLWwgc3NsIFwKICAgLWwgY3J5cHRvCgppZm5kZWYg VVNFX1VQTlAKCW92ZXJyaWRlIFVTRV9VUE5QID0gLQplbmRpZgppZm5lcSAoJHtVU0VfVVBOUH0s IC0pCglMSUJTICs9IC1sIG1pbml1cG5wYwoJREVGUyArPSAtRFVTRV9VUE5QPSQoVVNFX1VQTlAp CmVuZGlmCgppZm5lcSAoJHtVU0VfSVBWNn0sIC0pCglERUZTICs9IC1EVVNFX0lQVjY9JChVU0Vf SVBWNikKZW5kaWYKCkxJQlMrPSBcCiAtV2wsLUIkKExNT0RFMikgXAogICAtbCB6IFwKICAgLWwg ZGwgXAogICAtbCBwdGhyZWFkCgoKIyBIYXJkZW5pbmcKIyBNYWtlIHNvbWUgY2xhc3NlcyBvZiB2 dWxuZXJhYmlsaXRpZXMgdW5leHBsb2l0YWJsZSBpbiBjYXNlIG9uZSBpcyBkaXNjb3ZlcmVkLgoj CiAgICAjIFRoaXMgaXMgYSB3b3JrYXJvdW5kIGZvciBVYnVudHUgYnVnICM2OTE3MjIsIHRoZSBk ZWZhdWx0IC1mc3RhY2stcHJvdGVjdG9yIGNhdXNlcwogICAgIyAtZnN0YWNrLXByb3RlY3Rvci1h bGwgdG8gYmUgaWdub3JlZCB1bmxlc3MgLWZuby1zdGFjay1wcm90ZWN0b3IgaXMgdXNlZCBmaXJz dC4KICAgICMgc2VlOiBodHRwczovL2J1Z3MubGF1bmNocGFkLm5ldC91YnVudHUvK3NvdXJjZS9n Y2MtNC41LytidWcvNjkxNzIyCiAgICBIQVJERU5JTkc9LWZuby1zdGFjay1wcm90ZWN0b3IKCiAg ICAjIFN0YWNrIENhbmFyaWVzCiAgICAjIFB1dCBudW1iZXJzIGF0IHRoZSBiZWdpbm5pbmcgb2Yg ZWFjaCBzdGFjayBmcmFtZSBhbmQgY2hlY2sgdGhhdCB0aGV5IGFyZSB0aGUgc2FtZS4KICAgICMg SWYgYSBzdGFjayBidWZmZXIgaWYgb3ZlcmZsb3dlZCwgaXQgd3JpdGVzIG92ZXIgdGhlIGNhbmFy eSBudW1iZXIgYW5kIHRoZW4gb24gcmV0dXJuCiAgICAjIHdoZW4gdGhhdCBudW1iZXIgaXMgY2hl Y2tlZCwgaXQgd29uJ3QgYmUgdGhlIHNhbWUgYW5kIHRoZSBwcm9ncmFtIHdpbGwgZXhpdCB3aXRo CiAgICAjIGEgIlN0YWNrIHNtYXNoaW5nIGRldGVjdGVkIiBlcnJvciBpbnN0ZWFkIG9mIGJlaW5n IGV4cGxvaXRlZC4KICAgIEhBUkRFTklORys9LWZzdGFjay1wcm90ZWN0b3ItYWxsIC1Xc3RhY2st cHJvdGVjdG9yCgogICAgIyBNYWtlIHNvbWUgaW1wb3J0YW50IHRoaW5ncyBzdWNoIGFzIHRoZSBn bG9iYWwgb2Zmc2V0IHRhYmxlIHJlYWQgb25seSBhcyBzb29uIGFzCiAgICAjIHRoZSBkeW5hbWlj IGxpbmtlciBpcyBmaW5pc2hlZCBidWlsZGluZyBpdC4gVGhpcyB3aWxsIHByZXZlbnQgb3Zlcndy aXRpbmcgb2YgYWRkcmVzc2VzCiAgICAjIHdoaWNoIHdvdWxkIGxhdGVyIGJlIGp1bXBlZCB0by4K ICAgIExESEFSREVOSU5HKz0tV2wsLXoscmVscm8gLVdsLC16LG5vdwoKICAgICMgQnVpbGQgcG9z aXRpb24gaW5kZXBlbmRlbnQgY29kZSB0byB0YWtlIGFkdmFudGFnZSBvZiBBZGRyZXNzIFNwYWNl IExheW91dCBSYW5kb21pemF0aW9uCiAgICAjIG9mZmVyZWQgYnkgc29tZSBrZXJuZWxzLgogICAg IyBzZWUgZG9jL2J1aWxkLXVuaXgudHh0IGZvciBtb3JlIGluZm9ybWF0aW9uLgogICAgaWZkZWYg UElFCiAgICAgICAgSEFSREVOSU5HKz0tZlBJRQogICAgICAgIExESEFSREVOSU5HKz0tcGllCiAg ICBlbmRpZgoKICAgICMgLURfRk9SVElGWV9TT1VSQ0U9MiBkb2VzIHNvbWUgY2hlY2tpbmcgZm9y IHBvdGVudGlhbGx5IGV4cGxvaXRhYmxlIGNvZGUgcGF0dGVybnMgaW4KICAgICMgdGhlIHNvdXJj ZSBzdWNoIG92ZXJmbG93aW5nIGEgc3RhdGljYWxseSBkZWZpbmVkIGJ1ZmZlci4KICAgIEhBUkRF TklORys9LURfRk9SVElGWV9TT1VSQ0U9MgojCgoKREVCVUdGTEFHUz0tZwoKIyBDWFhGTEFHUyBj YW4gYmUgc3BlY2lmaWVkIG9uIHRoZSBtYWtlIGNvbW1hbmQgbGluZSwgc28gd2UgdXNlIHhDWFhG TEFHUyB0aGF0IG9ubHkKIyBhZGRzIHNvbWUgZGVmYXVsdHMgaW4gZnJvbnQuIFVuZm9ydHVuYXRl bHksIENYWEZMQUdTPS4uLiAkKENYWEZMQUdTKSBkb2VzIG5vdCB3b3JrLgp4Q1hYRkxBR1M9LU8y IC1wdGhyZWFkIC1XYWxsIC1XZXh0cmEgLVdmb3JtYXQgLVdmb3JtYXQtc2VjdXJpdHkgLVduby11 bnVzZWQtcGFyYW1ldGVyIFwKICAgICQoREVCVUdGTEFHUykgJChERUZTKSAkKEhBUkRFTklORykg JChDWFhGTEFHUykKCiMgTERGTEFHUyBjYW4gYmUgc3BlY2lmaWVkIG9uIHRoZSBtYWtlIGNvbW1h bmQgbGluZSwgc28gd2UgdXNlIHhMREZMQUdTIHRoYXQgb25seQojIGFkZHMgc29tZSBkZWZhdWx0 cyBpbiBmcm9udC4gVW5mb3J0dW5hdGVseSwgTERGTEFHUz0uLi4gJChMREZMQUdTKSBkb2VzIG5v dCB3b3JrLgp4TERGTEFHUz0kKExESEFSREVOSU5HKSAkKExERkxBR1MpCgpPQkpTPSBcCiAgICBv YmovYWxlcnQubyBcCiAgICBvYmovdmVyc2lvbi5vIFwKICAgIG9iai9jaGVja3BvaW50cy5vIFwK ICAgIG9iai9uZXRiYXNlLm8gXAogICAgb2JqL2FkZHJtYW4ubyBcCiAgICBvYmovY3J5cHRlci5v IFwKICAgIG9iai9rZXkubyBcCiAgICBvYmovZGIubyBcCiAgICBvYmovaW5pdC5vIFwKICAgIG9i ai9pcmMubyBcCiAgICBvYmova2V5c3RvcmUubyBcCiAgICBvYmovbWFpbi5vIFwKICAgIG9iai9u ZXQubyBcCiAgICBvYmovcHJvdG9jb2wubyBcCiAgICBvYmovYml0Y29pbnJwYy5vIFwKICAgIG9i ai9ycGNkdW1wLm8gXAogICAgb2JqL3JwY25ldC5vIFwKICAgIG9iai9ycGNtaW5pbmcubyBcCiAg ICBvYmovcnBjd2FsbGV0Lm8gXAogICAgb2JqL3JwY2Jsb2NrY2hhaW4ubyBcCiAgICBvYmovcnBj cmF3dHJhbnNhY3Rpb24ubyBcCiAgICBvYmovc2NyaXB0Lm8gXAogICAgb2JqL3N5bmMubyBcCiAg ICBvYmovdXRpbC5vIFwKICAgIG9iai93YWxsZXQubyBcCiAgICBvYmovd2FsbGV0ZGIubyBcCiAg ICBvYmovbm91aS5vCgoKYWxsOiBiaXRjb2luZAoKdGVzdCBjaGVjazogdGVzdF9iaXRjb2luIEZP UkNFCgkuL3Rlc3RfYml0Y29pbgoKIyBhdXRvLWdlbmVyYXRlZCBkZXBlbmRlbmNpZXM6Ci1pbmNs dWRlIG9iai8qLlAKLWluY2x1ZGUgb2JqLXRlc3QvKi5QCgpvYmovYnVpbGQuaDogRk9SQ0UKCS9i aW4vc2ggLi4vc2hhcmUvZ2VuYnVpbGQuc2ggb2JqL2J1aWxkLmgKdmVyc2lvbi5jcHA6IG9iai9i dWlsZC5oCkRFRlMgKz0gLURIQVZFX0JVSUxEX0lORk8KCm9iai8lLm86ICUuY3BwCgkkKENYWCkg LWMgJCh4Q1hYRkxBR1MpIC1NTUQgLU1GICQoQDolLm89JS5kKSAtbyAkQCAkPAoJQGNwICQoQDol Lm89JS5kKSAkKEA6JS5vPSUuUCk7IFwKCSAgc2VkIC1lICdzLyMuKi8vJyAtZSAncy9eW146XSo6 ICovLycgLWUgJ3MvICpcXCQkLy8nIFwKCSAgICAgIC1lICcvXiQkLyBkJyAtZSAncy8kJC8gOi8n IDwgJChAOiUubz0lLmQpID4+ICQoQDolLm89JS5QKTsgXAoJICBybSAtZiAkKEA6JS5vPSUuZCkK CmJpdGNvaW5kOiAkKE9CSlM6b2JqLyU9b2JqLyUpCgkkKExJTkspICQoeENYWEZMQUdTKSAtbyAk QCAkXiAkKHhMREZMQUdTKSAkKExJQlMpCgpURVNUT0JKUyA6PSAkKHBhdHN1YnN0IHRlc3QvJS5j cHAsb2JqLXRlc3QvJS5vLCQod2lsZGNhcmQgdGVzdC8qLmNwcCkpCgpvYmotdGVzdC8lLm86IHRl c3QvJS5jcHAKCSQoQ1hYKSAtYyAkKFRFU1RERUZTKSAkKHhDWFhGTEFHUykgLU1NRCAtTUYgJChA OiUubz0lLmQpIC1vICRAICQ8CglAY3AgJChAOiUubz0lLmQpICQoQDolLm89JS5QKTsgXAoJICBz ZWQgLWUgJ3MvIy4qLy8nIC1lICdzL15bXjpdKjogKi8vJyAtZSAncy8gKlxcJCQvLycgXAoJICAg ICAgLWUgJy9eJCQvIGQnIC1lICdzLyQkLyA6LycgPCAkKEA6JS5vPSUuZCkgPj4gJChAOiUubz0l LlApOyBcCgkgIHJtIC1mICQoQDolLm89JS5kKQoKdGVzdF9iaXRjb2luOiAkKFRFU1RPQkpTKSAk KGZpbHRlci1vdXQgb2JqL2luaXQubywkKE9CSlM6b2JqLyU9b2JqLyUpKQoJJChMSU5LKSAkKHhD WFhGTEFHUykgLW8gJEAgJChMSUJQQVRIUykgJF4gLVdsLC1CJChMTU9ERSkgLWxib29zdF91bml0 X3Rlc3RfZnJhbWV3b3JrICQoeExERkxBR1MpICQoTElCUykKCmNsZWFuOgoJLXJtIC1mIGJpdGNv aW5kIHRlc3RfYml0Y29pbgoJLXJtIC1mIG9iai8qLm8KCS1ybSAtZiBvYmotdGVzdC8qLm8KCS1y bSAtZiBvYmovKi5QCgktcm0gLWYgb2JqLXRlc3QvKi5QCgktcm0gLWYgb2JqL2J1aWxkLmgKCkZP UkNFOgo= --bcaec518253089ae8d04cbaeac06--