Greetings,
The attached diff updates cad/qrouter to the latest release.
What's new upstream
===================
Plenty of new features and bug fixing, including:
- corrected the handling of pre-routed SPECIALDEFS in the DEF file;
- enhancements to the handling of track offsets when using 1-of-N track
pitch;
- added argument to the standard_route script for "nocleanup";
- added extensions to qrouter to handle 90 degree rotations in DEF
components;
- enhanced diagnostics of routability at any specific grid position in
the design;
- made some optimizations that help with pins that are catecorner to
obstructions.
What's new in the port
======================
- updated maintainer email address;
- autoconf required version is now 2.69;
- we need to add "--with-distdir=${PREFIX}" to CONFIGURE_ARGS (due to a
recent upstream change related to distributed install) -- PLEASE
REVIEW THIS POINT CAREFULLY;
- dropped all patches used to add "#include <stdarg.h>" (no more needed
since when we jumped from 1.3.X to 1.4.Y; I noticed that only
recently, my bad);
- all other differences are trivial updates.
Lightly tested on amd64 only.
All the best
-- Alessandro De Laurenzis
[mailto:jus...@atlantide.mooo.com]
Web: http://www.atlantide.mooo.com
LinkedIn: http://it.linkedin.com/in/delaurenzis
Index: Makefile
===================================================================
RCS file: /cvs/ports/cad/qrouter/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile 12 Jul 2019 20:43:45 -0000 1.4
+++ Makefile 2 Feb 2020 14:09:01 -0000
@@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.4 2019/07/12 20:43:45 sthen Exp $
COMMENT = multi-level, over-the-cell maze router for VLSI design
-DISTNAME = qrouter-1.4.50
+DISTNAME = qrouter-1.4.74
EXTRACT_SUFX = .tgz
CATEGORIES = cad
HOMEPAGE = http://opencircuitdesign.com/qrouter/
-MAINTAINER = Alessandro De Laurenzis <jus...@atlantide.t28.net>
+MAINTAINER = Alessandro De Laurenzis <jus...@atlantide.mooo.com>
# GPLv2 only
PERMIT_PACKAGE = Yes
@@ -22,8 +22,9 @@ LIB_DEPENDS = ${MODTK_LIB_DEPENDS}
USE_GMAKE = Yes
CONFIGURE_STYLE = autoconf no-autoheader
-AUTOCONF_VERSION = 2.60
-CONFIGURE_ARGS += --with-tcl=${MODTCL_LIBDIR} \
+AUTOCONF_VERSION = 2.69
+CONFIGURE_ARGS += --with-distdir=${PREFIX} \
+ --with-tcl=${MODTCL_LIBDIR} \
--with-tk=${MODTK_LIBDIR}
# Not C99
Index: distinfo
===================================================================
RCS file: /cvs/ports/cad/qrouter/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 18 Apr 2019 05:50:55 -0000 1.3
+++ distinfo 2 Feb 2020 14:09:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (qrouter-1.4.50.tgz) = IeaHgitIXWB200tTXZWDxBoJnHdND+Z8Ty7tnFnCvkU=
-SIZE (qrouter-1.4.50.tgz) = 332280
+SHA256 (qrouter-1.4.74.tgz) = zRGHPREv9HcAMKZGtyfwHZWFUj+0csDabcq+OV9gnPQ=
+SIZE (qrouter-1.4.74.tgz) = 326751
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/cad/qrouter/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 28 Aug 2018 15:09:08 -0000 1.1.1.1
+++ patches/patch-Makefile_in 2 Feb 2020 14:09:01 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -94,7 +94,8 @@ qrouternullg$(EXEEXT): $(OBJECTS4)
+@@ -97,7 +97,8 @@ qrouternullg$(EXEEXT): $(OBJECTS4)
$(RM) qrouternullg$(EXEEXT)
$(CC) ${CFLAGS} ${CPPFLAGS} ${DEFS} ${EXTRA_DEFS} \
${SOURCES4} ${INC_SPECS} -o $@ ${LIB_SPECS_NOSTUB} \
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/cad/qrouter/patches/patch-configure_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-configure_in
--- patches/patch-configure_in 28 Aug 2018 15:09:08 -0000 1.1.1.1
+++ patches/patch-configure_in 2 Feb 2020 14:09:01 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2
Index: configure.in
--- configure.in.orig
+++ configure.in
-@@ -847,7 +847,13 @@ if test $usingTcl ; then
- CFLAGS="${CFLAGS} -l/usr/X11R6/include"
+@@ -861,7 +861,13 @@ if test $usingTcl ; then
+ CFLAGS="${CFLAGS} -L/usr/X11R6/include"
;;
- *-netbsd*|*-openbsd*)
@@ -18,7 +18,7 @@ Index: configure.in
# Not available on all versions: check for include file.
AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no)
if test "$test_ok" = yes; then
-@@ -871,7 +877,13 @@ if test $usingTcl ; then
+@@ -885,7 +891,13 @@ if test $usingTcl ; then
esac
fi
if test "$with_gnu_ld" = "yes" ; then
Index: patches/patch-maze_c
===================================================================
RCS file: patches/patch-maze_c
diff -N patches/patch-maze_c
--- patches/patch-maze_c 28 Aug 2018 15:09:08 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-maze_c,v 1.1.1.1 2018/08/28 15:09:08 bcallah Exp $
-
-Index: maze.c
---- maze.c.orig
-+++ maze.c
-@@ -11,6 +11,7 @@
-
- #include <stdio.h>
- #include <math.h>
-+#include <stdarg.h>
- #include <stdlib.h>
-
- #define MAZE
Index: patches/patch-node_c
===================================================================
RCS file: patches/patch-node_c
diff -N patches/patch-node_c
--- patches/patch-node_c 28 Aug 2018 15:09:08 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-node_c,v 1.1.1.1 2018/08/28 15:09:08 bcallah Exp $
-
-Index: node.c
---- node.c.orig
-+++ node.c
-@@ -10,6 +10,7 @@
-
- #include <stdio.h>
- #include <math.h>
-+#include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
-
Index: patches/patch-point_c
===================================================================
RCS file: patches/patch-point_c
diff -N patches/patch-point_c
--- patches/patch-point_c 28 Aug 2018 15:09:08 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-point_c,v 1.1.1.1 2018/08/28 15:09:08 bcallah Exp $
-
-Index: point.c
---- point.c.orig
-+++ point.c
-@@ -8,6 +8,7 @@
-
- #include <stdio.h>
- #include <unistd.h>
-+#include <stdarg.h>
- #include <stdlib.h>
-
- #include "qrouter.h"
Index: patches/patch-qconfig_c
===================================================================
RCS file: patches/patch-qconfig_c
diff -N patches/patch-qconfig_c
--- patches/patch-qconfig_c 28 Aug 2018 15:09:08 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-qconfig_c,v 1.1.1.1 2018/08/28 15:09:08 bcallah Exp $
-
-Index: qconfig.c
---- qconfig.c.orig
-+++ qconfig.c
-@@ -16,6 +16,7 @@
- #include <ctype.h>
- #include <stdio.h>
- #include <math.h>
-+#include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
-
Index: patches/patch-qrouter_h
===================================================================
RCS file: /cvs/ports/cad/qrouter/patches/patch-qrouter_h,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-qrouter_h
--- patches/patch-qrouter_h 28 Aug 2018 15:09:08 -0000 1.1.1.1
+++ patches/patch-qrouter_h 2 Feb 2020 14:09:01 -0000
@@ -7,8 +7,8 @@ Index: qrouter.h
#endif /* _SYS_TYPES_H */
/* Compare functions aren't defined in the Mac's standard library */
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__OpenBSD__)
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
typedef int (*__compar_fn_t)(const void*, const void*);
#endif
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/cad/qrouter/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 28 Aug 2018 15:09:08 -0000 1.1.1.1
+++ pkg/PLIST 2 Feb 2020 14:09:01 -0000
@@ -2,7 +2,7 @@
bin/qrouter
share/qrouter/
share/qrouter/console.tcl
-share/qrouter/qrouter.so
+@so share/qrouter/qrouter.so
share/qrouter/qrouter.tcl
@bin share/qrouter/qrouterexec
@bin share/qrouter/qrouternullg