Date: Thu, 20 Apr 2006 19:15:36 +0200 (CEST) From: Martin Matuska <martin@matuska.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96112: [FIX] dns/adns 1.2 Message-ID: <20060420171536.9B2DD22B62@mail.vx.sk> Resent-Message-ID: <200604201720.k3KHK9aL078282@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96112
>Category: ports
>Synopsis: [FIX] dns/adns 1.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 20 17:20:09 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 6.0-RELEASE
>Organization:
>Environment:
FreeBSD 6.0-RELEASE i386 amd64
>Description:
Fix broken compatibility in ports/96096
Depending ports use LIBDEPENDS: adns.1:${PORTSDIR}/dns/adns
${PREFIX}/lib/libadns.so.1 is REQUIRED
>How-To-Repeat:
>Fix:
diff -Nbur dns/adns.orig/Makefile dns/adns/Makefile
--- dns/adns.orig/Makefile Thu Apr 20 19:04:25 2006
+++ dns/adns/Makefile Thu Apr 20 19:07:38 2006
@@ -7,6 +7,7 @@
PORTNAME= adns
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= dns
MASTER_SITES= ftp://ftp.chiark.greenend.org.uk/users/ian/adns/ \
http://www.chiark.greenend.org.uk/~ian/adns/ftp/
@@ -18,7 +19,7 @@
INSTALLS_SHLIB= yes
USE_GMAKE= yes
-LIBVERSION= 12
+LIBVERSION= 1
PLIST_SUB+= LIBVERSION="${LIBVERSION}"
DOCS= COPYING GPL-vs-LGPL INSTALL LICENCE.WAIVERS README README.html TODO changelog
diff -Nbur dns/adns.orig/files/patch-configure dns/adns/files/patch-configure
--- dns/adns.orig/files/patch-configure Thu Apr 20 19:04:25 2006
+++ dns/adns/files/patch-configure Thu Apr 20 19:05:01 2006
@@ -1,3 +1,14 @@
+--- configure.orig Sat Oct 15 17:22:08 2005
++++ configure Thu Apr 20 13:39:55 2006
+@@ -1728,7 +1728,7 @@
+
+ SHLIBFORLINK='libadns.so'
+ SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
+-SHLIBFILE='$(SHLIBSONAME).$(MINOR)'
++SHLIBFILE='$(SHLIBSONAME)'
+
+ SHLIBCC='$(CC) $(CFLAGS) -fpic'
+ MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o'
--- configure.orig Thu Apr 20 13:27:46 2006
+++ configure Thu Apr 20 13:27:51 2006
@@ -1728,7 +1728,7 @@
diff -Nbur dns/adns.orig/files/patch-configure.in dns/adns/files/patch-configure.in
--- dns/adns.orig/files/patch-configure.in Thu Apr 20 19:04:25 2006
+++ dns/adns/files/patch-configure.in Thu Apr 20 19:05:01 2006
@@ -1,3 +1,14 @@
+--- configure.in.orig Sat Apr 8 16:36:57 2006
++++ configure.in Thu Apr 20 13:39:21 2006
+@@ -140,7 +140,7 @@
+
+ SHLIBFORLINK='libadns.so'
+ SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
+-SHLIBFILE='$(SHLIBSONAME).$(MINOR)'
++SHLIBFILE='$(SHLIBSONAME)'
+
+ SHLIBCC='$(CC) $(CFLAGS) -fpic'
+ MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o'
--- configure.in.orig Thu Apr 20 12:46:10 2006
+++ configure.in Thu Apr 20 12:56:21 2006
@@ -140,7 +140,7 @@
diff -Nbur dns/adns.orig/files/patch-dynamic::Makefile.in dns/adns/files/patch-dynamic::Makefile.in
--- dns/adns.orig/files/patch-dynamic::Makefile.in Thu Apr 20 19:04:25 2006
+++ dns/adns/files/patch-dynamic::Makefile.in Thu Apr 20 19:05:01 2006
@@ -30,3 +30,35 @@
$(SHLIBFILE): $(ALLOBJS)
rm -f $@
+--- dynamic/Makefile.in.orig Thu Apr 20 13:15:27 2006
++++ dynamic/Makefile.in Thu Apr 20 13:17:43 2006
+@@ -23,7 +23,7 @@
+ srcdir= @srcdir@
+ VPATH= @srcdir@
+
+-TARGETS= $(SHLIBFILE) $(SHLIBSONAME) $(SHLIBFORLINK)
++TARGETS= $(SHLIBFILE) $(SHLIBFORLINK)
+ include $(srcdir)/../settings.make
+ include $(srcdir)/../src/adns.make
+
+@@ -32,17 +32,13 @@
+ install:
+ mkdir -p $(lib_dir)
+ $(INSTALL_PROGRAM) $(SHLIBFILE) $(lib_dir)/$(SHLIBFILE)
+- ln -sf $(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME)
+- ln -sf $(SHLIBSONAME) $(lib_dir)/$(SHLIBFORLINK)
++ ln -sf $(SHLIBFILE) $(lib_dir)/$(SHLIBFORLINK)
+
+ uninstall:
+- rm -f $(lib_dir)/$(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME)
++ rm -f $(lib_dir)/$(SHLIBFILE)
+
+ $(SHLIBFORLINK):
+- ln -s $(SHLIBSONAME) $(SHLIBFORLINK)
+-
+-$(SHLIBSONAME):
+- ln -s $(SHLIBFILE) $(SHLIBSONAME)
++ ln -s $(SHLIBFILE) $(SHLIBFORLINK)
+
+ $(SHLIBFILE): $(ALLOBJS)
+ rm -f $@
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060420171536.9B2DD22B62>