From d7fe0127dc2c650dc320cbbc52e11788ef032181 Mon Sep 17 00:00:00 2001 From: Kevin Lo Date: Sat, 9 Sep 2000 08:55:48 +0000 Subject: Update to 2.1b3 PR: 21135 Submitted by: Ports Fury --- cad/xcircuit/Makefile | 8 +++----- cad/xcircuit/distinfo | 2 +- cad/xcircuit/files/patch-aa | 20 ++++++++++---------- cad/xcircuit/files/patch-ab | 13 +++++++------ cad/xcircuit/files/patch-aq | 14 ++++++++++++++ cad/xcircuit/pkg-plist | 1 + 6 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 cad/xcircuit/files/patch-aq (limited to 'cad/xcircuit') diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index 0a212689f651..d81e1055d387 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xcircuit -PORTVERSION= 2.0b4 +PORTVERSION= 2.1b3 CATEGORIES= cad MASTER_SITES= http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/ @@ -21,11 +21,9 @@ XMKMF= xmkmf MAN1= xcircuit.1 -post-patch: - @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/Imakefile - post-install: @${MKDIR} ${PREFIX}/share/examples/xcircuit - ${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/xcircuit + ${TAR} -C ${WRKSRC}/examples --exclude CVS -cf - . | \ + ${TAR} -C ${PREFIX}/share/examples/xcircuit --unlink -xf - .include diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo index 306ca0165ad4..1c0e030ee321 100644 --- a/cad/xcircuit/distinfo +++ b/cad/xcircuit/distinfo @@ -1 +1 @@ -MD5 (xcircuit-2.0b4.tar.bz2) = 66d4b8983fef4f74b8dde99b935a3a5f +MD5 (xcircuit-2.1b3.tar.bz2) = 88d2191c7f1f5f1632e77be9f87e09e3 diff --git a/cad/xcircuit/files/patch-aa b/cad/xcircuit/files/patch-aa index 93057f530b9d..82da8464181b 100644 --- a/cad/xcircuit/files/patch-aa +++ b/cad/xcircuit/files/patch-aa @@ -1,7 +1,7 @@ -*** Imakefile.orig Wed Mar 1 00:41:35 2000 ---- Imakefile Mon Mar 13 01:45:29 2000 +*** Imakefile.orig Tue Aug 8 05:53:00 2000 +--- Imakefile Thu Aug 17 04:55:48 2000 *************** -*** 26,44 **** +*** 28,46 **** #CCOPTIONS = -O2 # # for debugging purposes uncomment the following line: @@ -14,14 +14,14 @@ #------------------------------------------------------------------------ # ! PREFIX = /usr/local - # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b2/psfiles -! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.0 + # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.1b1/psfiles +! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.1 ! XCIRCUIT_BIN_DIR = $(PREFIX)/bin ! XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1 #------------------------------------------------------------------------ # Support for graphics double-buffering (A memory hog, but yields fastest ---- 26,44 ---- +--- 28,46 ---- #CCOPTIONS = -O2 # # for debugging purposes uncomment the following line: @@ -34,7 +34,7 @@ #------------------------------------------------------------------------ # ! #PREFIX = /usr/local - # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b2/psfiles + # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.1b1/psfiles ! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit ! XCIRCUIT_BIN_DIR = $(BINDIR) ! XCIRCUIT_MAN_DIR = $(MANDIR) @@ -42,7 +42,7 @@ #------------------------------------------------------------------------ # Support for graphics double-buffering (A memory hog, but yields fastest *************** -*** 56,62 **** +*** 58,64 **** # 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 @@ -50,11 +50,11 @@ #------------------------------------------------------------------------ # Window manager bug workaround---If you don't like xcircuit grabbing kbd ---- 56,62 ---- +--- 58,64 ---- # 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 diff --git a/cad/xcircuit/files/patch-ab b/cad/xcircuit/files/patch-ab index a4bd87d732ae..78315e8e6738 100644 --- a/cad/xcircuit/files/patch-ab +++ b/cad/xcircuit/files/patch-ab @@ -1,14 +1,15 @@ -*** xcircuit.c.orig Fri Jan 14 00:21:21 2000 ---- xcircuit.c Fri Jan 21 12:00:00 2000 +*** xcircuit.c.orig Tue Aug 8 06:08:18 2000 +--- xcircuit.c Thu Aug 17 05:00:16 2000 *************** -*** 11,22 **** ---- 11,27 ---- +*** 11,23 **** +--- 11,28 ---- #include #include #include + #ifndef __STDC__ #include + #endif + #include #include #include #include @@ -21,8 +22,8 @@ #include #include *************** -*** 1435,1440 **** ---- 1440,1449 ---- +*** 1701,1706 **** +--- 1706,1715 ---- char *argv0; /* find root of argv[0] */ short initargc = argc; /* because XtInitialize() absorbs the */ /* -schem flag and renumbers argc! (bug?) */ diff --git a/cad/xcircuit/files/patch-aq b/cad/xcircuit/files/patch-aq new file mode 100644 index 000000000000..2c2ade5235bc --- /dev/null +++ b/cad/xcircuit/files/patch-aq @@ -0,0 +1,14 @@ +*** render.c.orig Thu May 11 00:29:51 2000 +--- render.c Thu Aug 17 05:25:28 2000 +*************** +*** 10,16 **** +--- 10,18 ---- + #include + #include + #include ++ #ifndef __STDC__ + #include ++ #endif + #include + #include + #include diff --git a/cad/xcircuit/pkg-plist b/cad/xcircuit/pkg-plist index a2f2bdc8a0e8..f5bf6ed083bb 100644 --- a/cad/xcircuit/pkg-plist +++ b/cad/xcircuit/pkg-plist @@ -34,6 +34,7 @@ lib/X11/xcircuit/lgf.lps lib/X11/xcircuit/musiclib.lps lib/X11/xcircuit/signal.lps lib/X11/xcircuit/xcircps2.pro +share/examples/xcircuit/.xcircuitrc share/examples/xcircuit/USAflag.ps share/examples/xcircuit/analog1.ps share/examples/xcircuit/analog2.ps -- cgit v1.2.3