- unquote IGNORE

- install .la files and bump PORTVERSION for plist change

PR:		ports/99020
Submitted by:	maintainer
This commit is contained in:
Ion-Mihai Tetcu 2006-06-17 11:15:43 +00:00
parent bedde79b26
commit 05cdb31dfd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=165638
3 changed files with 7 additions and 7 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= db3 PORTNAME= db3
PORTVERSION= 3.3.11 PORTVERSION= 3.3.11
PORTREVISION= 2 PORTREVISION= 3
PORTEPOCH?= 1 PORTEPOCH?= 1
CATEGORIES= databases CATEGORIES= databases
MASTER_SITES= http://downloads.sleepycat.com/ 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/.//} LIB_DEPENDS+= tcl${WITH_TCL_VER:S/.//}.1:${PORTSDIR}/lang/tcl${WITH_TCL_VER:S/.//}
PLIST_SUB+= WITHTCL="" PLIST_SUB+= WITHTCL=""
.else .else
IGNORE= "WITH_TCL_VER must be 8.4 or 8.3" IGNORE= WITH_TCL_VER must be 8.4 or 8.3
.endif .endif
.else .else
PLIST_SUB+= WITHTCL="@comment " PLIST_SUB+= WITHTCL="@comment "
@ -64,7 +64,6 @@ post-configure:
.endif .endif
post-install: post-install:
${RM} -f ${PREFIX}/lib/libdb_tcl-3.3.la
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
${RMDIR} ${DOCSDIR}/ref/splash ${RMDIR} ${DOCSDIR}/ref/splash
.endif .endif

View file

@ -114,7 +114,7 @@
$(CCLINK) -o $@ $(LDFLAGS) \ $(CCLINK) -o $@ $(LDFLAGS) \
db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS) db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@ $(POSTLINK) $@
@@ -401,10 +401,9 @@ @@ -401,10 +401,8 @@
@cd $(libdir) && $(rm) -f \ @cd $(libdir) && $(rm) -f \
$(libso) $(libso_target) $(libso_default) $(libso_major) $(libso) $(libso_target) $(libso_default) $(libso_major)
@$(INSTALLER) $(libso_target) $(libdir) @$(INSTALLER) $(libso_target) $(libdir)
@ -122,19 +122,17 @@
- @cd $(libdir) && $(ln) -s $(libso) $(libso_major) - @cd $(libdir) && $(ln) -s $(libso) $(libso_major)
@$(LIBTOOL) --mode=finish $(libdir) @$(LIBTOOL) --mode=finish $(libdir)
- @cd $(libdir) && $(chmod) $(fmode) $(libso) $(libso_target) - @cd $(libdir) && $(chmod) $(fmode) $(libso) $(libso_target)
+ @$(rm) -f $(libdir)/$(libso_target)
+ @cd $(libdir) && $(chmod) $(fmode) $(libso) + @cd $(libdir) && $(chmod) $(fmode) $(libso)
install_static_cxx: install_static_cxx:
@echo "Installing DB C++ static library: $(libdir) ..." @echo "Installing DB C++ static library: $(libdir) ..."
@@ -421,9 +420,8 @@ @@ -421,9 +419,7 @@
@cd $(libdir) && $(rm) -f \ @cd $(libdir) && $(rm) -f \
$(libxso) $(libxso_target) $(libxso_default) $(libxso_major) $(libxso) $(libxso_target) $(libxso_default) $(libxso_major)
@$(INSTALLER) $(libxso_target) $(libdir) @$(INSTALLER) $(libxso_target) $(libdir)
- @cd $(libdir) && $(ln) -s $(libxso) $(libxso_default) - @cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
- @cd $(libdir) && $(ln) -s $(libxso) $(libxso_major) - @cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
- @cd $(libdir) && $(chmod) $(fmode) $(libxso) $(libxso_target) - @cd $(libdir) && $(chmod) $(fmode) $(libxso) $(libxso_target)
+ @$(rm) -f $(libdir)/$(libxso_target)
+ @cd $(libdir) && $(chmod) $(fmode) $(libxso) + @cd $(libdir) && $(chmod) $(fmode) $(libxso)
install_tcl: install_tcl:

View file

@ -15,12 +15,15 @@ include/db3/db.h
include/db3/db_185.h include/db3/db_185.h
include/db3/db_cxx.h include/db3/db_cxx.h
lib/libdb3.a lib/libdb3.a
lib/libdb3.la
lib/libdb3.so lib/libdb3.so
lib/libdb3.so.3 lib/libdb3.so.3
lib/libdb3_cxx.a lib/libdb3_cxx.a
lib/libdb3_cxx.la
lib/libdb3_cxx.so lib/libdb3_cxx.so
lib/libdb3_cxx.so.3 lib/libdb3_cxx.so.3
%%WITHTCL%%lib/libdb_tcl-3.3.a %%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
%%WITHTCL%%lib/libdb_tcl-3.3.so.3 %%WITHTCL%%lib/libdb_tcl-3.3.so.3
%%WITHTCL%%lib/libdb_tcl.so %%WITHTCL%%lib/libdb_tcl.so