aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteve <steve@FreeBSD.org>1999-12-29 15:47:39 +0800
committersteve <steve@FreeBSD.org>1999-12-29 15:47:39 +0800
commit28d23394d32a6785a29c42ae81552bd1d8b523b6 (patch)
tree200cd5685ac6486a7cd331f12ee04f6baba9c17e
parentce4bdf346afa62f471176ad2d134505ae7e8fabc (diff)
downloadfreebsd-ports-gnome-28d23394d32a6785a29c42ae81552bd1d8b523b6.tar.gz
freebsd-ports-gnome-28d23394d32a6785a29c42ae81552bd1d8b523b6.tar.zst
freebsd-ports-gnome-28d23394d32a6785a29c42ae81552bd1d8b523b6.zip
After several hours of doinking with this port, it finally compiles
on -current again.
-rw-r--r--x11-toolkits/iv/files/patch-aa22
-rw-r--r--x11-toolkits/iv/files/patch-ar14
-rw-r--r--x11-toolkits/iv/files/patch-bd37
-rw-r--r--x11-toolkits/iv/files/patch-be12
-rw-r--r--x11-toolkits/iv/files/patch-bg47
-rw-r--r--x11-toolkits/iv/files/patch-bi13
-rw-r--r--x11-toolkits/iv/files/patch-bj14
-rw-r--r--x11-toolkits/iv/files/patch-bk20
-rw-r--r--x11-toolkits/iv/files/patch-bl40
-rw-r--r--x11-toolkits/iv/files/patch-bm12
-rw-r--r--x11-toolkits/iv/files/patch-bn16
-rw-r--r--x11-toolkits/iv/files/patch-bo15
-rw-r--r--x11-toolkits/iv/files/patch-bp79
-rw-r--r--x11-toolkits/iv/files/patch-bq12
-rw-r--r--x11-toolkits/iv/files/patch-br12
-rw-r--r--x11-toolkits/iv/files/patch-bs14
-rw-r--r--x11-toolkits/iv/files/patch-bt90
-rw-r--r--x11-toolkits/iv/files/patch-bu16
-rw-r--r--x11-toolkits/iv/files/patch-bv11
-rw-r--r--x11-toolkits/iv/files/patch-bw46
-rw-r--r--x11-toolkits/iv/files/patch-bx12
-rw-r--r--x11-toolkits/iv/files/patch-by13
-rw-r--r--x11-toolkits/iv/files/patch-bz17
-rw-r--r--x11-toolkits/iv/files/patch-ca11
-rw-r--r--x11-toolkits/iv/files/patch-cb20
-rw-r--r--x11-toolkits/iv/files/patch-cc12
-rw-r--r--x11-toolkits/iv/files/patch-cd28
-rw-r--r--x11-toolkits/iv/files/patch-ce11
-rw-r--r--x11-toolkits/iv/files/patch-cf19
-rw-r--r--x11-toolkits/iv/files/patch-cg29
-rw-r--r--x11-toolkits/iv/files/patch-ch18
-rw-r--r--x11-toolkits/iv/files/patch-ci20
-rw-r--r--x11-toolkits/iv/files/patch-cj28
-rw-r--r--x11-toolkits/iv/files/patch-ck17
-rw-r--r--x11-toolkits/iv/files/patch-cl14
35 files changed, 785 insertions, 26 deletions
diff --git a/x11-toolkits/iv/files/patch-aa b/x11-toolkits/iv/files/patch-aa
index 29230e54b2f2..fba69038531c 100644
--- a/x11-toolkits/iv/files/patch-aa
+++ b/x11-toolkits/iv/files/patch-aa
@@ -1,6 +1,6 @@
--- src/bin/ibuild/ibcmds.c.orig Fri Dec 11 22:33:25 1992
-+++ src/bin/ibuild/ibcmds.c Thu May 27 21:36:47 1999
-@@ -86,7 +86,9 @@
++++ src/bin/ibuild/ibcmds.c Tue Dec 28 23:53:30 1999
+@@ -86,13 +86,18 @@
#undef FileChooser
#define FileChooser _lib_iv(FileChooser)
@@ -10,7 +10,16 @@
#include <stdio.h>
#include <stdlib.h>
#include <stream.h>
-@@ -2407,9 +2409,9 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
++#ifdef __FreeBSD__
++#include <unistd.h>
++#endif
+
+ #if defined(sgi) || defined(sco)
+ /* not all vforks are alike */
+@@ -2407,12 +2412,13 @@
EditorInfo* installed = (EditorInfo*) toolsdialog.Installed();
EditorInfo* removed = (EditorInfo*) toolsdialog.Removed();
@@ -21,5 +30,10 @@
+ for (unidraw->First(ii); !unidraw->Done(ii); unidraw->Next(ii)) {
+ IBEditor* iEd = (IBEditor*) unidraw->GetEditor(ii);
ToolPanel* itoolpanel = iEd->GetToolPanel();
++ int i;
- for (int i = 0; i < installed->Count(); i++) {
+- for (int i = 0; i < installed->Count(); i++) {
++ for (i = 0; i < installed->Count(); i++) {
+ itoolpanel->Install(installed->GetName(i));
+ }
+ for (i = 0; i < removed->Count(); i++) {
diff --git a/x11-toolkits/iv/files/patch-ar b/x11-toolkits/iv/files/patch-ar
index 7ca84d896bcf..a39dec102758 100644
--- a/x11-toolkits/iv/files/patch-ar
+++ b/x11-toolkits/iv/files/patch-ar
@@ -1,5 +1,5 @@
---- src/lib/IV-2_6/xpainter.c.orig Tue Oct 20 05:32:42 1992
-+++ src/lib/IV-2_6/xpainter.c Sun Jan 17 17:48:20 1999
+--- src/lib/IV-2_6/xpainter.c.orig Mon Oct 19 15:32:42 1992
++++ src/lib/IV-2_6/xpainter.c Tue Dec 28 22:23:39 1999
@@ -56,6 +56,7 @@
#include <OS/math.h>
#include <OS/string.h>
@@ -8,3 +8,13 @@
PainterRep::PainterRep() {
display = Session::instance()->default_display();
+@@ -1125,7 +1126,8 @@
+ return;
+ }
+ register XPoint* v = AllocPts(n+1);
+- for (register int i = 0; i < n; i++) {
++ register int i;
++ for (i = 0; i < n; i++) {
+ Map(c, x[i], y[i], v[i].x, v[i].y);
+ }
+ if (x[i-1] != x[0] || y[i-1] != y[0]) {
diff --git a/x11-toolkits/iv/files/patch-bd b/x11-toolkits/iv/files/patch-bd
index 526b30db6b8d..41715c4cac6e 100644
--- a/x11-toolkits/iv/files/patch-bd
+++ b/x11-toolkits/iv/files/patch-bd
@@ -1,5 +1,5 @@
---- src/lib/Unidraw/catalog.c.orig Thu May 27 20:04:40 1999
-+++ src/lib/Unidraw/catalog.c Thu May 27 20:06:39 1999
+--- src/lib/Unidraw/catalog.c.orig Fri Dec 11 22:27:55 1992
++++ src/lib/Unidraw/catalog.c Tue Dec 28 22:51:04 1999
@@ -57,7 +57,9 @@
#include <IV-2_6/_enter.h>
@@ -10,3 +10,36 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+@@ -67,6 +69,10 @@
+ #include <OS/types.h>
+ #include <unistd.h>
+ #endif
++#ifdef __FreeBSD__
++#include <unistd.h>
++#endif
++
+ #include <sys/file.h>
+
+ #ifdef __DECCXX
+@@ -1502,7 +1508,8 @@
+ in >> graylevel;
+
+ } else if (graylevel == nograylevel) {
+- for (int i = 0; in >> buf && i < patternHeight; i++) {
++ int i;
++ for (i = 0; in >> buf && i < patternHeight; i++) {
+ if (buf[0] == '>' || sscanf(buf, "%x", &data[i]) != 1) {
+ break;
+ }
+@@ -1609,9 +1616,9 @@
+
+ } else {
+ istrstream in(definition, strlen(definition) + 1);
+- int data[patternHeight];
++ int data[patternHeight], i;
+
+- for (int i = 0; in >> buf && i < patternHeight; i++) {
++ for (i = 0; in >> buf && i < patternHeight; i++) {
+ if (sscanf(buf, "%x", &data[i]) != 1) {
+ break;
+ }
diff --git a/x11-toolkits/iv/files/patch-be b/x11-toolkits/iv/files/patch-be
deleted file mode 100644
index 7bec291bfe9c..000000000000
--- a/x11-toolkits/iv/files/patch-be
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/lib/Unidraw/catcmds.c.orig Thu May 27 20:08:11 1999
-+++ src/lib/Unidraw/catcmds.c Thu May 27 20:08:33 1999
-@@ -42,7 +42,9 @@
- #include <InterViews/window.h>
- #include <OS/string.h>
-
-+#if __FreeBSD_cc_version < 400002
- #include <osfcn.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <stream.h>
diff --git a/x11-toolkits/iv/files/patch-bg b/x11-toolkits/iv/files/patch-bg
index b3cb80357b51..31d097b17853 100644
--- a/x11-toolkits/iv/files/patch-bg
+++ b/x11-toolkits/iv/files/patch-bg
@@ -1,12 +1,53 @@
---- src/bin/ibuild/ibcode.c.orig Thu May 27 21:37:28 1999
-+++ src/bin/ibuild/ibcode.c Thu May 27 21:38:01 1999
-@@ -41,7 +41,9 @@
+--- src/bin/ibuild/ibcode.c.orig Mon Oct 19 12:58:01 1992
++++ src/bin/ibuild/ibcode.c Tue Dec 28 23:55:54 1999
+@@ -41,7 +41,10 @@
#include <Unidraw/Graphic/pspaint.h>
#include <InterViews/shape.h>
#include <InterViews/transformer.h>
+#if __FreeBSD_cc_version < 400002
#include <osfcn.h>
+#endif
++#include <stdio.h>
#include <stdlib.h>
#include <stream.h>
#include <string.h>
+@@ -362,7 +365,7 @@
+ ButtonStateVar* bsVar = intcomp->GetButtonStateVar();
+ const char* bsname = bsVar->GetName();
+ const char* proc = bsVar->GetFuncName();
+- boolean export = bsVar->GetExport();
++ boolean export_ = bsVar->GetExport();
+ const char* subclass = bsVar->GetSubclassName();
+
+ if (!bsVar->IsSubclass() && !_emitMain) {
+@@ -375,7 +378,7 @@
+ if (!_bsinitslist->Search(bsname)) {
+ _bsinitslist->Append(bsname);
+
+- if (export && !_emitMain) {
++ if (export_ && !_emitMain) {
+ out << " " << bsname;
+ } else {
+ out << " " << ButtonClass << "* " << bsname;
+@@ -384,7 +387,7 @@
+ out << bsVar->GetInitial() << ");\n";
+
+ if (!_emitMain && proc != nil && *proc != '\0') {
+- if (!export || bsVar->IsSubclass()) {
++ if (!export_ || bsVar->IsSubclass()) {
+ out << " " << bsname << "->SetCoreClass(this);\n";
+ out <<" "<< bsname<<"->SetCoreFunc("<< "&" << coreclass;
+ out << "::" << proc << ");\n";
+@@ -1598,10 +1601,10 @@
+ void CodeView::BeginInstantiate (ostream& out) {
+ InteractorComp* icomp = GetIntComp();
+ const char* mname = icomp->GetMemberNameVar()->GetName();
+- boolean export = icomp->GetMemberNameVar()->GetExport();
++ boolean export_ = icomp->GetMemberNameVar()->GetExport();
+ const char* classname = icomp->GetClassNameVar()->GetName();
+
+- if (export && !_emitMain) {
++ if (export_ && !_emitMain) {
+ out << " " << mname << " = new ";
+ } else {
+ out << " " << classname << "* ";
diff --git a/x11-toolkits/iv/files/patch-bi b/x11-toolkits/iv/files/patch-bi
index 1d957ffda908..af387518100b 100644
--- a/x11-toolkits/iv/files/patch-bi
+++ b/x11-toolkits/iv/files/patch-bi
@@ -1,6 +1,6 @@
---- src/bin/iclass/direct.c.orig Thu May 27 21:46:51 1999
-+++ src/bin/iclass/direct.c Thu May 27 21:47:19 1999
-@@ -30,7 +30,9 @@
+--- src/bin/iclass/direct.c.orig Fri Dec 11 22:40:42 1992
++++ src/bin/iclass/direct.c Tue Dec 28 23:16:01 1999
+@@ -30,11 +30,16 @@
#include <OS/string.h>
#include <OS/types.h>
#include <stddef.h>
@@ -10,3 +10,10 @@
#include <pwd.h>
#include <string.h>
#include <stdlib.h>
+ #include <sys/stat.h>
++#ifdef __FreeBSD__
++#include <unistd.h>
++#endif
+
+ #ifdef __DECCXX
+ extern "C" {
diff --git a/x11-toolkits/iv/files/patch-bj b/x11-toolkits/iv/files/patch-bj
new file mode 100644
index 000000000000..5872afd5866f
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bj
@@ -0,0 +1,14 @@
+--- src/lib/InterViews/style.c.orig Tue Dec 28 22:14:59 1999
++++ src/lib/InterViews/style.c Tue Dec 28 22:15:54 1999
+@@ -419,9 +419,10 @@
+
+ long n = path->count();
+ if (e->avail_ <= n) {
++ long i;
+ long new_avail = n + 5;
+ StyleAttributeList** new_list = new StyleAttributeList*[new_avail];
+- for (long i = 0; i < e->avail_; i++) {
++ for (i = 0; i < e->avail_; i++) {
+ new_list[i] = e->entries_[i];
+ }
+ for (i = e->avail_; i < new_avail; i++) {
diff --git a/x11-toolkits/iv/files/patch-bk b/x11-toolkits/iv/files/patch-bk
new file mode 100644
index 000000000000..d920f4dc65a5
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bk
@@ -0,0 +1,20 @@
+--- src/bin/dclock/data.c.orig Tue Dec 28 22:25:29 1999
++++ src/bin/dclock/data.c Tue Dec 28 22:25:57 1999
+@@ -109,6 +109,8 @@
+ }
+
+ void InitData() {
++ int i;
++
+ FadeStep = FadeRate==0 ? 16 : 1;
+ SegCode[9][SegD] = (JohnsFlag)? true : false;
+ Slant = min( max( 0,SlantPC ), 100 )/100.0;
+@@ -149,7 +151,7 @@
+
+ ColonData[0].count = Colon.count;
+ ColonData[1].count = Colon.count;
+- for ( int i=0; i< Colon.count; i++ ) {
++ for ( i=0; i< Colon.count; i++ ) {
+ ColonData[0].y[i] = Colon.y[i]+(0.5-2.25*HThick)/height+ALLy;
+ ColonData[0].x[i] = Colon.x[i]+COLx+ColonData[0].y[i]*Slant/width;
+ ColonData[1].y[i] = Colon.y[i]+(0.5+0.25*HThick)/height+ALLy;
diff --git a/x11-toolkits/iv/files/patch-bl b/x11-toolkits/iv/files/patch-bl
new file mode 100644
index 000000000000..9d94e3b54134
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bl
@@ -0,0 +1,40 @@
+--- src/bin/idraw/idarrow.c.orig Tue Dec 28 22:27:42 1999
++++ src/bin/idraw/idarrow.c Tue Dec 28 22:28:29 1999
+@@ -304,9 +304,11 @@
+ if (dashpatsize <= 0) {
+ out << "[] " << dashoffset << " ";
+ } else {
++ int i;
++
+ out << "[";
+
+- for (int i = 0; i < dashpatsize - 1; i++) {
++ for (i = 0; i < dashpatsize - 1; i++) {
+ out << dashpat[i] << " ";
+ }
+ out << dashpat[i] << "] " << dashoffset << " ";
+@@ -557,9 +559,11 @@
+ if (dashpatsize <= 0) {
+ out << "[] " << dashoffset << " ";
+ } else {
++ int i;
++
+ out << "[";
+
+- for (int i = 0; i < dashpatsize - 1; i++) {
++ for (i = 0; i < dashpatsize - 1; i++) {
+ out << dashpat[i] << " ";
+ }
+ out << dashpat[i] << "] " << dashoffset << " ";
+@@ -806,9 +810,10 @@
+ if (dashpatsize <= 0) {
+ out << "[] " << dashoffset << " ";
+ } else {
++ int i;
+ out << "[";
+
+- for (int i = 0; i < dashpatsize - 1; i++) {
++ for (i = 0; i < dashpatsize - 1; i++) {
+ out << dashpat[i] << " ";
+ }
+ out << dashpat[i] << "] " << dashoffset << " ";
diff --git a/x11-toolkits/iv/files/patch-bm b/x11-toolkits/iv/files/patch-bm
new file mode 100644
index 000000000000..5fd7ad691468
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bm
@@ -0,0 +1,12 @@
+--- src/bin/mailbox/main.c.orig Tue Dec 28 22:29:16 1999
++++ src/bin/mailbox/main.c Tue Dec 28 22:29:29 1999
+@@ -453,7 +453,8 @@
+ if (atp != nil) {
+ char* dotp = strchr(atp, '.');
+ if (dotp != nil) {
+- for (int i = 0; i < strlen(mail_domain); ++i) {
++ int i;
++ for (i = 0; i < strlen(mail_domain); ++i) {
+ char c = dotp[i];
+ c = isupper(c) ? c - 'A' + 'a' : c;
+ if (c != mail_domain[i]) {
diff --git a/x11-toolkits/iv/files/patch-bn b/x11-toolkits/iv/files/patch-bn
new file mode 100644
index 000000000000..85ecc768315d
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bn
@@ -0,0 +1,16 @@
+--- src/lib/IV-2_6/control.c.orig Tue Dec 28 22:48:52 1999
++++ src/lib/IV-2_6/control.c Tue Dec 28 22:49:19 1999
+@@ -154,10 +154,12 @@
+ */
+
+ boolean Control::IsGrabbing(Interactor* i) {
++ ControlState* c;
++
+ if (i == this) {
+ return true;
+ }
+- for (ControlState* c = state_; c != nil; c = c->Next()) {
++ for (c = state_; c != nil; c = c->Next()) {
+ if (c->IsView(i)) {
+ return true;
+ }
diff --git a/x11-toolkits/iv/files/patch-bo b/x11-toolkits/iv/files/patch-bo
new file mode 100644
index 000000000000..f0ff58fb13bc
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bo
@@ -0,0 +1,15 @@
+--- src/bin/dclock/segment.c.orig Tue Dec 28 22:51:59 1999
++++ src/bin/dclock/segment.c Tue Dec 28 22:52:17 1999
+@@ -41,10 +41,10 @@
+
+ Pattern* Segment::MakePattern (int seed) {
+ Pattern* pat;
+- int dat[16];
++ int dat[16], i;
+ unsigned int Row[4];
+
+- for (int i = 0; i <= 3; i++) {
++ for (i = 0; i <= 3; i++) {
+ Row[i] = seed & 0xF;
+ Row[i] |= Row[i]<<4;
+ Row[i] |= Row[i]<<8;
diff --git a/x11-toolkits/iv/files/patch-bp b/x11-toolkits/iv/files/patch-bp
new file mode 100644
index 000000000000..98accbeec7e4
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bp
@@ -0,0 +1,79 @@
+--- src/bin/doc/Document.c.orig Tue Dec 28 22:53:19 1999
++++ src/bin/doc/Document.c Tue Dec 28 22:55:06 1999
+@@ -449,8 +449,8 @@
+ if (strlen(name) == 0) {
+ return nil;
+ } else {
+- long count = _families->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _families->count(), i;
++ for (i = 0; i < count; ++i) {
+ FontFamilyInfo& info = _families->item_ref(0);
+ if (strcmp(info._name, name) == 0) {
+ break;
+@@ -589,8 +589,8 @@
+
+ void Document::remove_float (Item* item) {
+ touch(true);
+- long count = _viewer->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _viewer->count(), i;
++ for (i = 0; i < count; ++i) {
+ DocumentViewerInfo& info = _viewer->item_ref(i);
+ info._viewer->float_removed(item);
+ }
+@@ -2276,8 +2276,8 @@
+ }
+
+ long Document::find_macro (const char* name) {
+- long count = _macro->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _macro->count(), i;
++ for (i = 0; i < count; ++i) {
+ MacroInfo& info = _macro->item_ref(i);
+ if (strcmp(info._name, name) == 0) {
+ break;
+@@ -2313,8 +2313,8 @@
+ }
+
+ long Document::find_counter (const char* name) {
+- long count = _counter->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _counter->count(), i;
++ for (i = 0; i < count; ++i) {
+ CounterInfo& info = _counter->item_ref(i);
+ if (strcmp(info._name, name) == 0) {
+ break;
+@@ -2364,8 +2364,8 @@
+ }
+
+ long Document::find_parameter (const char* name) {
+- long count = _parameter->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _parameter->count(), i;
++ for (i = 0; i < count; ++i) {
+ DocumentParameterInfo& info = _parameter->item_ref(i);
+ if (strcmp(info._name, name) == 0) {
+ break;
+@@ -2405,8 +2405,8 @@
+ }
+
+ long Document::find_label (const char* name) {
+- long count = _label->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _label->count(), i;
++ for (i = 0; i < count; ++i) {
+ LabelInfo& info = _label->item_ref(i);
+ if (strcmp(info._name, name) == 0) {
+ break;
+@@ -2446,8 +2446,8 @@
+ }
+
+ long Document::find_float (Item* item) {
+- long count = _float->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _float->count(), i;
++ for (i = 0; i < count; ++i) {
+ FloatInfo& info = _float->item_ref(i);
+ if (info._item == item) {
+ break;
diff --git a/x11-toolkits/iv/files/patch-bq b/x11-toolkits/iv/files/patch-bq
new file mode 100644
index 000000000000..6a1a0bd180a3
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bq
@@ -0,0 +1,12 @@
+--- src/bin/idraw/idcatalog.c.orig Tue Dec 28 22:55:59 1999
++++ src/bin/idraw/idcatalog.c Tue Dec 28 22:56:30 1999
+@@ -658,7 +658,8 @@
+ graylevel = CalcGrayLevel(data[0]);
+ }
+ } else if (graylevel == -1) {
+- for (int i = 0; in >> _buf && i < patternHeight; i++) {
++ int i;
++ for (i = 0; in >> _buf && i < patternHeight; i++) {
+ if (_buf[0] == '>' || sscanf(_buf, "%x", &data[i]) != 1) {
+ break;
+ }
diff --git a/x11-toolkits/iv/files/patch-br b/x11-toolkits/iv/files/patch-br
new file mode 100644
index 000000000000..7bc97f62926e
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-br
@@ -0,0 +1,12 @@
+--- src/lib/IV-2_6/matcheditor.c.orig Tue Dec 28 23:03:32 1999
++++ src/lib/IV-2_6/matcheditor.c Tue Dec 28 23:03:47 1999
+@@ -53,7 +53,8 @@
+ }
+
+ void MatchEditor::Match (const char* p, boolean m) {
+- for (char* pp = pattern; *p != '\0'; ++p, ++pp) {
++ char* pp;
++ for (pp = pattern; *p != '\0'; ++p, ++pp) {
+ *pp = *p;
+ if (*p == '%') {
+ ++p;
diff --git a/x11-toolkits/iv/files/patch-bs b/x11-toolkits/iv/files/patch-bs
new file mode 100644
index 000000000000..6c2b4a019dd9
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bs
@@ -0,0 +1,14 @@
+--- src/lib/Unidraw/psview.c.orig Tue Dec 28 23:04:51 1999
++++ src/lib/Unidraw/psview.c Tue Dec 28 23:05:07 1999
+@@ -752,9 +752,10 @@
+ if (dashpatsize <= 0) {
+ out << "[] " << dashoffset << " ";
+ } else {
++ int i;
+ out << "[";
+
+- for (int i = 0; i < dashpatsize - 1; i++) {
++ for (i = 0; i < dashpatsize - 1; i++) {
+ out << dashpat[i] << " ";
+ }
+ out << dashpat[i] << "] " << dashoffset << " ";
diff --git a/x11-toolkits/iv/files/patch-bt b/x11-toolkits/iv/files/patch-bt
new file mode 100644
index 000000000000..9cb3141b7be1
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bt
@@ -0,0 +1,90 @@
+--- src/bin/doc/DocViewer.c.orig Tue Dec 28 23:06:17 1999
++++ src/bin/doc/DocViewer.c Tue Dec 28 23:08:16 1999
+@@ -600,8 +600,8 @@
+ }
+
+ void DocumentViewer::pin (const char* name) {
+- long count = _pinned_info->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _pinned_info->count(), i;
++ for (i = 0; i < count; ++i) {
+ ViewerPinnedInfo& m = _pinned_info->item_ref(i);
+ if (strcmp(m._name, name) == 0) {
+ break;
+@@ -633,8 +633,8 @@
+ }
+
+ void DocumentViewer::unpin (const char* name) {
+- long count = _pinned_info->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _pinned_info->count(), i;
++ for (i = 0; i < count; ++i) {
+ ViewerPinnedInfo& m = _pinned_info->item_ref(i);
+ if (strcmp(m._name, name) == 0) {
+ break;
+@@ -651,8 +651,8 @@
+
+ void DocumentViewer::menubar (const char* name) {
+ choose(nil, false);
+- long count = _menu_info->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _menu_info->count(), i;
++ for (i = 0; i < count; ++i) {
+ ViewerMenuInfo& m = _menu_info->item_ref(i);
+ if (strcmp(m._name, name) == 0) {
+ break;
+@@ -674,8 +674,8 @@
+ }
+
+ void DocumentViewer::keymap (const char* name) {
+- long count = _keymap_info->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _keymap_info->count(), i;
++ for (i = 0; i < count; ++i) {
+ ViewerKeymapInfo& info = _keymap_info->item_ref(i);
+ if (strcmp(info._name, name) == 0) {
+ break;
+@@ -698,8 +698,8 @@
+ void DocumentViewer::highlight_colors (
+ const char* name, const Color*& overlay, const Color*& underlay
+ ) {
+- long count = _color_info->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _color_info->count(), i;
++ for (i = 0; i < count; ++i) {
+ ViewerColorInfo& info = _color_info->item_ref(i);
+ if (strcmp(info._name, name) == 0) {
+ break;
+@@ -766,8 +766,8 @@
+ }
+
+ void DocumentViewer::float_removed (Item* item) {
+- long count = _float_info->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _float_info->count(), i;
++ for (i = 0; i < count; ++i) {
+ if (_float_info->item_ref(i)._item == item) {
+ break;
+ }
+@@ -782,8 +782,8 @@
+ }
+
+ void DocumentViewer::float_changed (Item* item) {
+- long count = _float_info->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _float_info->count(), i;
++ for (i = 0; i < count; ++i) {
+ if (_float_info->item_ref(i)._item == item) {
+ break;
+ }
+@@ -797,8 +797,8 @@
+
+ void DocumentViewer::float_adjusted (Item* item, float x, float y, long p) {
+ Session::instance()->default_display()->flush();
+- long count = _float_info->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _float_info->count(), i;
++ for (i = 0; i < count; ++i) {
+ if (_float_info->item_ref(i)._item == item) {
+ break;
+ }
diff --git a/x11-toolkits/iv/files/patch-bu b/x11-toolkits/iv/files/patch-bu
new file mode 100644
index 000000000000..fe85507f2e20
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bu
@@ -0,0 +1,16 @@
+--- src/lib/IV-X11/xdrag.c.orig Tue Dec 28 23:10:52 1999
++++ src/lib/IV-X11/xdrag.c Tue Dec 28 23:11:10 1999
+@@ -230,11 +230,12 @@
+ XWindow *children;
+ unsigned int kids;
+ Status status;
++ int i;
+ status = XQueryTree(display, root, &root, &parent, &children, &kids);
+ if (status == 0) {
+ return None;
+ }
+- for (int i = kids - 1; i >= 0 && children[i] != under ; --i);
++ for (i = kids - 1; i >= 0 && children[i] != under ; --i);
+ for (--i; i >= 0; --i) {
+ XWindowAttributes attributes;
+ XGetWindowAttributes(display, children[i], &attributes);
diff --git a/x11-toolkits/iv/files/patch-bv b/x11-toolkits/iv/files/patch-bv
new file mode 100644
index 000000000000..9acdcb492e16
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bv
@@ -0,0 +1,11 @@
+--- src/lib/Unidraw/stencilcomp.c.orig Tue Dec 28 23:12:07 1999
++++ src/lib/Unidraw/stencilcomp.c Tue Dec 28 23:12:27 1999
+@@ -169,7 +169,7 @@
+ StencilComp* comp = (StencilComp*) GetSubject();
+ Bitmap* image, *mask;
+ comp->GetStencil()->GetOriginal(image, mask);
+- char* tag = (image == mask) ? "SSten" : "FSten";
++ char* tag = (image == mask) ? (char*)"SSten" : (char*)"FSten";
+ Coord w = image->Width();
+ Coord h = image->Height();
+
diff --git a/x11-toolkits/iv/files/patch-bw b/x11-toolkits/iv/files/patch-bw
new file mode 100644
index 000000000000..25667b8f537f
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bw
@@ -0,0 +1,46 @@
+--- src/bin/doc/DialogMgr.c.orig Tue Dec 28 23:13:39 1999
++++ src/bin/doc/DialogMgr.c Tue Dec 28 23:14:26 1999
+@@ -107,8 +107,8 @@
+ const char* DialogManager::choose (
+ Window* window, const char* prompt, const char* filter
+ ) {
+- long count = _chooser->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _chooser->count(), i;
++ for (i = 0; i < count; ++i) {
+ ChooserInfo& info = _chooser->item_ref(i);
+ if (strcmp(info._prompt, prompt) == 0) {
+ break;
+@@ -127,8 +127,8 @@
+ const char* DialogManager::ask (
+ Window* window, const char* prompt, const char* initial
+ ) {
+- long count = _asker->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _asker->count(), i;
++ for (i = 0; i < count; ++i) {
+ AskerInfo& info = _asker->item_ref(i);
+ if (strcmp(info._prompt, prompt) == 0) {
+ break;
+@@ -145,8 +145,8 @@
+ }
+
+ int DialogManager::confirm (Window* window, const char* prompt) {
+- long count = _confirmer->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _confirmer->count(), i;
++ for (i = 0; i < count; ++i) {
+ ConfirmerInfo& info = _confirmer->item_ref(i);
+ if (strcmp(info._prompt, prompt) == 0) {
+ break;
+@@ -163,8 +163,8 @@
+ }
+
+ void DialogManager::report (Window* window, const char* prompt) {
+- long count = _reporter->count();
+- for (long i = 0; i < count; ++i) {
++ long count = _reporter->count(), i;
++ for (i = 0; i < count; ++i) {
+ ReporterInfo& info = _reporter->item_ref(i);
+ if (strcmp(info._prompt, prompt) == 0) {
+ break;
diff --git a/x11-toolkits/iv/files/patch-bx b/x11-toolkits/iv/files/patch-bx
new file mode 100644
index 000000000000..d277ad0975e0
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bx
@@ -0,0 +1,12 @@
+--- src/lib/IV-X11/xfont.c.orig Tue Dec 28 23:19:05 1999
++++ src/lib/IV-X11/xfont.c Tue Dec 28 23:19:38 1999
+@@ -527,7 +527,8 @@
+ int sublength = strlen(substring);
+ int length = strlen(string) - sublength;
+ for (int i = 0; i <= length; ++i) {
+- for (int j = 0; j < sublength; ++j) {
++ int j;
++ for (j = 0; j < sublength; ++j) {
+ if (string[i+j] != substring[j]) {
+ break;
+ }
diff --git a/x11-toolkits/iv/files/patch-by b/x11-toolkits/iv/files/patch-by
new file mode 100644
index 000000000000..cb1e2b2946ae
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-by
@@ -0,0 +1,13 @@
+--- src/lib/Unidraw/text.c.orig Tue Dec 28 23:20:23 1999
++++ src/lib/Unidraw/text.c Tue Dec 28 23:20:46 1999
+@@ -561,8 +561,9 @@
+
+ const char* PSText::Filter (const char* string, int len) {
+ TextBuffer stext(sbuf, 0, SBUFSIZE);
++ int dot;
+
+- for (int dot = 0; len--; string++) {
++ for (dot = 0; len--; string++) {
+ char c = *string;
+
+ if (!isascii(c) || iscntrl(c)) {
diff --git a/x11-toolkits/iv/files/patch-bz b/x11-toolkits/iv/files/patch-bz
new file mode 100644
index 000000000000..1b978829b58b
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-bz
@@ -0,0 +1,17 @@
+--- src/bin/doc/Keymap.c.orig Tue Dec 28 23:21:41 1999
++++ src/bin/doc/Keymap.c Tue Dec 28 23:22:00 1999
+@@ -105,12 +105,12 @@
+ ) {
+ _viewer->ref();
+ ItemView* view = _viewer->focus();
+- long count = _info->count();
++ long count = _info->count(), i;
+ int key = s[0];
+ if (key < 0) {
+ key += 256;
+ }
+- for (long i = 0; i < count; ++i) {
++ for (i = 0; i < count; ++i) {
+ DocKeymapInfo& info = _info->item_ref(i);
+ if (info._key == key) {
+ boolean pending_repair;
diff --git a/x11-toolkits/iv/files/patch-ca b/x11-toolkits/iv/files/patch-ca
new file mode 100644
index 000000000000..47889ef38bf4
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ca
@@ -0,0 +1,11 @@
+--- src/bin/idraw/ided.c.orig Tue Dec 28 23:47:23 1999
++++ src/bin/idraw/ided.c Tue Dec 28 23:47:41 1999
+@@ -350,7 +350,7 @@
+ return commands;
+ }
+
+-static const unit = 15;
++static const int unit = 15;
+
+ static Coord xClosed[] = { unit/5, unit, unit, unit*3/5, 0 };
+ static Coord yClosed[] = { 0, unit/5, unit*3/5, unit, unit*2/5 };
diff --git a/x11-toolkits/iv/files/patch-cb b/x11-toolkits/iv/files/patch-cb
new file mode 100644
index 000000000000..5ba9a22f6d61
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-cb
@@ -0,0 +1,20 @@
+--- src/bin/ibuild/ibvars.h.orig Tue Dec 28 23:49:31 1999
++++ src/bin/ibuild/ibvars.h Tue Dec 28 23:50:16 1999
+@@ -232,7 +232,7 @@
+
+ inline boolean MemberSharedName::GetExport() { return _export; }
+ inline SubclassNameVar* MemberSharedName::GetSubclass () { return _subclass; }
+-inline void MemberSharedName::SetExport(boolean export) { _export = export;}
++inline void MemberSharedName::SetExport(boolean export_) { _export = export_;}
+ inline int& MemberSharedName::GetSerial () { return _mSerial; }
+ inline IDVar* MemberSharedName::GetIDVar () { return _idVar; }
+
+@@ -326,7 +326,7 @@
+ inline int ButtonSharedName::GetInitial() { return _initial; }
+ inline void ButtonSharedName::SetInitial(int initial) { _initial = initial;}
+ inline boolean ButtonSharedName::GetExport() { return _export; }
+-inline void ButtonSharedName::SetExport(boolean export) { _export = export;}
++inline void ButtonSharedName::SetExport(boolean export_) { _export = export_;}
+ inline const char* ButtonSharedName::GetFuncName() { return _func; }
+ inline int& ButtonSharedName::GetSerial() { return _bsSerial; }
+ inline SubclassNameVar* ButtonSharedName::GetSubclass () { return _subclass; }
diff --git a/x11-toolkits/iv/files/patch-cc b/x11-toolkits/iv/files/patch-cc
new file mode 100644
index 000000000000..a17c050e23ec
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-cc
@@ -0,0 +1,12 @@
+--- src/bin/ibuild/ibcatalog.c.orig Tue Dec 28 23:51:30 1999
++++ src/bin/ibuild/ibcatalog.c Tue Dec 28 23:51:44 1999
+@@ -614,7 +614,8 @@
+ graylevel = CalcGrayLevel(data[0]);
+ }
+ } else if (graylevel == -1) {
+- for (int i = 0; in >> _buf && i < patternHeight; i++) {
++ int i;
++ for (i = 0; in >> _buf && i < patternHeight; i++) {
+ if (_buf[0] == '>' || sscanf(_buf, "%x", &data[i]) != 1) {
+ break;
+ }
diff --git a/x11-toolkits/iv/files/patch-cd b/x11-toolkits/iv/files/patch-cd
new file mode 100644
index 000000000000..9dd57932f7ec
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-cd
@@ -0,0 +1,28 @@
+--- src/bin/ibuild/ibdialog.c.orig Tue Dec 28 23:57:35 1999
++++ src/bin/ibuild/ibdialog.c Tue Dec 28 23:58:10 1999
+@@ -35,6 +35,7 @@
+ #include <Unidraw/unidraw.h>
+ #include <Unidraw/viewer.h>
+ #include <Unidraw/catalog.h>
++#include <stdio.h>
+ #include <stream.h>
+ #include <string.h>
+
+@@ -380,7 +381,7 @@
+ strcat(ButtonClass, "_Button");
+ const char* proc = bsVar->GetFuncName();
+
+- boolean export = bsVar->GetExport();
++ boolean export_ = bsVar->GetExport();
+ CodeView* kidview = GetKidView();
+ MemberNameVar* kidname;
+ if (kidview != nil) {
+@@ -407,7 +408,7 @@
+
+ out << "Interactor*" << coreclass;
+ out << "::Interior() {\n";
+- if (export) {
++ if (export_) {
+ out << " " << bsVar->GetName() << " = state;\n";
+ } else {
+ out << " ButtonState* ";
diff --git a/x11-toolkits/iv/files/patch-ce b/x11-toolkits/iv/files/patch-ce
new file mode 100644
index 000000000000..f9971b4c46dd
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ce
@@ -0,0 +1,11 @@
+--- src/bin/ibuild/ibed.c.orig Tue Dec 28 23:59:18 1999
++++ src/bin/ibuild/ibed.c Tue Dec 28 23:59:30 1999
+@@ -672,7 +672,7 @@
+ return tools;
+ }
+
+-static const unit = 15;
++static const int unit = 15;
+
+ static Coord xClosed[] = { unit/5, unit, unit, unit*3/5, 0 };
+ static Coord yClosed[] = { 0, unit/5, unit*3/5, unit, unit*2/5 };
diff --git a/x11-toolkits/iv/files/patch-cf b/x11-toolkits/iv/files/patch-cf
new file mode 100644
index 000000000000..9edef1b34178
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-cf
@@ -0,0 +1,19 @@
+--- src/bin/ibuild/ibglue.c.orig Wed Dec 29 00:01:29 1999
++++ src/bin/ibuild/ibglue.c Wed Dec 29 00:02:33 1999
+@@ -271,14 +271,14 @@
+ strcpy(VGlueClass, coreclass);
+ strcat(VGlueClass, "_VGlue");
+
+- boolean export = icomp->GetMemberNameVar()->GetExport();
++ boolean export_ = icomp->GetMemberNameVar()->GetExport();
+ const char* classname = icomp->GetClassNameVar()->GetName();
+ if (icomp->GetClassNameVar()->IsSubclass()) {
+ BeginInstantiate(out);
+ out << "(";
+
+ } else {
+- if (export && !_emitMain) {
++ if (export_ && !_emitMain) {
+ out << " " << mname << " = new ";
+ } else {
+ out << " " << classname << "* ";
diff --git a/x11-toolkits/iv/files/patch-cg b/x11-toolkits/iv/files/patch-cg
new file mode 100644
index 000000000000..c9ec771d343b
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-cg
@@ -0,0 +1,29 @@
+--- src/bin/ibuild/ibmenu.c.orig Wed Dec 29 00:03:53 1999
++++ src/bin/ibuild/ibmenu.c Wed Dec 29 00:04:11 1999
+@@ -403,7 +403,7 @@
+
+ const char* proc = menuItem->GetTrackNameVar()->GetName();
+ const char* text = menuItem->GetMenuItemGraphic()->GetText();
+- boolean export = icomp->GetMemberNameVar()->GetExport();
++ boolean export_ = icomp->GetMemberNameVar()->GetExport();
+ Shape* shape = icomp->GetShapeVar()->GetShape();
+
+ if (icomp->GetClassNameVar()->IsSubclass()) {
+@@ -411,7 +411,7 @@
+ out << "(";
+
+ } else {
+- if (export && !_emitMain) {
++ if (export_ && !_emitMain) {
+ out << " " << mname << " = ";
+ out << "new " << MenuClass;
+ } else {
+@@ -431,7 +431,7 @@
+ EndInstantiate(out);
+
+ if (!_emitMain && proc != nil && *proc != '\0') {
+- if (!export || icomp->GetClassNameVar()->IsSubclass()) {
++ if (!export_ || icomp->GetClassNameVar()->IsSubclass()) {
+ out << " " << mname << "->SetCoreClass(this);\n";
+ out <<" "<< mname <<"->SetCoreFunc("<< "&" << coreclass;
+ out << "::" << proc << ");\n";
diff --git a/x11-toolkits/iv/files/patch-ch b/x11-toolkits/iv/files/patch-ch
new file mode 100644
index 000000000000..629db73d7ab1
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ch
@@ -0,0 +1,18 @@
+--- src/bin/ibuild/ibpanelctrl.c.orig Wed Dec 29 00:05:10 1999
++++ src/bin/ibuild/ibpanelctrl.c Wed Dec 29 00:05:30 1999
+@@ -871,13 +871,13 @@
+ } else if (_emitBSInits) {
+ ButtonStateVar* bsVar = pcComp->GetButtonStateVar();
+ const char* name = bsVar->GetName();
+- boolean export = bsVar->GetExport();
++ boolean export_ = bsVar->GetExport();
+ const char* subclass = bsVar->GetSubclassName();
+
+ if (!_bsinitslist->Search(name)) {
+ _bsinitslist->Append(name);
+
+- if (export && !_emitMain) {
++ if (export_ && !_emitMain) {
+ out << " " << name;
+
+ } else {
diff --git a/x11-toolkits/iv/files/patch-ci b/x11-toolkits/iv/files/patch-ci
new file mode 100644
index 000000000000..9456720522ab
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ci
@@ -0,0 +1,20 @@
+--- src/bin/ibuild/ibslider.c.orig Wed Dec 29 00:06:31 1999
++++ src/bin/ibuild/ibslider.c Wed Dec 29 00:06:43 1999
+@@ -416,7 +416,7 @@
+ strcpy(SliderClass, coreclass);
+ strcat(SliderClass, "_Slider");
+
+- boolean export = icomp->GetMemberNameVar()->GetExport();
++ boolean export_ = icomp->GetMemberNameVar()->GetExport();
+ const char* classname = icomp->GetClassNameVar()->GetName();
+
+ int w = icomp->GetCanvasVar()->Width();
+@@ -426,7 +426,7 @@
+ BeginInstantiate(out);
+ out << "(";
+ } else {
+- if (export && !_emitMain) {
++ if (export_ && !_emitMain) {
+ out << " " << mname << " = new " << SliderClass;
+ out << "(";
+ } else {
diff --git a/x11-toolkits/iv/files/patch-cj b/x11-toolkits/iv/files/patch-cj
new file mode 100644
index 000000000000..3ac8c1e2f9c2
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-cj
@@ -0,0 +1,28 @@
+--- src/bin/ibuild/ibvars.c.orig Wed Dec 29 00:07:51 1999
++++ src/bin/ibuild/ibvars.c Wed Dec 29 00:08:26 1999
+@@ -371,9 +371,9 @@
+ /*****************************************************************************/
+
+ MemberSharedName::MemberSharedName (
+- const char* name, boolean export, boolean machgen
++ const char* name, boolean export_, boolean machgen
+ ) : SharedName(name, machgen) {
+- _export = export;
++ _export = export_;
+ _subclass = new SubclassNameVar("", false, false);
+ _subclass->ref();
+ _idVar = nil;
+@@ -471,11 +471,11 @@
+
+ /*****************************************************************************/
+ MemberNameVar::MemberNameVar (
+- const char* name, boolean export, boolean machgen
++ const char* name, boolean export_, boolean machgen
+ ) {
+ _msharedname = nil;
+ if (name != nil) {
+- _msharedname = new MemberSharedName(name, export, machgen);
++ _msharedname = new MemberSharedName(name, export_, machgen);
+ _msharedname->ref();
+ }
+ }
diff --git a/x11-toolkits/iv/files/patch-ck b/x11-toolkits/iv/files/patch-ck
new file mode 100644
index 000000000000..6ae4b9965ff1
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-ck
@@ -0,0 +1,17 @@
+--- src/bin/ibuild/ibvarviews.c.orig Wed Dec 29 00:09:20 1999
++++ src/bin/ibuild/ibvarviews.c Wed Dec 29 00:09:52 1999
+@@ -1374,12 +1374,13 @@
+ if (strcmp(orig, subclass) != 0) {
+ if (*subclass != '\0') {
+ if (strcmp(subclass, baseclass) != 0) {
++ UList* i;
+ GetConflictCmd conflictCmd(
+ (GraphicComp*) _icomp->GetRoot(), subclass, true
+ );
+ conflictCmd.Execute();
+ UList* cl = conflictCmd.GetConflict();
+- for(UList* i = cl->First(); i != cl->End(); i = i->Next()) {
++ for(i = cl->First(); i != cl->End(); i = i->Next()) {
+ StateVar* state = (StateVar*) (*i)();
+ if (state->IsA(SUBCLASSNAME_VAR) && state != subvar) {
+ SubclassNameVar* svar = (SubclassNameVar*) state;
diff --git a/x11-toolkits/iv/files/patch-cl b/x11-toolkits/iv/files/patch-cl
new file mode 100644
index 000000000000..1d1178555f11
--- /dev/null
+++ b/x11-toolkits/iv/files/patch-cl
@@ -0,0 +1,14 @@
+--- src/lib/Unidraw/Imakefile.orig Wed Dec 29 00:22:37 1999
++++ src/lib/Unidraw/Imakefile Wed Dec 29 00:25:23 1999
+@@ -5,7 +5,11 @@
+ #ifdef InObjectCodeDir
+
+ LIB = Unidraw
++.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf")
++VERSION = 3
++.else
+ VERSION = 3.1
++.endif
+
+ MakeLibrary($(LIB),$(VERSION))
+