From 53e4a5ba097848aad251416207be0d8390c7b7c4 Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Fri, 31 May 2002 19:56:19 +0000 Subject: - use getcwd() instead of getwd(). - remove all compiler warnings on alpha - add ${PKG_SYSCONFDIR}/pcb/local.inc where admins can list site specific libraries to be included instead of modifying one of the regularly installed/deinstalled files. This way a local config is preserved when the pkg is upgraded. Also a local config can be applied without modifying one of the files which is checksummed during the install. --- cad/pcb/DEINSTALL | 18 ++++++++++++++++++ cad/pcb/Makefile | 17 ++++++++++++++++- cad/pcb/distinfo | 14 +++++++++++++- cad/pcb/patches/patch-ad | 17 +++++++++++++++++ cad/pcb/patches/patch-ae | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ cad/pcb/patches/patch-af | 40 +++++++++++++++++++++++++++++++++++++++ cad/pcb/patches/patch-ag | 13 +++++++++++++ cad/pcb/patches/patch-ah | 13 +++++++++++++ cad/pcb/patches/patch-ai | 31 ++++++++++++++++++++++++++++++ cad/pcb/patches/patch-aj | 13 +++++++++++++ cad/pcb/patches/patch-ak | 22 ++++++++++++++++++++++ cad/pcb/patches/patch-al | 40 +++++++++++++++++++++++++++++++++++++++ cad/pcb/patches/patch-am | 31 ++++++++++++++++++++++++++++++ cad/pcb/patches/patch-an | 22 ++++++++++++++++++++++ cad/pcb/patches/patch-ao | 31 ++++++++++++++++++++++++++++++ 15 files changed, 369 insertions(+), 2 deletions(-) create mode 100644 cad/pcb/DEINSTALL create mode 100644 cad/pcb/patches/patch-ad create mode 100644 cad/pcb/patches/patch-ae create mode 100644 cad/pcb/patches/patch-af create mode 100644 cad/pcb/patches/patch-ag create mode 100644 cad/pcb/patches/patch-ah create mode 100644 cad/pcb/patches/patch-ai create mode 100644 cad/pcb/patches/patch-aj create mode 100644 cad/pcb/patches/patch-ak create mode 100644 cad/pcb/patches/patch-al create mode 100644 cad/pcb/patches/patch-am create mode 100644 cad/pcb/patches/patch-an create mode 100644 cad/pcb/patches/patch-ao (limited to 'cad') diff --git a/cad/pcb/DEINSTALL b/cad/pcb/DEINSTALL new file mode 100644 index 00000000000..c2d9509ac39 --- /dev/null +++ b/cad/pcb/DEINSTALL @@ -0,0 +1,18 @@ +#! /bin/sh +# +# $NetBSD: DEINSTALL,v 1.1 2002/05/31 19:56:19 dmcmahill Exp $ +# + +case "$2" in + DEINSTALL) cat < ${DEINSTALL_FILE} + post-install: ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/pcb/ ${INSTALL_MAN} ${WRKSRC}/doc/index.html ${PREFIX}/share/doc/pcb/ @@ -27,6 +33,15 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/doc/pcb.info ${PREFIX}/info/ ${INSTALL_MAN} ${WRKSRC}/doc/pcb.ps ${PREFIX}/share/doc/pcb/ ${INSTALL_MAN} ${WRKSRC}/doc/refcard.ps ${PREFIX}/share/doc/pcb/ + ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/pcb + if [ ! -f "${PKG_SYSCONFDIR}/pcb/local.inc" ]; then \ + ${ECHO} "# list your local includes here" > ${PKG_SYSCONFDIR}/pcb/local.inc ; \ + fi + ${MV} -f ${X11BASE}/lib/X11/pcb/m4/common.m4 ${X11BASE}/lib/X11/pcb/m4/common.m4.bak + ${AWK} '/^divert\(0\)dnl/ {print "include(${PKG_SYSCONFDIR}/pcb/local.inc)"} \ + {gsub(/^include\(/,"include(${X11BASE}/lib/X11/pcb/m4/"); print } ' \ + ${X11BASE}/lib/X11/pcb/m4/common.m4.bak > ${X11BASE}/lib/X11/pcb/m4/common.m4 + ${RM} -f ${X11BASE}/lib/X11/pcb/m4/common.m4.bak .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo index a1e8ef46e40..ad44bb5ed18 100644 --- a/cad/pcb/distinfo +++ b/cad/pcb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 16:27:01 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/05/31 19:56:19 dmcmahill Exp $ SHA1 (pcb-1.6.3.tgz) = 79cca1a0ed9567cefd2e98556e1895c86e453010 Size (pcb-1.6.3.tgz) = 577803 bytes @@ -7,3 +7,15 @@ Size (pcb-docs-1.6.3.tar.gz) = 252728 bytes SHA1 (patch-aa) = 348159ad2c6d0eef4c61bbbd0ff2b30eec3f5728 SHA1 (patch-ab) = 8b2a39f3301766cdc1108ebe1d3f280d7ec93cfb SHA1 (patch-ac) = 39f423dddd3bce9bd6c625cde9aa5ccb1831ac9d +SHA1 (patch-ad) = 9edcce665f1a930f857b8ffd65a25c4dad5fa289 +SHA1 (patch-ae) = 3b0b42796c2e8fd5d6d221293593e1e4f80ff660 +SHA1 (patch-af) = 5bee94569170e82a6b29ff04d4cf173dc2da9b49 +SHA1 (patch-ag) = b56547dedeb1672f9e3747b956c0d24fecb200ef +SHA1 (patch-ah) = c17dd08069b600591e848a568a11c3b300e7d5a5 +SHA1 (patch-ai) = 42200d92387e9132ad1e60dfed5223d306fe201f +SHA1 (patch-aj) = 5aea947a9e94f7af568feb7086d8071bda8e1523 +SHA1 (patch-ak) = 9e4005721329f6cf7321e593bd07e577643fe31d +SHA1 (patch-al) = d873599ad739ce54fc2dc98b2a37ec36b4cc75e5 +SHA1 (patch-am) = 3173f8bc6ef90629d64de5c86c45fd2f57d90f5f +SHA1 (patch-an) = 9f3ccc70c33b32ca069e4c9a874ef553c96c6e7d +SHA1 (patch-ao) = 23277a25c79fa45ff704049274c73c6837fd6595 diff --git a/cad/pcb/patches/patch-ad b/cad/pcb/patches/patch-ad new file mode 100644 index 00000000000..df5f1c5d43d --- /dev/null +++ b/cad/pcb/patches/patch-ad @@ -0,0 +1,17 @@ +$NetBSD: patch-ad,v 1.1 2002/05/31 19:56:20 dmcmahill Exp $ + +--- src/main.c.orig Wed May 13 06:29:47 1998 ++++ src/main.c +@@ -787,9 +787,9 @@ + Output.fgGC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL); + Output.bgGC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL); + Output.GridGC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL); +- if (!VALID_GC((int) Output.fgGC) || +- !VALID_GC((int) Output.bgGC) || +- !VALID_GC((int) Output.GridGC)) ++ if (!VALID_GC( (long int) Output.fgGC) || ++ !VALID_GC( (long int) Output.bgGC) || ++ !VALID_GC( (long int) Output.GridGC)) + MyFatal("can't create default GC\n"); + + XSetForeground(Dpy, Output.bgGC, Settings.bgColor); diff --git a/cad/pcb/patches/patch-ae b/cad/pcb/patches/patch-ae new file mode 100644 index 00000000000..eefa6fd88a0 --- /dev/null +++ b/cad/pcb/patches/patch-ae @@ -0,0 +1,49 @@ +$NetBSD: patch-ae,v 1.1 2002/05/31 19:56:20 dmcmahill Exp $ + +--- src/move.c.orig Wed May 13 06:29:49 1998 ++++ src/move.c +@@ -359,7 +359,7 @@ + DrawArc(Layer, Arc, 0); + Draw(); + } +- if (((int) Dest == -1) || Dest == Layer) ++ if (((long int) Dest == -1) || Dest == Layer) + return(Arc); + AddObjectToMoveToLayerUndoList(ARC_TYPE, Layer, Arc, Arc); + if (Layer->On) +@@ -391,7 +391,7 @@ + DrawLine(Layer, Line, 0); + Draw(); + } +- if (((int) Dest == -1) || Dest == Layer) ++ if (((long int) Dest == -1) || Dest == Layer) + return(Line); + + AddObjectToMoveToLayerUndoList(LINE_TYPE, Layer, Line, Line); +@@ -473,7 +473,7 @@ + TextTypePtr new; + + /* Dest == -1 means move to silkscreen layer */ +- if (((int) Dest == -1) || (Dest == Layer)) ++ if (((long int) Dest == -1) || (Dest == Layer)) + AddObjectToFlagUndoList(TEXT_TYPE, Layer, Text, Text); + else + AddObjectToMoveToLayerUndoList(TEXT_TYPE, Layer, Text, Text); +@@ -481,7 +481,7 @@ + (TEST_FLAG(ONSILKFLAG, Text) && (PCB->InvisibleObjectsOn || + (TEST_FLAG(ONSOLDERFLAG, Text) !=0) == SWAP_IDENT))) + EraseText(Text); +- if ((int) Dest == -1) ++ if ((long int) Dest == -1) + { + SET_FLAG(ONSILKFLAG, Text); + if (PCB->ElementOn || (TEST_FLAG(ONSOLDERFLAG, Text) !=0) == SWAP_IDENT) +@@ -536,7 +536,7 @@ + PolygonTypePtr new; + int LayerThermFlag, DestThermFlag; + +- if (((int) Dest == -1) || (Layer == Dest)) ++ if (((long int) Dest == -1) || (Layer == Dest)) + return(Polygon); + AddObjectToMoveToLayerUndoList(POLYGON_TYPE, Layer, Polygon, Polygon); + if (Layer->On) diff --git a/cad/pcb/patches/patch-af b/cad/pcb/patches/patch-af new file mode 100644 index 00000000000..ce00a416fd8 --- /dev/null +++ b/cad/pcb/patches/patch-af @@ -0,0 +1,40 @@ +$NetBSD: patch-af,v 1.1 2002/05/31 19:56:20 dmcmahill Exp $ + +--- src/control.c.orig Wed May 13 06:29:41 1998 ++++ src/control.c +@@ -153,7 +153,7 @@ + static void AddDrawingLayerSelection(Widget Parent) + { + static char name[MAX_LAYER][20]; +- int i; ++ long int i; + Widget label; + Pixel background; + +@@ -191,7 +191,7 @@ + { + static char name[MAX_LAYER+4][20]; + Widget last; +- int i; ++ long int i; + char *text; + Pixel color; + +@@ -392,7 +392,7 @@ + static void CB_SetDrawingLayer(Widget W, + XtPointer ClientData, XtPointer CallData) + { +- ChangeGroupVisibility((int) ClientData, True, True); ++ ChangeGroupVisibility((long int) ClientData, True, True); + XtVaSetValues(DrawingLayerMenuButton.W, + XtNlabel, UNKNOWN(CURRENT->Name), + XtNbackground, CURRENT->Color, +@@ -406,7 +406,7 @@ + static void CB_SetOnOff(Widget W, XtPointer ClientData, XtPointer CallData) + { + Boolean state; +- int layer = (int) ClientData; ++ long int layer = (long int) ClientData; + + /* get new state of widget */ + XtVaGetValues(W, XtNstate, &state, NULL); diff --git a/cad/pcb/patches/patch-ag b/cad/pcb/patches/patch-ag new file mode 100644 index 00000000000..2ddc3015e53 --- /dev/null +++ b/cad/pcb/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2002/05/31 19:56:20 dmcmahill Exp $ + +--- src/crosshair.c.orig Wed May 13 06:29:42 1998 ++++ src/crosshair.c +@@ -820,7 +820,7 @@ + memset(&Crosshair, 0, sizeof(CrosshairType)); + + Crosshair.GC = XCreateGC(Dpy, Output.OutputWindow, 0, NULL); +- if (!VALID_GC((int) Crosshair.GC)) ++ if (!VALID_GC((long int) Crosshair.GC)) + MyFatal("can't create default crosshair GC\n"); + XSetState(Dpy, Crosshair.GC, Settings.CrosshairColor, Settings.bgColor, + GXxor, AllPlanes); diff --git a/cad/pcb/patches/patch-ah b/cad/pcb/patches/patch-ah new file mode 100644 index 00000000000..687b496d73a --- /dev/null +++ b/cad/pcb/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $ + +--- src/misc.c.orig Wed May 13 06:29:49 1998 ++++ src/misc.c +@@ -1066,7 +1066,7 @@ + { + static char path[MAXPATHLEN+1]; + +-#if defined(SYSV) || defined(linux) ++#if defined(SYSV) || defined(linux) || defined(__NetBSD__) + return(getcwd(path, MAXPATHLEN)); + #else + /* seems that some BSD releases lack of a prototype for getwd() */ diff --git a/cad/pcb/patches/patch-ai b/cad/pcb/patches/patch-ai new file mode 100644 index 00000000000..a71b618881f --- /dev/null +++ b/cad/pcb/patches/patch-ai @@ -0,0 +1,31 @@ +$NetBSD: patch-ai,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $ + +--- src/dialog.c.orig Wed May 13 06:29:43 1998 ++++ src/dialog.c +@@ -55,7 +55,7 @@ + /* --------------------------------------------------------------------------- + * some local identifiers + */ +-static int ReturnCode; /* used by standard dialogs */ ++static long int ReturnCode; /* used by standard dialogs */ + + /* --------------------------------------------------------------------------- + * some local prototypes +@@ -71,7 +71,7 @@ + */ + static void CB_OK(Widget W, XtPointer ClientData, XtPointer CallData) + { +- ReturnCode = (int) ClientData; ++ ReturnCode = (long int) ClientData; + } + + /* --------------------------------------------------------------------------- +@@ -124,7 +124,7 @@ + * waits until returncode is differnt from -1 + * see also CB_OK() + */ +-int DialogEventLoop(int *Code) ++int DialogEventLoop(long int *Code) + { + XEvent event; + diff --git a/cad/pcb/patches/patch-aj b/cad/pcb/patches/patch-aj new file mode 100644 index 00000000000..cd9a74b9b8d --- /dev/null +++ b/cad/pcb/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $ + +--- src/dialog.h.orig Wed May 13 06:29:43 1998 ++++ src/dialog.h +@@ -53,7 +53,7 @@ + } DialogButtonType, *DialogButtonTypePtr; + + +-int DialogEventLoop(int *); ++int DialogEventLoop(long int *); + Widget AddButtons(Widget, Widget, DialogButtonTypePtr, size_t); + Widget CreateDialogBox(char *, DialogButtonTypePtr, size_t, char *); + void StartDialog(Widget); diff --git a/cad/pcb/patches/patch-ak b/cad/pcb/patches/patch-ak new file mode 100644 index 00000000000..6cf2c1b7847 --- /dev/null +++ b/cad/pcb/patches/patch-ak @@ -0,0 +1,22 @@ +$NetBSD: patch-ak,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $ + +--- src/fileselect.c.orig Wed May 13 06:29:45 1998 ++++ src/fileselect.c +@@ -79,7 +79,7 @@ + */ + static Widget InputW, /* input field */ + CurrentW; /* label (current directory) */ +-static int ReturnCode; /* returncode of buttons */ ++static long int ReturnCode; /* returncode of buttons */ + static String CurrentDir; /* current directory */ + static Boolean LockCallback; /* used by CB_Text() */ + static SelectorType DirectorySelector = +@@ -138,7 +138,7 @@ + */ + static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData) + { +- ReturnCode = (int) ClientData; ++ ReturnCode = (long int) ClientData; + } + + /* --------------------------------------------------------------------------- diff --git a/cad/pcb/patches/patch-al b/cad/pcb/patches/patch-al new file mode 100644 index 00000000000..5ca72844fd1 --- /dev/null +++ b/cad/pcb/patches/patch-al @@ -0,0 +1,40 @@ +$NetBSD: patch-al,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $ + +--- src/lgdialog.c.orig Wed May 13 06:29:46 1998 ++++ src/lgdialog.c +@@ -57,7 +57,7 @@ + /* --------------------------------------------------------------------------- + * some local identifiers + */ +-static int ReturnCode; /* return code of buttons */ ++static long int ReturnCode; /* return code of buttons */ + static LayerGroupType LayerGroups; /* working copy of current lg */ + + /* --------------------------------------------------------------------------- +@@ -65,7 +65,7 @@ + */ + static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData) + { +- ReturnCode = (int) ClientData; ++ ReturnCode = (long int) ClientData; + } + + /* --------------------------------------------------------------------------- +@@ -78,7 +78,7 @@ + last, + layernameW, + radioGroup[MAX_LAYER+2]; +- int i, ++ long int i, + group, + layer; + XtTranslations translationtable; +@@ -223,7 +223,7 @@ + LayerGroups.Number[group] = 0; + for (i = 0; i < MAX_LAYER+2; i++) + { +- if ((group = (int) XawToggleGetCurrent(radioGroup[i])) != 0) ++ if ((group = (long int) XawToggleGetCurrent(radioGroup[i])) != 0) + { + group--; + LayerGroups.Entries[group][LayerGroups.Number[group]++] = i; diff --git a/cad/pcb/patches/patch-am b/cad/pcb/patches/patch-am new file mode 100644 index 00000000000..c8d077c73ac --- /dev/null +++ b/cad/pcb/patches/patch-am @@ -0,0 +1,31 @@ +$NetBSD: patch-am,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $ + +--- src/printdialog.c.orig Wed May 13 06:29:56 1998 ++++ src/printdialog.c +@@ -80,7 +80,7 @@ + FilenameLabelW, /* a label */ + FilenameW; /* input line */ + static float Scale = 1.0; /* initial scaling factor */ +-static int ReturnCode; /* returncode of buttons */ ++static long int ReturnCode; /* returncode of buttons */ + static Boolean RotateFlag = False, /* initial rotation flag */ + OutlineFlag = False,/* don't draw board outline.. */ + AlignmentFlag = False, +@@ -218,7 +218,7 @@ + */ + static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData) + { +- ReturnCode = (int) ClientData; ++ ReturnCode = (long int) ClientData; + } + + /* --------------------------------------------------------------------------- +@@ -240,7 +240,7 @@ + static void CB_ScrollProc(Widget W, XtPointer ClientData, XtPointer CallData) + { + float top; +- int delta = (int) CallData; ++ long int delta = (long int) CallData; + + /* get thumb postion */ + XtVaGetValues(W, XtNtopOfThumb, &top, NULL); diff --git a/cad/pcb/patches/patch-an b/cad/pcb/patches/patch-an new file mode 100644 index 00000000000..45af04d12a9 --- /dev/null +++ b/cad/pcb/patches/patch-an @@ -0,0 +1,22 @@ +$NetBSD: patch-an,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $ + +--- src/report.c.orig Wed May 13 06:29:57 1998 ++++ src/report.c +@@ -47,7 +47,7 @@ + #include + + +-static int ReturnCode; /* filled in by dialog */ ++static long int ReturnCode; /* filled in by dialog */ + + /* + * some local prototypes +@@ -61,7 +61,7 @@ + */ + static void CB_OK(Widget W, XtPointer ClientData, XtPointer CallData) + { +- ReturnCode = (int) ClientData; ++ ReturnCode = (long int) ClientData; + } + + void ReportDrills(void) diff --git a/cad/pcb/patches/patch-ao b/cad/pcb/patches/patch-ao new file mode 100644 index 00000000000..79b8c64f7e9 --- /dev/null +++ b/cad/pcb/patches/patch-ao @@ -0,0 +1,31 @@ +$NetBSD: patch-ao,v 1.1 2002/05/31 19:56:21 dmcmahill Exp $ + +--- src/sizedialog.c.orig Wed May 13 06:29:59 1998 ++++ src/sizedialog.c +@@ -87,7 +87,7 @@ + /* --------------------------------------------------------------------------- + * some local identifiers + */ +-static int ReturnCode; /* returncode of buttons */ ++static long int ReturnCode; /* returncode of buttons */ + static SliderType Sliders[] = { + { "linewidth", MIN_LINESIZE, MAX_LINESIZE, CHUNK, 0, NULL, NULL }, + { "via hole", MIN_PINORVIAHOLE, 0, CHUNK, 0, NULL, NULL }, +@@ -180,7 +180,7 @@ + */ + static void CB_CancelOrOK(Widget W, XtPointer ClientData, XtPointer CallData) + { +- ReturnCode = (int) ClientData; ++ ReturnCode = (long int) ClientData; + } + + /* --------------------------------------------------------------------------- +@@ -190,7 +190,7 @@ + */ + static void CB_ScrollProc(Widget W, XtPointer ClientData, XtPointer CallData) + { +- int delta = (int) CallData; ++ long int delta = (long int) CallData; + SliderTypePtr slider = (SliderTypePtr) ClientData; + + UpdateScrollbar(slider, -- cgit v1.2.3