Since there are some removing old functions and some new functions.
I bump the so version to 8.0 from 7.1
And I attached the revised diff file.
wen
2011/5/11 Stuart Henderson <[email protected]>:
> On 2011-05-11, wen heping <[email protected]> wrote:
>> --0023543336ba047a3004a2fbeb72
>> Content-Type: text/plain; charset=UTF-8
>>
>> Hi,
>>
>> Here is an update of net/GeoIP to 1.4.7 and net/py-GeoIP to 1.2.5.
>>
>> Tested OK on i386 and regress test OK too(net/GeoIP).
>>
>> Comments ? OK ?
>>
>
> This version of py-GeoIP needs to depend on net/GeoIP>=1.4.7,
> depending on net/GeoIP isn't enough.
>
> You haven't checked the shared libraries in GeoIP to see if
> they need to be bumped, this needs at least a minor bump,
> I don't have time to read the diff between old and new to
> work out if it's a major bump.
>
> http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
>
>
>>
>> wen
>>
>> --0023543336ba047a3004a2fbeb72
>> Content-Type: text/plain; charset=US-ASCII; name="geoip-20110511.diff.txt"
>> Content-Disposition: attachment; filename="geoip-20110511.diff.txt"
>> X-Attachment-Id: f_gnk0g0wk0
>> Content-Transfer-Encoding: base64
>>
>> SW5kZXg6IEdlb0lQL01ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
>> PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcG9ydHMvbmV0
>> L0dlb0lQL01ha2VmaWxlLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjIyCmRpZmYgLXUgLXIxLjIy
>> IE1ha2VmaWxlCi0tLSBHZW9JUC9NYWtlZmlsZQkxOCBPY3QgMjAxMCAxODozNjo0NSAtMDAwMAkx
>> LjIyCisrKyBHZW9JUC9NYWtlZmlsZQkxMSBNYXkgMjAxMSAwODoyMzozMCAtMDAwMApAQCAtMiw3
>> ICsyLDcgQEAKIAogQ09NTUVOVD0JZmluZCB0aGUgY291bnRyeSB3aGVyZSBJUCBhZGRyZXNzL2hv
>> c3RuYW1lIG9yaWdpbmF0ZXMgZnJvbQogCi1ESVNUTkFNRT0JR2VvSVAtMS40LjYKK0RJU1ROQU1F
>> PQlHZW9JUC0xLjQuNwogU0hBUkVEX0xJQlMgKz0gIEdlb0lQCQk3LjEJIyAuNS42CiBTSEFSRURf
>> TElCUyArPSAgR2VvSVBVcGRhdGUJMS4wCSMgLjAuMAogQ0FURUdPUklFUz0JbmV0IGdlbwpAQCAt
>> MjQsNyArMjQsNyBAQAogQ09ORklHVVJFX0FSR1M9CS0tZGF0YWRpcj0vdmFyL2RiIFwKIAkJJHtD
>> T05GSUdVUkVfU0hBUkVEfQogVVNFX0xJQlRPT0w9CVllcwotVVNFX0dST0ZGID0JWWVzCisjVVNF
>> X0dST0ZGID0JWWVzCiAKIEVYQU1QTEVTRElSPQkke1BSRUZJWH0vc2hhcmUvZXhhbXBsZXMvR2Vv
>> SVAKIApJbmRleDogR2VvSVAvZGlzdGluZm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
>> PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9wb3J0
>> cy9uZXQvR2VvSVAvZGlzdGluZm8sdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTMKZGlmZiAtdSAt
>> cjEuMTMgZGlzdGluZm8KLS0tIEdlb0lQL2Rpc3RpbmZvCTggTWFyIDIwMDkgMTI6NDQ6NDUgLTAw
>> MDAJMS4xMworKysgR2VvSVAvZGlzdGluZm8JMTEgTWF5IDIwMTEgMDg6MjM6MzAgLTAwMDAKQEAg
>> LTEsNSArMSw1IEBACi1NRDUgKEdlb0lQLTEuNC42LnRhci5neikgPSB5eFN4dnV0QVl4b1NaMnNS
>> eWd3d21nPT0KLVJNRDE2MCAoR2VvSVAtMS40LjYudGFyLmd6KSA9IFp3bDhQNXhydmJvYVQzN25s
>> bkUzSU51aG13OD0KLVNIQTEgKEdlb0lQLTEuNC42LnRhci5neikgPSA1cEtWVDBSOEV5Y041NFlP
>> V0dhV21SZDIyS009Ci1TSEEyNTYgKEdlb0lQLTEuNC42LnRhci5neikgPSBGclFwUUgxN3g5ZUYw
>> YXJPYzZPUThvZk5rQ0FQRDJIMXgxZ1lCWTNza2NRPQotU0laRSAoR2VvSVAtMS40LjYudGFyLmd6
>> KSA9IDEwNDUyNDEKK01ENSAoR2VvSVAtMS40LjcudGFyLmd6KSA9IHFBSVhYVnQrSzFlMVFLZmRN
>> STJTQlE9PQorUk1EMTYwIChHZW9JUC0xLjQuNy50YXIuZ3opID0gV1hEcmZSak1YUlEycWpJRGFB
>> V3lRTnZFYlFRPQorU0hBMSAoR2VvSVAtMS40LjcudGFyLmd6KSA9IExiT21IaG5mcWc1Qk1TRjdG
>> VnBadWt2UXhjdz0KK1NIQTI1NiAoR2VvSVAtMS40LjcudGFyLmd6KSA9IEVjWGlKY0R2M2ZHQ2NS
>> SWdQQnJTRkRaWXhoQlc2cW10dExhUTcrWmFyeVk9CitTSVpFIChHZW9JUC0xLjQuNy50YXIuZ3op
>> ID0gMTA2ODc4MQpJbmRleDogcHktR2VvSVAvTWFrZWZpbGUKPT09PT09PT09PT09PT09PT09PT09
>> PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTog
>> L2N2cy9wb3J0cy9uZXQvcHktR2VvSVAvTWFrZWZpbGUsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEu
>> NgpkaWZmIC11IC1yMS42IE1ha2VmaWxlCi0tLSBweS1HZW9JUC9NYWtlZmlsZQkxOSBOb3YgMjAx
>> MCAyMjozMTozNyAtMDAwMAkxLjYKKysrIHB5LUdlb0lQL01ha2VmaWxlCTExIE1heSAyMDExIDA4
>> OjIzOjMwIC0wMDAwCkBAIC0yLDEwICsyLDkgQEAKIAogQ09NTUVOVCA9CQlHZW9JUCBQeXRob24g
>> QVBJCiAKLU1PRFBZX0VHR19WRVJTSU9OID0JMS4yLjQKK01PRFBZX0VHR19WRVJTSU9OID0JMS4y
>> LjUKIERJU1ROQU1FID0JCUdlb0lQLVB5dGhvbi0ke01PRFBZX0VHR19WRVJTSU9OfQogUEtHTkFN
>> RSA9CQlweS1HZW9JUC0ke01PRFBZX0VHR19WRVJTSU9OfQotUkVWSVNJT04gPQkJMQogQ0FURUdP
>> UklFUyA9CQluZXQKIAogSE9NRVBBR0UgPQkJaHR0cDovL3d3dy5tYXhtaW5kLmNvbS9hcHAvcHl0
>> aG9uCkluZGV4OiBweS1HZW9JUC9kaXN0aW5mbwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
>> PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Bv
>> cnRzL25ldC9weS1HZW9JUC9kaXN0aW5mbyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xLjEuMQpk
>> aWZmIC11IC1yMS4xLjEuMSBkaXN0aW5mbwotLS0gcHktR2VvSVAvZGlzdGluZm8JOCBNYXIgMjAw
>> OSAxMjo1NTo1OCAtMDAwMAkxLjEuMS4xCisrKyBweS1HZW9JUC9kaXN0aW5mbwkxMSBNYXkgMjAx
>> MSAwODoyMzozMCAtMDAwMApAQCAtMSw1ICsxLDUgQEAKLU1ENSAoR2VvSVAtUHl0aG9uLTEuMi40
>> LnRhci5neikgPSBVUGdnMkZSSGJ2cnp0Njl6UC81Q05nPT0KLVJNRDE2MCAoR2VvSVAtUHl0aG9u
>> LTEuMi40LnRhci5neikgPSBsUVMrSTdtcnhKT1lrd2R1ZG12cmNQZU1zQXM9Ci1TSEExIChHZW9J
>> UC1QeXRob24tMS4yLjQudGFyLmd6KSA9IFU5dFJ5R3ovSEFFR3k2b0NyVEs5V0pvVkMvdz0KLVNI
>> QTI1NiAoR2VvSVAtUHl0aG9uLTEuMi40LnRhci5neikgPSBCN0N6STk4MDd5RzUyekYxWDlIZCt4
>> UFBqU1hsWVFVMXZGKzhjcjY1QVUwPQotU0laRSAoR2VvSVAtUHl0aG9uLTEuMi40LnRhci5neikg
>> PSAxNDUzMAorTUQ1IChHZW9JUC1QeXRob24tMS4yLjUudGFyLmd6KSA9IDN5Ri9yL1NGU01MQ2Jv
>> UVJLU0kzNGc9PQorUk1EMTYwIChHZW9JUC1QeXRob24tMS4yLjUudGFyLmd6KSA9IEhqRS9mRkRM
>> dHZZWVEwSndSdUh5K0JMRnU4Zz0KK1NIQTEgKEdlb0lQLVB5dGhvbi0xLjIuNS50YXIuZ3opID0g
>> dTMySlFsTVpvYTVSZlp0T3JOZkNLeG44OFpVPQorU0hBMjU2IChHZW9JUC1QeXRob24tMS4yLjUu
>> dGFyLmd6KSA9IHk3OVBibVhPZjFhb2hXQXJIVVppYVZzWjhXTStSc3lZVU5pcDlxckhHcGc9CitT
>> SVpFIChHZW9JUC1QeXRob24tMS4yLjUudGFyLmd6KSA9IDE1NTk0CkluZGV4OiBweS1HZW9JUC9w
>> a2cvUExJU1QKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
>> PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9wb3J0cy9uZXQvcHktR2VvSVAvcGtn
>> L1BMSVNULHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjEuMS4xCmRpZmYgLXUgLXIxLjEuMS4xIFBM
>> SVNUCi0tLSBweS1HZW9JUC9wa2cvUExJU1QJOCBNYXIgMjAwOSAxMjo1NTo1OCAtMDAwMAkxLjEu
>> MS4xCisrKyBweS1HZW9JUC9wa2cvUExJU1QJMTEgTWF5IDIwMTEgMDg6MjM6MzAgLTAwMDAKQEAg
>> LTEsOSArMSwxMSBAQAotQGNvbW1lbnQgJE9wZW5CU0Q6IFBMSVNULHYgMS4xLjEuMSAyMDA5LzAz
>> LzA4IDEyOjU1OjU4IHN0ZXZlbiBFeHAgJAorQGNvbW1lbnQgJE9wZW5CU0QkCiBsaWIvcHl0aG9u
>> JHtNT0RQWV9WRVJTSU9OfS9zaXRlLXBhY2thZ2VzL0dlb0lQLnNvCiBsaWIvcHl0aG9uJHtNT0RQ
>> WV9WRVJTSU9OfS9zaXRlLXBhY2thZ2VzL0dlb0lQX1B5dGhvbi0ke01PRFBZX0VHR19WRVJTSU9O
>> fS1weSR7TU9EUFlfVkVSU0lPTn0uZWdnLWluZm8KIHNoYXJlL2V4YW1wbGVzL3B5LUdlb0lQLwog
>> c2hhcmUvZXhhbXBsZXMvcHktR2VvSVAvdGVzdC5weQogc2hhcmUvZXhhbXBsZXMvcHktR2VvSVAv
>> dGVzdF9jaXR5LnB5CiBzaGFyZS9leGFtcGxlcy9weS1HZW9JUC90ZXN0X2NpdHlfY2hhcnNldC5w
>> eQorc2hhcmUvZXhhbXBsZXMvcHktR2VvSVAvdGVzdF9uZXRzcGVlZC5weQogc2hhcmUvZXhhbXBs
>> ZXMvcHktR2VvSVAvdGVzdF9vcmcucHkKIHNoYXJlL2V4YW1wbGVzL3B5LUdlb0lQL3Rlc3RfcmVn
>> aW9uLnB5CitzaGFyZS9leGFtcGxlcy9weS1HZW9JUC90ZXN0X3Y2LnB5Cg==
>> --0023543336ba047a3004a2fbeb72--
>>
>>
>
>
Index: GeoIP/Makefile
===================================================================
RCS file: /cvs/ports/net/GeoIP/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- GeoIP/Makefile 18 Oct 2010 18:36:45 -0000 1.22
+++ GeoIP/Makefile 12 May 2011 12:18:33 -0000
@@ -2,8 +2,8 @@
COMMENT= find the country where IP address/hostname originates from
-DISTNAME= GeoIP-1.4.6
-SHARED_LIBS += GeoIP 7.1 # .5.6
+DISTNAME= GeoIP-1.4.7
+SHARED_LIBS += GeoIP 8.0 # .5.6
SHARED_LIBS += GeoIPUpdate 1.0 # .0.0
CATEGORIES= net geo
@@ -24,7 +24,6 @@
CONFIGURE_ARGS= --datadir=/var/db \
${CONFIGURE_SHARED}
USE_LIBTOOL= Yes
-USE_GROFF = Yes
EXAMPLESDIR= ${PREFIX}/share/examples/GeoIP
Index: GeoIP/distinfo
===================================================================
RCS file: /cvs/ports/net/GeoIP/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- GeoIP/distinfo 8 Mar 2009 12:44:45 -0000 1.13
+++ GeoIP/distinfo 12 May 2011 12:18:33 -0000
@@ -1,5 +1,5 @@
-MD5 (GeoIP-1.4.6.tar.gz) = yxSxvutAYxoSZ2sRygwwmg==
-RMD160 (GeoIP-1.4.6.tar.gz) = Zwl8P5xrvboaT37nlnE3INuhmw8=
-SHA1 (GeoIP-1.4.6.tar.gz) = 5pKVT0R8EycN54YOWGaWmRd22KM=
-SHA256 (GeoIP-1.4.6.tar.gz) = FrQpQH17x9eF0arOc6OQ8ofNkCAPD2H1x1gYBY3skcQ=
-SIZE (GeoIP-1.4.6.tar.gz) = 1045241
+MD5 (GeoIP-1.4.7.tar.gz) = qAIXXVt+K1e1QKfdMI2SBQ==
+RMD160 (GeoIP-1.4.7.tar.gz) = WXDrfRjMXRQ2qjIDaAWyQNvEbQQ=
+SHA1 (GeoIP-1.4.7.tar.gz) = LbOmHhnfqg5BMSF7FVpZukvQxcw=
+SHA256 (GeoIP-1.4.7.tar.gz) = EcXiJcDv3fGCcRIgPBrSFDZYxhBW6qmttLaQ7+ZaryY=
+SIZE (GeoIP-1.4.7.tar.gz) = 1068781
Index: py-GeoIP/Makefile
===================================================================
RCS file: /cvs/ports/net/py-GeoIP/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- py-GeoIP/Makefile 19 Nov 2010 22:31:37 -0000 1.6
+++ py-GeoIP/Makefile 12 May 2011 12:18:33 -0000
@@ -2,10 +2,9 @@
COMMENT = GeoIP Python API
-MODPY_EGG_VERSION = 1.2.4
+MODPY_EGG_VERSION = 1.2.5
DISTNAME = GeoIP-Python-${MODPY_EGG_VERSION}
PKGNAME = py-GeoIP-${MODPY_EGG_VERSION}
-REVISION = 1
CATEGORIES = net
HOMEPAGE = http://www.maxmind.com/app/python
@@ -23,7 +22,7 @@
MODULES = lang/python
LIB_DEPENDS = net/GeoIP
-WANTLIB = GeoIP>=7
+WANTLIB = GeoIP>=8
EXAMPLEDIR = ${PREFIX}/share/examples/py-GeoIP
NO_REGRESS = Yes
Index: py-GeoIP/distinfo
===================================================================
RCS file: /cvs/ports/net/py-GeoIP/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- py-GeoIP/distinfo 8 Mar 2009 12:55:58 -0000 1.1.1.1
+++ py-GeoIP/distinfo 12 May 2011 12:18:33 -0000
@@ -1,5 +1,5 @@
-MD5 (GeoIP-Python-1.2.4.tar.gz) = UPgg2FRHbvrzt69zP/5CNg==
-RMD160 (GeoIP-Python-1.2.4.tar.gz) = lQS+I7mrxJOYkwdudmvrcPeMsAs=
-SHA1 (GeoIP-Python-1.2.4.tar.gz) = U9tRyGz/HAEGy6oCrTK9WJoVC/w=
-SHA256 (GeoIP-Python-1.2.4.tar.gz) =
B7CzI9807yG52zF1X9Hd+xPPjSXlYQU1vF+8cr65AU0=
-SIZE (GeoIP-Python-1.2.4.tar.gz) = 14530
+MD5 (GeoIP-Python-1.2.5.tar.gz) = 3yF/r/SFSMLCboQRKSI34g==
+RMD160 (GeoIP-Python-1.2.5.tar.gz) = HjE/fFDLtvYYQ0JwRuHy+BLFu8g=
+SHA1 (GeoIP-Python-1.2.5.tar.gz) = u32JQlMZoa5RfZtOrNfCKxn88ZU=
+SHA256 (GeoIP-Python-1.2.5.tar.gz) =
y79PbmXOf1aohWArHUZiaVsZ8WM+RsyYUNip9qrHGpg=
+SIZE (GeoIP-Python-1.2.5.tar.gz) = 15594
Index: py-GeoIP/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/py-GeoIP/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- py-GeoIP/pkg/PLIST 8 Mar 2009 12:55:58 -0000 1.1.1.1
+++ py-GeoIP/pkg/PLIST 12 May 2011 12:18:33 -0000
@@ -1,9 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/03/08 12:55:58 steven Exp $
+@comment $OpenBSD$
lib/python${MODPY_VERSION}/site-packages/GeoIP.so
lib/python${MODPY_VERSION}/site-packages/GeoIP_Python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
share/examples/py-GeoIP/
share/examples/py-GeoIP/test.py
share/examples/py-GeoIP/test_city.py
share/examples/py-GeoIP/test_city_charset.py
+share/examples/py-GeoIP/test_netspeed.py
share/examples/py-GeoIP/test_org.py
share/examples/py-GeoIP/test_region.py
+share/examples/py-GeoIP/test_v6.py
