Date: Sat, 24 May 2003 17:40:06 -0700 (PDT) From: "=?iso-8859-1?q?Pedro=20F.=20Giffuni?=" <giffunip@yahoo.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/47380: xcircuit port has old version Message-ID: <200305250040.h4P0e6Hr089947@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/47380; it has been noted by GNATS.
From: "=?iso-8859-1?q?Pedro=20F.=20Giffuni?=" <giffunip@yahoo.com>
To: freebsd-gnats-submit@FreeBSD.org
Cc:
Subject: Re: ports/47380: xcircuit port has old version
Date: Sun, 25 May 2003 01:31:52 +0100 (BST)
--0-1603039655-1053822712=:43635
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Content-Id:
Content-Disposition: inline
The patches in the "files" dir are not necessary anymore, and
the build has changed to configure, make. I also noticed that
GNU m4 doesn't seem to be necessary, but python is.
Here is a patch that updates xcircuit to 2.5.5, which is also
outdated nowadays, but at least it's better than the previous
version.
enjoy,
Pedro.
__________________________________________________
It's Samaritans' Week. Help Samaritans help others.
Call 08709 000032 to give or donate online now at http://www.samaritans.org/support/donations.shtm
--0-1603039655-1053822712=:43635
Content-Type: text/plain; name=patch-xcircuit
Content-Description: patch-xcircuit
Content-Disposition: inline; filename=patch-xcircuit
diff -ruN xcircuit.orig/Makefile xcircuit/Makefile
--- xcircuit.orig/Makefile Fri May 9 19:48:06 2003
+++ xcircuit/Makefile Sat May 24 19:03:12 2003
@@ -6,8 +6,7 @@
#
PORTNAME= xcircuit
-PORTVERSION= 2.3.3
-PORTEPOCH= 1
+PORTVERSION= 2.5.5
CATEGORIES= cad
MASTER_SITES= http://xcircuit.ece.jhu.edu/archive/
@@ -15,12 +14,11 @@
COMMENT= An X11 drawing program [especially for circuit schematics]
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu
-BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_XPM= yes
-USE_IMAKE= yes
USE_REINPLACE= yes
-XMKMF= xmkmf
+USE_PYTHON= yes
+HAS_CONFIGURE= yes
MAN1= xcircuit.1
@@ -29,8 +27,13 @@
's|<malloc.h>|<stdlib.h>|g'
post-install:
+.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/examples/xcircuit
- ${TAR} -C ${WRKSRC}/examples --exclude CVS -cf - . | \
- ${TAR} -C ${PREFIX}/share/examples/xcircuit --unlink -xf -
+ ${CP} ${WRKSRC}/examples/.xcircuitrc ${PREFIX}/share/examples/xcircuit
+ ${CP} ${WRKSRC}/examples/*.lgf ${PREFIX}/share/examples/xcircuit
+ ${CP} ${WRKSRC}/examples/*.lps ${PREFIX}/share/examples/xcircuit
+ ${CP} ${WRKSRC}/examples/*.ps ${PREFIX}/share/examples/xcircuit
+ ${CP} ${WRKSRC}/examples/*.py ${PREFIX}/share/examples/xcircuit
+.endif
.include <bsd.port.mk>
diff -ruN xcircuit.orig/distinfo xcircuit/distinfo
--- xcircuit.orig/distinfo Fri May 9 19:48:06 2003
+++ xcircuit/distinfo Sat May 24 16:50:40 2003
@@ -1 +1 @@
-MD5 (xcircuit-2.3.3.tar.gz) = 766a2d86a66c91acc67b4a361a2fe0e3
+MD5 (xcircuit-2.5.5.tar.gz) = 7ab1a89ea118bc7e88be008c22d33194
diff -ruN xcircuit.orig/files/patch-aa xcircuit/files/patch-aa
--- xcircuit.orig/files/patch-aa Sat Oct 6 10:09:38 2001
+++ xcircuit/files/patch-aa Wed Dec 31 19:00:00 1969
@@ -1,86 +0,0 @@
-*** Imakefile.orig Fri Sep 7 03:31:47 2001
---- Imakefile Fri Sep 7 03:44:46 2001
-***************
-*** 28,50 ****
- #CCOPTIONS = -O2
- #
- # for debugging purposes uncomment the following line:
-! CDEBUGFLAGS = -g
-! STD_INCLUDES = -I. -I/usr/X11R6/include/X11
-
- # The "m4" macro processor is used to generate the man page such that
- # the man page reflects the configured options.
-! M4 = m4
-
- #------------------------------------------------------------------------
- # Installation directories:
- # Change the following as desired to suit your environment:
- #------------------------------------------------------------------------
- #
-! PREFIX = /usr/local
- # 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
- XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
-
- #------------------------------------------------------------------------
---- 28,51 ----
- #CCOPTIONS = -O2
- #
- # for debugging purposes uncomment the following line:
-! # CDEBUGFLAGS = -g
-! STD_INCLUDES = -I. -I$(INCDIR)/X11
-! EXTRA_DEFINES = -DHAVE_DIRENT_H -DHAVE_PUTENV
-
- # The "m4" macro processor is used to generate the man page such that
- # the man page reflects the configured options.
-! M4 = gm4
-
- #------------------------------------------------------------------------
- # Installation directories:
- # Change the following as desired to suit your environment:
- #------------------------------------------------------------------------
- #
-! # PREFIX = /usr/local
- # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles
-! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit
-! XCIRCUIT_BIN_DIR = $(BINDIR)
-! XCIRCUIT_MAN_DIR = $(MANDIR)
- XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
-
- #------------------------------------------------------------------------
-***************
-*** 63,69 ****
- # 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= /usr/bin/gs
-
- #------------------------------------------------------------------------
- # Window manager bug workaround---If you don't like xcircuit grabbing kbd
---- 64,70 ----
- # 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
-
- #------------------------------------------------------------------------
- # Window manager bug workaround---If you don't like xcircuit grabbing kbd
-***************
-*** 91,97 ****
- # Support for embedded Python interpreter
- # (requires libpython${PYTHON_VERSION}.a)
- #
-! #define HAVE_PYTHON
-
- PYTHON_VERSION=2.1
- PYTHON_LIB_DIR=/usr/local/lib
---- 92,98 ----
- # Support for embedded Python interpreter
- # (requires libpython${PYTHON_VERSION}.a)
- #
-! /* #define HAVE_PYTHON */
-
- PYTHON_VERSION=2.1
- PYTHON_LIB_DIR=/usr/local/lib
diff -ruN xcircuit.orig/files/patch-ab xcircuit/files/patch-ab
--- xcircuit.orig/files/patch-ab Tue Jul 3 07:33:16 2001
+++ xcircuit/files/patch-ab Wed Dec 31 19:00:00 1969
@@ -1,27 +0,0 @@
-*** xcircuit.c.orig Tue Jun 26 22:34:15 2001
---- xcircuit.c Sat Jun 30 12:53:00 2001
-***************
-*** 21,26 ****
---- 21,29 ----
- #include <limits.h>
- #include <locale.h>
- #include <unistd.h> /* for unlink() */
-+ #ifdef __FreeBSD__
-+ #include <machine/floatingpoint.h>
-+ #endif
-
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
-***************
-*** 1685,1690 ****
---- 1688,1697 ----
- char *argv0; /* find root of argv[0] */
- short initargc = argc; /* because XtInitialize() absorbs the */
- /* -schem flag and renumbers argc! (bug?) */
-+
-+ #ifdef __FreeBSD__
-+ fpsetmask(0);
-+ #endif
-
- /*-----------------------------------------------------------*/
- /* Find the root of the command called from the command line */
diff -ruN xcircuit.orig/pkg-plist xcircuit/pkg-plist
--- xcircuit.orig/pkg-plist Sat Oct 6 10:09:38 2001
+++ xcircuit/pkg-plist Sat May 24 19:03:48 2003
@@ -1,61 +1,61 @@
bin/xcircuit
-lib/X11/app-defaults/XCircuit
-lib/X11/xcircuit/analog.lps
-lib/X11/xcircuit/analoglib2.lps
-lib/X11/xcircuit/app-defaults
-lib/X11/xcircuit/avlsi.lps
-lib/X11/xcircuit/digital.lps
-lib/X11/xcircuit/fonts/courier.lps
-lib/X11/xcircuit/fonts/courier.xfe
-lib/X11/xcircuit/fonts/courieriso.xfe
-lib/X11/xcircuit/fonts/courieriso2.lps
-lib/X11/xcircuit/fonts/courieriso2.xfe
-lib/X11/xcircuit/fonts/courieriso5.lps
-lib/X11/xcircuit/fonts/courieriso5.xfe
-lib/X11/xcircuit/fonts/helvetica.lps
-lib/X11/xcircuit/fonts/helvetica.xfe
-lib/X11/xcircuit/fonts/helveticaiso.xfe
-lib/X11/xcircuit/fonts/helveticaiso2.lps
-lib/X11/xcircuit/fonts/helveticaiso2.xfe
-lib/X11/xcircuit/fonts/helveticaiso5.lps
-lib/X11/xcircuit/fonts/helveticaiso5.xfe
-lib/X11/xcircuit/fonts/myfont.lps
-lib/X11/xcircuit/fonts/myfont.xfe
-lib/X11/xcircuit/fonts/symbol.lps
-lib/X11/xcircuit/fonts/symbol.xfe
-lib/X11/xcircuit/fonts/times_roman.lps
-lib/X11/xcircuit/fonts/times_roman.xfe
-lib/X11/xcircuit/fonts/times_romaniso.xfe
-lib/X11/xcircuit/fonts/times_romaniso2.lps
-lib/X11/xcircuit/fonts/times_romaniso2.xfe
-lib/X11/xcircuit/fonts/times_romaniso5.lps
-lib/X11/xcircuit/fonts/times_romaniso5.xfe
-lib/X11/xcircuit/generic.lps
-lib/X11/xcircuit/ic_templates.lps
-lib/X11/xcircuit/lgf.lps
-lib/X11/xcircuit/musiclib.lps
-lib/X11/xcircuit/signal.lps
-lib/X11/xcircuit/startup.script
-lib/X11/xcircuit/xcircps2.pro
+share/xcircuit-2.5/analog.lps
+share/xcircuit-2.5/analoglib2.lps
+share/xcircuit-2.5/app-defaults/XCircuit
+@dirrm share/xcircuit-2.5/app-defaults
+share/xcircuit-2.5/avlsi.lps
+share/xcircuit-2.5/digital.lps
+share/xcircuit-2.5/fonts/courier.lps
+share/xcircuit-2.5/fonts/courier.xfe
+share/xcircuit-2.5/fonts/courieriso.xfe
+share/xcircuit-2.5/fonts/courieriso2.lps
+share/xcircuit-2.5/fonts/courieriso2.xfe
+share/xcircuit-2.5/fonts/courieriso5.lps
+share/xcircuit-2.5/fonts/courieriso5.xfe
+share/xcircuit-2.5/fonts/helvetica.lps
+share/xcircuit-2.5/fonts/helvetica.xfe
+share/xcircuit-2.5/fonts/helveticaiso.xfe
+share/xcircuit-2.5/fonts/helveticaiso2.lps
+share/xcircuit-2.5/fonts/helveticaiso2.xfe
+share/xcircuit-2.5/fonts/helveticaiso5.lps
+share/xcircuit-2.5/fonts/helveticaiso5.xfe
+share/xcircuit-2.5/fonts/myfont.lps
+share/xcircuit-2.5/fonts/myfont.xfe
+share/xcircuit-2.5/fonts/symbol.lps
+share/xcircuit-2.5/fonts/symbol.xfe
+share/xcircuit-2.5/fonts/times_roman.lps
+share/xcircuit-2.5/fonts/times_roman.xfe
+share/xcircuit-2.5/fonts/times_romaniso.xfe
+share/xcircuit-2.5/fonts/times_romaniso2.lps
+share/xcircuit-2.5/fonts/times_romaniso2.xfe
+share/xcircuit-2.5/fonts/times_romaniso5.lps
+share/xcircuit-2.5/fonts/times_romaniso5.xfe
+@dirrm share/xcircuit-2.5/fonts
+share/xcircuit-2.5/generic.lps
+share/xcircuit-2.5/ic_templates.lps
+share/xcircuit-2.5/lgf.lps
+share/xcircuit-2.5/musiclib.lps
+share/xcircuit-2.5/quadparts.lps
+share/xcircuit-2.5/signal.lps
+share/xcircuit-2.5/startup.script
+share/xcircuit-2.5/xcircps2.pro
+@dirrm share/xcircuit-2.5
share/examples/xcircuit/.xcircuitrc
share/examples/xcircuit/FlareLED.ps
-share/examples/xcircuit/FlareLEDtest.ps
share/examples/xcircuit/USAflag.ps
share/examples/xcircuit/analog1.ps
share/examples/xcircuit/analog2.ps
share/examples/xcircuit/analoglib1.lps
share/examples/xcircuit/border.ps
share/examples/xcircuit/diffamp_test.ps
+share/examples/xcircuit/diffamp_test2.ps
share/examples/xcircuit/envelope.ps
share/examples/xcircuit/fourttest.ps
-share/examples/xcircuit/gettext.py
-share/examples/xcircuit/loadlgf.py
share/examples/xcircuit/logic8.ps
+share/examples/xcircuit/panzoom.py
share/examples/xcircuit/prelude.ps
share/examples/xcircuit/systemd1.lgf
share/examples/xcircuit/test.py
share/examples/xcircuit/threestage.ps
share/examples/xcircuit/vcoblock.ps
@dirrm share/examples/xcircuit
-@dirrm lib/X11/xcircuit/fonts
-@dirrm lib/X11/xcircuit
--0-1603039655-1053822712=:43635--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305250040.h4P0e6Hr089947>