From 05cdb31dfdf9ca1b49ae15de0e320fb06a7f3851 Mon Sep 17 00:00:00 2001 From: Ion-Mihai Tetcu Date: Sat, 17 Jun 2006 11:15:43 +0000 Subject: [PATCH] - unquote IGNORE - install .la files and bump PORTVERSION for plist change PR: ports/99020 Submitted by: maintainer --- databases/db3/Makefile | 5 ++--- databases/db3/files/patch-dist::Makefile.in | 6 ++---- databases/db3/pkg-plist | 3 +++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/databases/db3/Makefile b/databases/db3/Makefile index 19bddf7b9173..656d1341cccb 100644 --- a/databases/db3/Makefile +++ b/databases/db3/Makefile @@ -7,7 +7,7 @@ PORTNAME= db3 PORTVERSION= 3.3.11 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH?= 1 CATEGORIES= databases MASTER_SITES= http://downloads.sleepycat.com/ @@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --enable-tcl --with-tcl=${LOCALBASE}/lib/tcl${WITH_TCL_VER} LIB_DEPENDS+= tcl${WITH_TCL_VER:S/.//}.1:${PORTSDIR}/lang/tcl${WITH_TCL_VER:S/.//} PLIST_SUB+= WITHTCL="" .else -IGNORE= "WITH_TCL_VER must be 8.4 or 8.3" +IGNORE= WITH_TCL_VER must be 8.4 or 8.3 .endif .else PLIST_SUB+= WITHTCL="@comment " @@ -64,7 +64,6 @@ post-configure: .endif post-install: - ${RM} -f ${PREFIX}/lib/libdb_tcl-3.3.la .if !defined(NOPORTDOCS) ${RMDIR} ${DOCSDIR}/ref/splash .endif diff --git a/databases/db3/files/patch-dist::Makefile.in b/databases/db3/files/patch-dist::Makefile.in index b732e73e711a..75c0110084b3 100644 --- a/databases/db3/files/patch-dist::Makefile.in +++ b/databases/db3/files/patch-dist::Makefile.in @@ -114,7 +114,7 @@ $(CCLINK) -o $@ $(LDFLAGS) \ db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ -@@ -401,10 +401,9 @@ +@@ -401,10 +401,8 @@ @cd $(libdir) && $(rm) -f \ $(libso) $(libso_target) $(libso_default) $(libso_major) @$(INSTALLER) $(libso_target) $(libdir) @@ -122,19 +122,17 @@ - @cd $(libdir) && $(ln) -s $(libso) $(libso_major) @$(LIBTOOL) --mode=finish $(libdir) - @cd $(libdir) && $(chmod) $(fmode) $(libso) $(libso_target) -+ @$(rm) -f $(libdir)/$(libso_target) + @cd $(libdir) && $(chmod) $(fmode) $(libso) install_static_cxx: @echo "Installing DB C++ static library: $(libdir) ..." -@@ -421,9 +420,8 @@ +@@ -421,9 +419,7 @@ @cd $(libdir) && $(rm) -f \ $(libxso) $(libxso_target) $(libxso_default) $(libxso_major) @$(INSTALLER) $(libxso_target) $(libdir) - @cd $(libdir) && $(ln) -s $(libxso) $(libxso_default) - @cd $(libdir) && $(ln) -s $(libxso) $(libxso_major) - @cd $(libdir) && $(chmod) $(fmode) $(libxso) $(libxso_target) -+ @$(rm) -f $(libdir)/$(libxso_target) + @cd $(libdir) && $(chmod) $(fmode) $(libxso) install_tcl: diff --git a/databases/db3/pkg-plist b/databases/db3/pkg-plist index 210cebd9fc24..884761a50242 100644 --- a/databases/db3/pkg-plist +++ b/databases/db3/pkg-plist @@ -15,12 +15,15 @@ include/db3/db.h include/db3/db_185.h include/db3/db_cxx.h lib/libdb3.a +lib/libdb3.la lib/libdb3.so lib/libdb3.so.3 lib/libdb3_cxx.a +lib/libdb3_cxx.la lib/libdb3_cxx.so lib/libdb3_cxx.so.3 %%WITHTCL%%lib/libdb_tcl-3.3.a +%%WITHTCL%%lib/libdb_tcl-3.3.la %%WITHTCL%%lib/libdb_tcl-3.3.so %%WITHTCL%%lib/libdb_tcl-3.3.so.3 %%WITHTCL%%lib/libdb_tcl.so