Upgrade to 1.3.23, also known as 1.3-"end-of-life".

Changelog at
<https://sourceforge.net/project/shownotes.php?release_id=586904>.

6 files changed, 51 insertions, 57 deletions

diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index 0162346bcba6..fc86b3d8d01a 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	tora
-PORTVERSION=	1.3.22
+DISTVERSION=	1-3-end-of-life
+PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Toolkit for Oracle
 
 BUILD_DEPENDS=	${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client
-LIB_DEPENDS=	qscintilla.7:${PORTSDIR}/x11-toolkits/qscintilla
+LIB_DEPENDS=	qscintilla.7:${PORTSDIR}/x11-toolkits/qscintilla	\
+		cppunit-1.10.2:${PORTSDIR}/devel/cppunit		\
+		pcre.0:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client
 
 .if !defined(WITHOUT_MYSQL)
@@ -31,9 +34,9 @@ RUN_DEPENDS+=	${X11BASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/datab
 ORACLE_HOME?=	${LOCALBASE}/oracle8-client
 ORACLE_VER=	8i	# Client version
 
+USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:261 autoheader:261 libtool:15
 USE_QT_VER=	3
 USE_PERL5_BUILD=yes
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:U}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -49,8 +52,7 @@ PORTDOCS=	AUTHORS BUGS ChangeLog INSTALL NEWS README README.CODESTYLE\
 		README.LICENSE TODO
 INFO=		tora
 
-PREFIX2FIX=	doc/help/tora/preferences.html doc/help/preferences.texi\
-		src/toconfiguration.h
+PREFIX2FIX=	doc/help/preferences.texi src/toconfiguration.h
 
 .include <bsd.port.pre.mk>
 
@@ -59,9 +61,14 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
 CONFIGURE_ENV+=	MAKEINFO=${LOCALBASE}/bin/makeinfo
 .endif
 
+run-autotools:
+	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./autogen.sh)
+
 pre-configure:
-	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|/etc/torarc|${PREFIX}/etc/torarc|' ${PREFIX2FIX:S|^|${WRKSRC}/|}
+	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'	\
+		${WRKSRC}/config/m4/qtkde.m4
+	${REINPLACE_CMD} -e 's|/etc/torarc|${PREFIX}/etc/torarc|'	\
+		${PREFIX2FIX:S|^|${WRKSRC}/|}
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e 's|test doc|test|' ${WRKSRC}/Makefile.in
 .endif
diff --git a/databases/tora/distinfo b/databases/tora/distinfo
index d653a9bcc89a..b7efdc05eb2b 100644
--- a/databases/tora/distinfo
+++ b/databases/tora/distinfo
@@ -1,3 +1,3 @@
-MD5 (tora-1.3.22.tar.gz) = aa557896123a8bbb0db37783bddb0d0a
-SHA256 (tora-1.3.22.tar.gz) = 7a1cbcc24db8cf57612bc7ffb8dba7505a27ea0c7ac655820ceeed6f79562c88
-SIZE (tora-1.3.22.tar.gz) = 3496227
+MD5 (tora-1-3-end-of-life.tar.gz) = 0987cee9606c9428b4348d91da716678
+SHA256 (tora-1-3-end-of-life.tar.gz) = 0fb69de9402801c05752dd1b76d4d3da872c95b32eb162092d8a172337bf575f
+SIZE (tora-1-3-end-of-life.tar.gz) = 2834839
diff --git a/databases/tora/files/patch-doc_Makefile.in b/databases/tora/files/patch-doc_Makefile.am
index 2a7c72a624d6..f930bf5e834b 100644
--- a/databases/tora/files/patch-doc_Makefile.in
+++ b/databases/tora/files/patch-doc_Makefile.am
@@ -1,31 +1,28 @@
---- doc/Makefile.in.orig	Tue Sep 18 15:18:34 2007
-+++ doc/Makefile.in	Tue Sep 25 23:13:24 2007
-@@ -272,7 +272,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- EXTRA_DIST = help
+--- ./doc/Makefile.am.orig	2008-03-09 21:03:36.000000000 +0100
++++ ./doc/Makefile.am	2008-03-27 22:53:58.000000000 +0100
+@@ -3,19 +3,20 @@
+ dist-hook:
+ 	rm -rf `find $(distdir) -name .svn`
+ 
 -tora_docdir = $(DESTDIR)$(libdir)
-+tora_docdir = $(docdir)
- manualdir = $(top_builddir)/doc/help
- SUBDIRS = help
- all: all-recursive
-@@ -594,14 +594,15 @@
++tora_docdir = $(DESTDIR)$(docdir)
  
  install-data-hook:
  	rm -rf $(tora_docdir)/help
 -	cp -dpR $(top_builddir)/doc/help/tora $(tora_docdir)/help 
-+	mkdir -p $(tora_docdir)
-+	cp -R $(top_builddir)/doc/help/tora $(tora_docdir)/help
++	$(mkdir_p) $(tora_docdir)/help
++	cp -R $(top_builddir)/doc/help/tora/* $(tora_docdir)/help
  	cp $(tora_docdir)/help/index.html $(tora_docdir)/help/toc.html
 -	cp -dpR $(top_srcdir)/doc/help/images $(tora_docdir)/help
 -	cp -dpR $(top_srcdir)/doc/help/api $(tora_docdir)/help
 +	cp -R $(top_srcdir)/doc/help/images $(tora_docdir)/help
 +	cp -R $(top_srcdir)/doc/help/api $(tora_docdir)/help
  
+ manualdir = $(top_builddir)/doc/help
+ 
  all-local:
  	echo Making HTML in $(manualdir)
 -	cd $(manualdir) && make html
-+	cd $(manualdir) && $(MAKE) html
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
++	cd $(manualdir) && gmake html
+ 
+ SUBDIRS = help
diff --git a/databases/tora/files/patch-src_Makefile.am b/databases/tora/files/patch-src_Makefile.am
new file mode 100644
index 000000000000..41fa30e23930
--- /dev/null
+++ b/databases/tora/files/patch-src_Makefile.am
@@ -0,0 +1,20 @@
+--- ./src/Makefile.am.orig	2008-03-09 21:03:09.000000000 +0100
++++ ./src/Makefile.am	2008-03-27 22:11:51.000000000 +0100
+@@ -16,7 +16,7 @@
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/ext/otl -I$(LOKIDIR_INC) $(KDE_INCLUDES) $(QT_INCLUDES) $(LTDLINCL)
+ AM_CPPFLAGS += $(PCRE_CFLAGS) \
+-	-DDEFAULT_PLUGIN_DIR=\"$(libdir)\" \
++	-DDEFAULT_PLUGIN_DIR=\"$(docdir)\" \
+ 	-DTOVERSION=\"$(PACKAGE_VERSION)\" \
+ 	$(ORACLE_CXXFLAGS) \
+ 	$(QSCINTILLA_CXXFLAGS)
+@@ -42,7 +42,7 @@
+ # fix for annoying automake naming problems.
+ tora_CXXFLAGS  = $(AM_CXXFLAGS)
+ 
+-tora_LDADD = $(ORACLE_LIBS) $(@TORA_LINK_OTHERS@)
++tora_LDADD = $(ORACLE_LIBS) $(@TORA_LINK_OTHERS@) $(LIBCOMPAT)
+ 
+ if HAVE_ORACLE
+ EXTRA_ORACLE_MONO_SOURCE = tooracleconnection.cpp \
diff --git a/databases/tora/files/patch-src_Makefile.in b/databases/tora/files/patch-src_Makefile.in
deleted file mode 100644
index b95f1f4792e9..000000000000
--- a/databases/tora/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./src/Makefile.in.orig	Tue Sep 18 15:18:36 2007
-+++ ./src/Makefile.in	Wed Sep 26 21:04:51 2007
-@@ -617,7 +617,7 @@
- KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
- KDE_MT_LIBS = @KDE_MT_LIBS@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = -v @LDFLAGS@
- LIBCOMPAT = @LIBCOMPAT@
- LIBCRYPT = @LIBCRYPT@
- LIBDL = @LIBDL@
-@@ -785,7 +785,7 @@
- LOKIDIR_SRC = $(top_srcdir)/ext/loki/loki-0.1.6/src
- AM_CPPFLAGS = -I$(top_srcdir)/ext/otl -I$(LOKIDIR_INC) $(KDE_INCLUDES) \
- 	$(QT_INCLUDES) $(LTDLINCL) $(PCRE_CFLAGS) \
--	-DDEFAULT_PLUGIN_DIR=\"$(libdir)\" \
-+	-DDEFAULT_PLUGIN_DIR=\"$(docdir)\" \
- 	-DTOVERSION=\"$(PACKAGE_VERSION)\" $(ORACLE_CXXFLAGS) \
- 	$(QSCINTILLA_CXXFLAGS)
- AM_LDFLAGS = $(PCRE_LIBS) \
-@@ -809,7 +809,7 @@
- 
- # fix for annoying automake naming problems.
- tora_CXXFLAGS = $(AM_CXXFLAGS)
--tora_LDADD = $(ORACLE_LIBS) $(@TORA_LINK_OTHERS@)
-+tora_LDADD = $(ORACLE_LIBS) $(@TORA_LINK_OTHERS@) $(LIBCOMPAT)
- @HAVE_ORACLE_TRUE@EXTRA_ORACLE_MONO_SOURCE = tooracleconnection.cpp \
- @HAVE_ORACLE_TRUE@	tooracleextract.cpp \
- @HAVE_ORACLE_TRUE@	tooraclesettingui.cpp tooraclesettingui.h
diff --git a/databases/tora/pkg-plist b/databases/tora/pkg-plist
index 0eb4a1708d78..d34c7185075d 100644
--- a/databases/tora/pkg-plist
+++ b/databases/tora/pkg-plist
@@ -390,7 +390,6 @@ lib/tora_toad.qm
 %%PORTDOCS%%%%DOCSDIR%%/help/newconnection.html
 %%PORTDOCS%%%%DOCSDIR%%/help/output.html
 %%PORTDOCS%%%%DOCSDIR%%/help/preferences.html
-%%PORTDOCS%%%%DOCSDIR%%/help/preferences.html.bak
 %%PORTDOCS%%%%DOCSDIR%%/help/rollback.html
 %%PORTDOCS%%%%DOCSDIR%%/help/script.html
 %%PORTDOCS%%%%DOCSDIR%%/help/searchreplace.html