Dun't include the bundled dnspython, which causes conflicts. Use

net/py-dnspython instead (as a run-dependency).

Drop bogus build-dependency on net/py-dns.

Remvove USE_GROFF=Yes.

With and ok Amit Kulkarni (maintainer)
This commit is contained in:
kili 2011-10-01 20:14:46 +00:00
parent 4dd01b2023
commit 143758b5a0
3 changed files with 30 additions and 94 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.35 2011/09/16 12:00:07 espie Exp $
# $OpenBSD: Makefile,v 1.36 2011/10/01 20:14:46 kili Exp $
COMMENT= checks HTML documents for broken links
MODPY_EGG_VERSION=7.1
DISTNAME= LinkChecker-${MODPY_EGG_VERSION}
REVISION= 0
REVISION= 1
PKGNAME= ${DISTNAME:L}
CATEGORIES= www
@ -25,11 +25,10 @@ EXTRACT_SUFX= .tar.bz2
MODULES= lang/python
MODPY_DISTUTILS_INSTALLARGS= --no-compile
USE_GROFF = Yes
WANTLIB+= ${MODPY_WANTLIB}
BUILD_DEPENDS= net/py-dns
RUN_DEPENDS= net/py-dnspython
NO_REGRESS= Yes

View File

@ -1,6 +1,6 @@
--- setup.py.orig Tue Dec 28 17:18:57 2010
+++ setup.py Tue Jan 11 16:09:20 2011
@@ -122,6 +122,7 @@ class MyInstallLib (install_lib, object):
--- setup.py.orig Mon Jul 25 21:35:36 2011
+++ setup.py Sun Aug 21 18:41:33 2011
@@ -248,6 +248,7 @@ class MyInstallLib (install_lib, object):
else:
val = getattr(cmd_obj, attr)
if attr == 'install_data':
@ -8,7 +8,7 @@
cdir = os.path.join(val, "share", "linkchecker")
data.append('config_dir = %r' % cnormpath(cdir))
elif attr == 'install_lib':
@@ -364,10 +365,16 @@ myname = "Bastian Kleineidam"
@@ -521,10 +522,16 @@ myname = "Bastian Kleineidam"
myemail = "calvin@users.sourceforge.net"
data_files = [
@ -27,7 +27,7 @@
['cgi-bin/lconline/leer.html.en',
'cgi-bin/lconline/leer.html.de',
'cgi-bin/lconline/index.html',
@@ -381,11 +388,11 @@ data_files = [
@@ -537,11 +544,11 @@ data_files = [
]
if os.name == 'posix':
@ -44,3 +44,24 @@
['config/linkchecker-completion',
'doc/examples/check_blacklist.sh',
'doc/examples/check_for_x_errors.sh',
@@ -753,9 +760,6 @@ o a (Fast)CGI web interface (requires HTTP server)
'py2app': MyPy2app,
'register': MyRegister,
},
- package_dir = {
- 'dns': 'third_party/dnspython/dns',
- },
packages = [
'linkcheck',
'linkcheck.bookmarks',
@@ -768,10 +772,6 @@ o a (Fast)CGI web interface (requires HTTP server)
'linkcheck.HtmlParser',
'linkcheck.logger',
'linkcheck.network',
- 'dns',
- 'dns.rdtypes',
- 'dns.rdtypes.ANY',
- 'dns.rdtypes.IN',
],
ext_modules = [
Extension('linkcheck.HtmlParser.htmlsax',

View File

@ -1,92 +1,8 @@
@comment $OpenBSD: PLIST,v 1.19 2011/08/17 17:13:10 landry Exp $
@comment $OpenBSD: PLIST,v 1.20 2011/10/01 20:14:46 kili Exp $
bin/linkchecker
@comment bin/linkchecker-gui
lib/python${MODPY_VERSION}/site-packages/LinkChecker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/_LinkChecker_configdata.py
lib/python${MODPY_VERSION}/site-packages/dns/
lib/python${MODPY_VERSION}/site-packages/dns/__init__.py
lib/python${MODPY_VERSION}/site-packages/dns/dnssec.py
lib/python${MODPY_VERSION}/site-packages/dns/e164.py
lib/python${MODPY_VERSION}/site-packages/dns/edns.py
lib/python${MODPY_VERSION}/site-packages/dns/entropy.py
lib/python${MODPY_VERSION}/site-packages/dns/exception.py
lib/python${MODPY_VERSION}/site-packages/dns/flags.py
lib/python${MODPY_VERSION}/site-packages/dns/hash.py
lib/python${MODPY_VERSION}/site-packages/dns/inet.py
lib/python${MODPY_VERSION}/site-packages/dns/ipv4.py
lib/python${MODPY_VERSION}/site-packages/dns/ipv6.py
lib/python${MODPY_VERSION}/site-packages/dns/message.py
lib/python${MODPY_VERSION}/site-packages/dns/name.py
lib/python${MODPY_VERSION}/site-packages/dns/namedict.py
lib/python${MODPY_VERSION}/site-packages/dns/node.py
lib/python${MODPY_VERSION}/site-packages/dns/opcode.py
lib/python${MODPY_VERSION}/site-packages/dns/query.py
lib/python${MODPY_VERSION}/site-packages/dns/rcode.py
lib/python${MODPY_VERSION}/site-packages/dns/rdata.py
lib/python${MODPY_VERSION}/site-packages/dns/rdataclass.py
lib/python${MODPY_VERSION}/site-packages/dns/rdataset.py
lib/python${MODPY_VERSION}/site-packages/dns/rdatatype.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/AFSDB.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/CERT.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/CNAME.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/DLV.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/DNAME.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/DNSKEY.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/DS.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/GPOS.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/HINFO.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/HIP.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/ISDN.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/LOC.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/MX.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NS.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NSEC.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NSEC3.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/NSEC3PARAM.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/PTR.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/RP.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/RRSIG.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/RT.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/SOA.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/SPF.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/SSHFP.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/TXT.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/X25.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/ANY/__init__.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/A.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/AAAA.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/APL.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/DHCID.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/IPSECKEY.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/KX.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/NAPTR.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/NSAP.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/NSAP_PTR.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/PX.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/SRV.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/WKS.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/IN/__init__.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/__init__.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/dsbase.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/mxbase.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/nsbase.py
lib/python${MODPY_VERSION}/site-packages/dns/rdtypes/txtbase.py
lib/python${MODPY_VERSION}/site-packages/dns/renderer.py
lib/python${MODPY_VERSION}/site-packages/dns/resolver.py
lib/python${MODPY_VERSION}/site-packages/dns/reversename.py
lib/python${MODPY_VERSION}/site-packages/dns/rrset.py
lib/python${MODPY_VERSION}/site-packages/dns/set.py
lib/python${MODPY_VERSION}/site-packages/dns/tokenizer.py
lib/python${MODPY_VERSION}/site-packages/dns/tsig.py
lib/python${MODPY_VERSION}/site-packages/dns/tsigkeyring.py
lib/python${MODPY_VERSION}/site-packages/dns/ttl.py
lib/python${MODPY_VERSION}/site-packages/dns/update.py
lib/python${MODPY_VERSION}/site-packages/dns/version.py
lib/python${MODPY_VERSION}/site-packages/dns/wiredata.py
lib/python${MODPY_VERSION}/site-packages/dns/zone.py
lib/python${MODPY_VERSION}/site-packages/linkcheck/
lib/python${MODPY_VERSION}/site-packages/linkcheck/HtmlParser/
lib/python${MODPY_VERSION}/site-packages/linkcheck/HtmlParser/__init__.py