aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--Mk/bsd.autotools.mk8
-rw-r--r--devel/Makefile2
-rw-r--r--devel/libltdl/Makefile22
-rw-r--r--devel/libltdl/pkg-descr9
-rw-r--r--devel/libltdl/pkg-plist6
-rw-r--r--devel/libltdl15/Makefile2
7 files changed, 7 insertions, 43 deletions
diff --git a/MOVED b/MOVED
index 8bf91f5d7322..5063447d4d68 100644
--- a/MOVED
+++ b/MOVED
@@ -1139,3 +1139,4 @@ net-mgmt/dhcpconf||2004-06-03|Obsolete and no longer maintained
net/samba-devel|net/samba3|2004-06-07|considered stable
chinese/mkisofs|sysutils/cdrtools-cjk|2004-06-07|replaced by a superset
chinese/cdrtools|sysutils/cdrtools-cjk|2004-06-07|replaced by a superset
+devel/libltdl|devel/libltdl15|2004-06-08|autotools cleanup
diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk
index b1e27da628af..43f7b7a09fe4 100644
--- a/Mk/bsd.autotools.mk
+++ b/Mk/bsd.autotools.mk
@@ -54,7 +54,7 @@ Autotools_Include_MAINTAINER= ade@FreeBSD.org
#---------------------------------------------------------------------------
#
# USE_LIBLTDL=yes
-# - Convenience knob to depend on the library from devel/libltdl
+# - Convenience knob to depend on the library from devel/libltdl15
#
# USE_LIBTOOL_VER=<value>
# - Port wishes to use libtool, including the configuration step
@@ -96,7 +96,7 @@ Autotools_Include_MAINTAINER= ade@FreeBSD.org
# autotools knobs
#
# - USE_LIBLTDL has been added as a convenience function to provide
-# a lib dependency on devel/libltdl, so that if the major version
+# a lib dependency on devel/libltdl15, so that if the major version
# number changes in future, only one item has to be updated
#
# - {WANT,USE}_AUTOMAKE_VER no longer automatically brings in
@@ -256,10 +256,10 @@ RUN_DEPENDS+= ${AUTOCONF_DEPENDS}
#---------------------------------------------------------------------------
# Convenience function to save people having to depend directly on
-# devel/libltdl
+# devel/libltdl15
#
.if defined(USE_LIBLTDL)
-LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl15
.endif
.if defined(USE_LIBTOOL_VER)
diff --git a/devel/Makefile b/devel/Makefile
index 7863ad423efb..caaf61195b2a 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -406,7 +406,7 @@
SUBDIR += libhoard
SUBDIR += libical
SUBDIR += libidn
- SUBDIR += libltdl
+ SUBDIR += libltdl15
SUBDIR += libmba
SUBDIR += libmcve
SUBDIR += libmimedir
diff --git a/devel/libltdl/Makefile b/devel/libltdl/Makefile
deleted file mode 100644
index ef6458e0021c..000000000000
--- a/devel/libltdl/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for: libltdl
-# Date created: 23 January 2002
-# Whom: Jeremy Norris <ishmael27x@yahoo.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= libltdl
-PORTREVISION= 0
-MASTERDIR= ${.CURDIR}/../libtool15
-
-COMMENT= System independent dlopen wrapper
-
-INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --enable-ltdl-install
-BUILD_WRKSRC= ${WRKSRC}/libltdl
-INSTALL_WRKSRC= ${WRKSRC}/libltdl
-DESCR= ${.CURDIR}/pkg-descr
-PLIST= ${.CURDIR}/pkg-plist
-LATEST_LINK= libltdl
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/libltdl/pkg-descr b/devel/libltdl/pkg-descr
deleted file mode 100644
index e57b99f21a5c..000000000000
--- a/devel/libltdl/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-This is GNU libltdl, a system independent dlopen wrapper for GNU libtool.
-
-It supports the following dlopen interfaces:
-* dlopen (Solaris, Linux and various BSD flavors)
-* shl_load (HP-UX)
-* LoadLibrary (Win16 and Win32)
-* load_add_on (BeOS)
-* GNU DLD (emulates dynamic linking for static libraries)
-* libtool's dlpreopen
diff --git a/devel/libltdl/pkg-plist b/devel/libltdl/pkg-plist
deleted file mode 100644
index 576ece3f4b07..000000000000
--- a/devel/libltdl/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/devel/libltdl/pkg-plist,v 1.1 2003-07-02 18:52:29 ade Exp $
-include/ltdl.h
-lib/libltdl.a
-lib/libltdl.la
-lib/libltdl.so
-lib/libltdl.so.4
diff --git a/devel/libltdl15/Makefile b/devel/libltdl15/Makefile
index ef6458e0021c..a61507a59d43 100644
--- a/devel/libltdl15/Makefile
+++ b/devel/libltdl15/Makefile
@@ -17,6 +17,6 @@ BUILD_WRKSRC= ${WRKSRC}/libltdl
INSTALL_WRKSRC= ${WRKSRC}/libltdl
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-LATEST_LINK= libltdl
+LATEST_LINK= libltdl15
.include "${MASTERDIR}/Makefile"