From owner-freebsd-ports Mon Jul 2 13:40:19 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 51B8A37B409 for ; Mon, 2 Jul 2001 13:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.3/8.11.3) id f62Ke1o26498; Mon, 2 Jul 2001 13:40:01 -0700 (PDT) (envelope-from gnats) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E6BDF37B403 for ; Mon, 2 Jul 2001 13:37:03 -0700 (PDT) (envelope-from nobody@FreeBSD.org) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.3/8.11.3) id f62Kb3p26173; Mon, 2 Jul 2001 13:37:03 -0700 (PDT) (envelope-from nobody) Message-Id: <200107022037.f62Kb3p26173@freefall.freebsd.org> Date: Mon, 2 Jul 2001 13:37:03 -0700 (PDT) From: KATO Tsuguru To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/28646: Update port: cad/xcircuit to 2.3.3 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 28646 >Category: ports >Synopsis: Update port: cad/xcircuit to 2.3.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 02 13:40:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.3-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.3.3 >How-To-Repeat: >Fix: diff -urN /usr/ports/cad/xcircuit/Makefile cad/xcircuit/Makefile --- /usr/ports/cad/xcircuit/Makefile Wed Jun 13 03:28:48 2001 +++ cad/xcircuit/Makefile Sat Jun 30 12:43:25 2001 @@ -6,7 +6,7 @@ # PORTNAME= xcircuit -PORTVERSION= 2.3 +PORTVERSION= 2.3.3 CATEGORIES= cad MASTER_SITES= http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/ diff -urN /usr/ports/cad/xcircuit/distinfo cad/xcircuit/distinfo --- /usr/ports/cad/xcircuit/distinfo Wed Jun 13 03:28:50 2001 +++ cad/xcircuit/distinfo Sat Jun 30 12:44:37 2001 @@ -1 +1 @@ -MD5 (xcircuit-2.3.tar.bz2) = accf7f6f915e304c8c0e40986e959add +MD5 (xcircuit-2.3.3.tar.bz2) = 8e9870969c55691909775ad87cdcabae diff -urN /usr/ports/cad/xcircuit/files/patch-aa cad/xcircuit/files/patch-aa --- /usr/ports/cad/xcircuit/files/patch-aa Wed Jun 13 03:28:50 2001 +++ cad/xcircuit/files/patch-aa Sat Jun 30 12:43:14 2001 @@ -1,5 +1,5 @@ -*** Imakefile.orig Wed May 16 02:27:29 2001 ---- Imakefile Sat May 26 05:53:06 2001 +*** Imakefile.orig Wed Jun 13 00:43:27 2001 +--- Imakefile Sat Jun 16 09:43:29 2001 *************** *** 28,46 **** #CCOPTIONS = -O2 @@ -14,7 +14,7 @@ #------------------------------------------------------------------------ # ! PREFIX = /usr/local - # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.0/psfiles + # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles ! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.3 ! XCIRCUIT_BIN_DIR = $(PREFIX)/bin ! XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1 @@ -35,7 +35,7 @@ #------------------------------------------------------------------------ # ! #PREFIX = /usr/local - # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.0/psfiles + # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles ! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit ! XCIRCUIT_BIN_DIR = $(BINDIR) ! XCIRCUIT_MAN_DIR = $(MANDIR) @@ -55,24 +55,24 @@ # Support for background rendering through ghostscript. Change this # to the path where gs can be found. # GS_EXEC= /usr/local/src/gs5.50/obj/gs -! GS_EXEC= ${LOCALBASE}/bin/gs +! GS_EXEC=${LOCALBASE}/bin/gs #------------------------------------------------------------------------ # Window manager bug workaround---If you don't like xcircuit grabbing kbd *************** -*** 85,91 **** - #------------------------------------------------------------------------ - # Support for embedded Python interpreter (requires libpython2.0.a) +*** 86,92 **** + # Support for embedded Python interpreter + # (requires libpython${PYTHON_VERSION}.a) # ! #define HAVE_PYTHON - PYTHON_VERSION=2.0 + PYTHON_VERSION=2.1 PYTHON_LIB_DIR=/usr/local/lib ---- 86,92 ---- - #------------------------------------------------------------------------ - # Support for embedded Python interpreter (requires libpython2.0.a) +--- 87,93 ---- + # Support for embedded Python interpreter + # (requires libpython${PYTHON_VERSION}.a) # ! /* #define HAVE_PYTHON */ - PYTHON_VERSION=2.0 + PYTHON_VERSION=2.1 PYTHON_LIB_DIR=/usr/local/lib diff -urN /usr/ports/cad/xcircuit/files/patch-ab cad/xcircuit/files/patch-ab --- /usr/ports/cad/xcircuit/files/patch-ab Wed Feb 14 21:41:36 2001 +++ cad/xcircuit/files/patch-ab Sat Jun 30 12:53:09 2001 @@ -1,11 +1,11 @@ -*** xcircuit.c.orig Fri Feb 9 23:51:53 2001 ---- xcircuit.c Wed Feb 14 04:21:20 2001 +*** xcircuit.c.orig Tue Jun 26 22:34:15 2001 +--- xcircuit.c Sat Jun 30 12:53:00 2001 *************** -*** 20,25 **** ---- 20,28 ---- - #include +*** 21,26 **** +--- 21,29 ---- #include #include + #include /* for unlink() */ + #ifdef __FreeBSD__ + #include + #endif @@ -13,8 +13,8 @@ #include #include *************** -*** 1650,1655 **** ---- 1653,1662 ---- +*** 1685,1690 **** +--- 1688,1697 ---- char *argv0; /* find root of argv[0] */ short initargc = argc; /* because XtInitialize() absorbs the */ /* -schem flag and renumbers argc! (bug?) */ diff -urN /usr/ports/cad/xcircuit/pkg-plist cad/xcircuit/pkg-plist --- /usr/ports/cad/xcircuit/pkg-plist Wed Jun 13 03:28:50 2001 +++ cad/xcircuit/pkg-plist Sat Jun 30 13:11:57 2001 @@ -36,6 +36,7 @@ lib/X11/xcircuit/startup.script lib/X11/xcircuit/xcircps2.pro share/examples/xcircuit/.xcircuitrc +share/examples/xcircuit/FlareLED.ps share/examples/xcircuit/USAflag.ps share/examples/xcircuit/analog1.ps share/examples/xcircuit/analog2.ps >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message