* qt2 -> qt3; from maintainer Jacob Meuser <jakemsr@jakemsr.com>

* don't install useless docs

cad/qcad/Makefile

@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2002/05/11 00:31:22 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2002/05/17 18:38:55 naddy Exp $
-
-NOT_FOR_ARCHS=	alpha
 
 COMMENT=		"Qt-based 2D CAD system"
 
 PKGNAME=		${DISTNAME:S/-src//}
 DISTNAME=		qcad-1.4.7-src
 CATEGORIES=     	cad x11
-NEED_VERSION=		1.497
+NEED_VERSION=		1.528
 
 HOMEPAGE=		http://www.qcad.org/
 
@@ -21,20 +19,18 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${HOMEPAGE}archives/
 
-MODULES=	qt2
+MODULES=	qt3
 
 MAKE_FLAGS= \
 	CC='${CXX}' \
-	CFLAGS='${CXXFLAGS} -DPREFIX=\"${PREFIX}\"' \
+	CFLAGS='-Wall ${CXXFLAGS} -DPREFIX=\"${PREFIX}\"' \
-	INCPATH='-I${LOCALBASE}/include -I${MODQT_INCDIR}' \
+	INCPATH='-I${MODQT_INCDIR}' \
 	LINK='${CXX}' \
 	LFLAGS='' \
 	LIBS='-L${MODQT_LIBDIR} -L${LOCALBASE}/lib -lqt -L${X11BASE}/lib -lX11' 
 
 NO_REGRESS=		Yes
 
-DOCS=			AUTHORS COPYING INSTALL MANIFEST README TODO
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/qcad ${PREFIX}/bin
 .for dir in cur fonts hatches messages examples xpm
@@ -45,6 +41,5 @@ do-install:
 	cd ${WRKSRC}/libraries; cp -R * ${PREFIX}/share/qcad/libraries 
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qcad
 	cd ${WRKSRC}/doc; cp -R * ${PREFIX}/share/doc/qcad 
-	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/qcad
 
 .include <bsd.port.mk>

cad/qcad/patches/patch-rconfig_cpp

@@ -1,6 +1,6 @@
-$OpenBSD: patch-rconfig_cpp,v 1.1.1.1 2001/08/11 14:45:26 naddy Exp $
+$OpenBSD: patch-rconfig_cpp,v 1.2 2002/05/17 18:39:46 naddy Exp $
 --- rconfig.cpp.orig	Sun Mar 25 03:17:10 2001
-+++ rconfig.cpp	Thu Aug  9 03:32:20 2001
++++ rconfig.cpp	Wed May 15 00:34:59 2002
 @@ -29,6 +29,8 @@
  #include "rinitialdialog.h"
  #include "rlog.h"
@@ -19,7 +19,68 @@ $OpenBSD: patch-rconfig_cpp,v 1.1.1.1 2001/08/11 14:45:26 naddy Exp $
  
    verbose=false;
  }
-@@ -514,7 +516,7 @@ const
+@@ -404,7 +406,7 @@ RConfig::createLanguageList()
+     newLanguage = new languageStruct;
+     newLanguage->name = "English";
+     newLanguage->sign = "en";
+-    newLanguage->charset = QFont::Latin1;
++    //    newLanguage->charset = QFont::Latin1;
+     languageList.append(newLanguage);
+     
+     if (langFile.open(IO_ReadOnly)) {
+@@ -421,7 +423,7 @@ RConfig::createLanguageList()
+             newLanguage = new languageStruct;
+             newLanguage->name = name;
+             newLanguage->sign = sign;
+-            newLanguage->charset = mtStringToCharset(charset);
++	    //      newLanguage->charset = mtStringToCharset(charset);
+ 
+             languageList.append(newLanguage);
+         }
+@@ -457,34 +459,33 @@ RConfig::readQmFile()
+     }
+ 
+     // Add charset for this language to the settings
++   /*
++    * CharSet is obsolete because Qt now does this for us
++    *
+     if (getSetting("Application:Charset").isEmpty()) {
+         addSetting("Application:Charset",
+                    mtCharsetToString(getLanguageCharset(getLanguageName(getSetting("Language:Language")))));
+     }
++    */
+ 
+     // Ini fonts:
+     //
+     font0 = new QFont( getSetting("Application:FontName"),
+                        getSettingInt("Application:FontSize0"),
+                        QFont::Normal,
+-                       false,
+-                       mtStringToCharset(getSetting("Application:Charset")) );
++                       false );
+     font1 = new QFont( getSetting("Application:FontName"),
+                        getSettingInt("Application:FontSize1"),
+                        QFont::Normal,
+-                       false,
+-                       mtStringToCharset(getSetting("Application:Charset")) );
++                       false );
+     font2 = new QFont( getSetting("Application:FontName"),
+                        getSettingInt("Application:FontSize2"),
+                        QFont::Normal,
+-                       false,
+-                       mtStringToCharset(getSetting("Application:Charset")) );
++                       false );
+     font3 = new QFont( getSetting("Application:FontName"),
+                        getSettingInt("Application:FontSize3"),
+                        QFont::Normal,
+-                       false,
+-                       mtStringToCharset(getSetting("Application:Charset")) );
+-
++                       false );
+     return true;
+ }
+ 
+@@ -514,7 +515,7 @@ const
  
    // Search in /usr/share/qcad/... dir:
    if(!QFileInfo(path).exists()) {
@@ -28,3 +89,23 @@ $OpenBSD: patch-rconfig_cpp,v 1.1.1.1 2001/08/11 14:45:26 naddy Exp $
    }
  #endif
  
+@@ -559,7 +560,9 @@ RConfig::getLanguageName( QString _langu
+ }
+ 
+ 
+-
++/*
++ * Now handeled my Qt internally
++ *
+ QFont::CharSet
+ RConfig::getLanguageCharset( QString _languageName )
+ {
+@@ -572,7 +575,7 @@ RConfig::getLanguageCharset( QString _la
+ 
+   return QFont::Latin1;
+ }
+-
++*/
+ 
+ 
+ 

cad/qcad/patches/patch-rconfig_h

@@ -0,0 +1,21 @@
+$OpenBSD: patch-rconfig_h,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rconfig.h.orig	Wed May  8 00:23:36 2002
++++ rconfig.h	Wed May  8 00:39:04 2002
+@@ -63,7 +63,7 @@ public:
+ 
+   QString getLanguageSign( QString _languageName );
+   QString getLanguageName( QString _languageSign );
+-  QFont::CharSet getLanguageCharset( QString _languageName );
++  // QFont::CharSet getLanguageCharset( QString _languageName );
+   int     getLanguageNum();
+   QString getLanguage(int _index);
+ 
+@@ -83,7 +83,7 @@ private:
+   struct languageStruct {      // Struct for a language
+     QString name;              // Name of Language ("English")
+     QString sign;              // Sign of Language ("en")
+-    QFont::CharSet charset;    // Char set of this language (Latin1, Latin2, ...)
++    //    QFont::CharSet charset;    // Char set of this language (Latin1, Latin2, ...)
+   };
+   QList<languageStruct> languageList;
+ 

cad/qcad/patches/patch-rfile_cpp

@@ -1,6 +1,15 @@
-$OpenBSD: patch-rfile_cpp,v 1.1.1.1 2001/08/11 14:45:26 naddy Exp $
+$OpenBSD: patch-rfile_cpp,v 1.2 2002/05/17 18:39:46 naddy Exp $
 --- rfile.cpp.orig	Sun Mar 25 03:17:10 2001
-+++ rfile.cpp	Thu Aug  9 03:34:06 2001
++++ rfile.cpp	Wed May  8 00:51:25 2002
+@@ -255,7 +255,7 @@ fileGetFormatInfo(const QString& _file, 
+             RLOG("\nValue: ");
+             RLOG(fValue);
+             
+-            if(!stricmp(fName, _name)) {
++            if(!qstricmp(fName, _name)) {
+               //strncpy(_value, fValue, _maxLength);
+               ret = fValue;
+               done=true;
 @@ -275,6 +275,10 @@ fileGetFormatInfo(const QString& _file, 
    return ret;
  }

cad/qcad/patches/patch-rfilebase_cpp

@@ -0,0 +1,32 @@
+$OpenBSD: patch-rfilebase_cpp,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rfilebase.cpp.orig	Sun Mar 25 03:17:10 2001
++++ rfilebase.cpp	Wed May 15 01:54:32 2002
+@@ -249,17 +249,17 @@ RFileBase::gotoBufLineString(char* _lstr
+ 
+ // Replace bynary Bytes (<32) by an other (given) byte:
+ //
+-void
+-RFileBase::replaceBinaryBytesBy(char _c)
+-{
+-  int bc;
+-
+-  for(bc=0; bc<(int)fSize; ++bc) {
+-    if(fBuf[bc]<32 && fBuf[bc]>=0) {
+-      fBuf[bc] = _c;
+-    }
+-  }
+-}
++//void
++//RFileBase::replaceBinaryBytesBy(char _c)
++//{
++// int bc;
++//
++//  for(bc=0; bc<(int)fSize; ++bc) {
++//    if(fBuf[bc]<32 && fBuf[bc]>=0) {
++//      fBuf[bc] = _c;
++//   }
++//  }
++//}
+ 
+ 
+ 

cad/qcad/patches/patch-rfilebase_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-rfilebase_h,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rfilebase.h.orig	Sun Mar 25 03:17:10 2001
++++ rfilebase.h	Wed May 15 01:54:32 2002
+@@ -45,7 +45,7 @@ public:
+   bool    gotoBufLine(char* _lstr);
+   bool    gotoBufLineString(char* _lstr);
+ 
+-  void    replaceBinaryBytesBy(char _c);
++//  void    replaceBinaryBytesBy(char _c);
+   void    separateBuf(char _c1=13,
+                       char _c2=10,
+                       char _c3=0,

cad/qcad/patches/patch-rfiledgn_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-rfiledgn_cpp,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rfiledgn.cpp.orig	Wed May 15 01:25:37 2002
++++ rfiledgn.cpp	Wed May 15 01:44:55 2002
+@@ -114,7 +114,7 @@ if(Open())
+   	  }
+   	} else
+   		at(offset + ((filehead.words+2)*2)-DGNELM_HDR_SIZE);
+-  }while(at() < (int)size());
++  }while(at() < (uint)size());
+ 
+   graphic->terminateAction();
+ 

cad/qcad/patches/patch-rfontdialog_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-rfontdialog_cpp,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rfontdialog.cpp.orig	Sun Mar 25 03:17:10 2001
++++ rfontdialog.cpp	Thu May  9 05:02:05 2002
+@@ -648,7 +648,7 @@ RFontDialog::cutText() 
+ void
+ RFontDialog::copyText() 
+ {
+-  meText->copyText();
++  meText->copy();
+ }
+ 
+ 

cad/qcad/patches/patch-rgraphic_h

@@ -0,0 +1,11 @@
+$OpenBSD: patch-rgraphic_h,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rgraphic.h.orig	Sun Mar 25 03:17:10 2001
++++ rgraphic.h	Wed May  8 01:59:21 2002
+@@ -23,6 +23,7 @@
+ #include <qframe.h>
+ #include <qlist.h>
+ #include <qstack.h>
++#include <qcursor.h>
+ 
+ #include "relement.h"
+ #include "rflags.h"

cad/qcad/patches/patch-rhelpwindow_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-rhelpwindow_cpp,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rhelpwindow.cpp.orig	Wed May  8 02:06:58 2002
++++ rhelpwindow.cpp	Wed May  8 02:12:57 2002
+@@ -47,7 +47,7 @@ RHelpWindow::RHelpWindow( const QString&
+ 
+   setCentralWidget( browser );
+   
+-  browser->setLinkColor( QColor("#626993") );
++  //browser->setLinkColor( QColor("#626993") );
+   // Too slow :(
+   //browser->setPaper( QBrush( QColor("#FFFFFF"), QPixmap( tile_xpm )) );
+ 

cad/qcad/patches/patch-rhelpwindow_h

@@ -0,0 +1,11 @@
+$OpenBSD: patch-rhelpwindow_h,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rhelpwindow.h.orig	Wed May  8 02:17:04 2002
++++ rhelpwindow.h	Wed May  8 02:16:17 2002
+@@ -18,6 +18,7 @@
+ #include <qstringlist.h>
+ #include <qmap.h>
+ #include <qdir.h>
++#include <qpainter.h>
+ 
+ class RHelpWindow : public QMainWindow
+ {

cad/qcad/patches/patch-rinitialdialog_cpp

@@ -0,0 +1,17 @@
+$OpenBSD: patch-rinitialdialog_cpp,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rinitialdialog.cpp.orig	Wed May  8 00:31:50 2002
++++ rinitialdialog.cpp	Wed May  8 00:33:11 2002
+@@ -119,9 +119,12 @@ RInitialDialog::accept()
+   //
+   RCONFIG->addSetting( "Language:Language",
+                        RCONFIG->getLanguageSign(cbLanguage->currentText()) );
+-
++ /*
++  * Now handled by Qt 3
++  *
+   RCONFIG->addSetting( "Application:Charset",
+                        mtCharsetToString( RCONFIG->getLanguageCharset( cbLanguage->currentText() ) ) );
++  */
+ 
+   // CAD:
+   //

cad/qcad/patches/patch-rlayerwidget_cpp

@@ -0,0 +1,20 @@
+$OpenBSD: patch-rlayerwidget_cpp,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rlayerwidget.cpp.orig	Thu May 16 21:57:48 2002
++++ rlayerwidget.cpp	Thu May 16 22:00:09 2002
+@@ -282,7 +282,7 @@ RLayerWidget::updateLayerList()
+             newItem = new RListBoxItem(lay->getName(), *pxmHidden);
+           }
+ 
+-          layerList->inSort(newItem);
++          layerList->insertItem(newItem);
+ 
+           if( lay->getName()==selStr ) {
+             selItem = newItem;
+@@ -294,6 +294,7 @@ RLayerWidget::updateLayerList()
+       }
+       //layerList->setAutoUpdate(true);
+     }
++    layerList->sort();
+     layerList->repaint();
+ 
+     if( selItem ) layerList->setCurrentItem( selItem );

cad/qcad/patches/patch-rlibrarybrowser_h

@@ -0,0 +1,11 @@
+$OpenBSD: patch-rlibrarybrowser_h,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rlibrarybrowser.h.orig	Sun Mar 25 03:17:10 2001
++++ rlibrarybrowser.h	Wed May  8 02:37:34 2002
+@@ -12,6 +12,7 @@
+ 
+ #include <qlabel.h>
+ #include <qlist.h>
++#include <qstringlist.h>
+ 
+ #include "rwidget.h"
+ 

cad/qcad/patches/patch-rmath_cpp

@@ -0,0 +1,22 @@
+$OpenBSD: patch-rmath_cpp,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rmath.cpp.orig	Wed May  8 02:39:51 2002
++++ rmath.cpp	Wed May  8 02:42:14 2002
+@@ -1034,7 +1034,8 @@ mtGetPageHeightMM( PageFormat _pf )
+ }
+ 
+ 
+-
++/* Not needed for Qt 3
++ *
+ QFont::CharSet
+ mtStringToCharset( const QString &_cs, bool *ok )
+ {
+@@ -1136,7 +1137,7 @@ mtCharsetToString( QFont::CharSet _cs )
+ 
+   return "ISO-8859-1";
+ }
+-
++*/
+ 
+ /** Calculates a mathematical expression using the
+     expression parser classes from Giovanni Dicanio

cad/qcad/patches/patch-rmath_h

@@ -0,0 +1,16 @@
+$OpenBSD: patch-rmath_h,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rmath.h.orig	Tue May  7 23:54:20 2002
++++ rmath.h	Wed May  8 00:37:59 2002
+@@ -75,8 +75,12 @@ QString     mtPageFormatToString( PageFo
+ double      mtGetPageWidthMM( PageFormat _pf );
+ double      mtGetPageHeightMM( PageFormat _pf );
+ 
++/*
++ * Not needed in Qt 3
++ *
+ QFont::CharSet mtStringToCharset( const QString &_cs, bool *ok=0 );
+ QString     mtCharsetToString( QFont::CharSet _cs );
++*/
+ 
+ double      mtCalculate( const QString &_expression, double _default=0.0, bool *_ok=0 );
+ double      mtGetMM( double _v, Unit _unit );

cad/qcad/patches/patch-rmultilinedit_cpp

@@ -0,0 +1,23 @@
+$OpenBSD: patch-rmultilinedit_cpp,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rmultilinedit.cpp.orig	Sun Mar 25 03:17:10 2001
++++ rmultilinedit.cpp	Thu May  9 05:25:48 2002
+@@ -14,8 +14,9 @@
+ **
+ *****************************************************************************/
+ 
+-#include <qmultilinedit.h>
++#include <qmultilineedit.h>
+ #include <qfiledialog.h>
++#include <qframe.h>
+ 
+ #include "rmultilinedit.h"
+   
+@@ -153,7 +154,7 @@ RMultiLineEdit::saveFile()
+ void
+ RMultiLineEdit::resizeEvent(QResizeEvent *_ev)
+ {
+-  QTableView::resizeEvent( _ev );
++  QFrame::resizeEvent( _ev );
+ }
+ 
+ 

cad/qcad/patches/patch-rmultilinedit_h

@@ -0,0 +1,13 @@
+$OpenBSD: patch-rmultilinedit_h,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rmultilinedit.h.orig	Sun Mar 25 03:17:10 2001
++++ rmultilinedit.h	Thu May  9 05:25:26 2002
+@@ -16,8 +16,7 @@
+ #ifndef RMULTILINEDIT_H
+ #define RMULTILINEDIT_H
+ 
+-#include <qmultilinedit.h>
+-
++#include <qmultilineedit.h>
+ 
+ class RMultiLineEdit : public QMultiLineEdit
+ {

cad/qcad/patches/patch-rpreferencesdialog_cpp

@@ -0,0 +1,57 @@
+$OpenBSD: patch-rpreferencesdialog_cpp,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rpreferencesdialog.cpp.orig	Sun Mar 25 03:17:10 2001
++++ rpreferencesdialog.cpp	Thu May  9 03:46:07 2002
+@@ -209,8 +209,10 @@ RPreferencesDialog::RPreferencesDialog(Q
+       }
+       cbLanguage->setEditText( RCONFIG->getLanguageName( RCONFIG->getSetting("Language:Language") ) );
+ 
++/* not needed for Qt3
+       connect( cbLanguage, SIGNAL(activated(const QString &)),
+              this, SLOT(slotLanguageChanged(const QString &)) );
++*/
+ 
+       bl->addStretch( 100 );
+   }
+@@ -234,12 +236,14 @@ RPreferencesDialog::RPreferencesDialog(Q
+       cb->setEditText( RCONFIG->getSetting("Application:FontName") );
+       cbFontName = cb;
+ 
++/* Not needed for Qt 3
+       // Charset:
+       new QLabel( tr("Charset"), gb );
+       cb = new RComboBox( true, gb );
+       cb->fillInCharsets();
+       cb->setEditText( RCONFIG->getSetting("Application:Charset") );
+       cbCharset = cb;
++*/
+ 
+       // Font sizes box:
+       gb = new QGroupBox( 2, Horizontal, tr("Font sizes"), wdg );
+@@ -803,8 +807,8 @@ RPreferencesDialog::accept()
+     //
+     RCONFIG->addSetting( "Application:FontName",
+                          cbFontName->currentText() );
+-    RCONFIG->addSetting( "Application:Charset",
+-                         cbCharset->currentText() );
++    // RCONFIG->addSetting( "Application:Charset",
++    //                     cbCharset->currentText() );
+     RCONFIG->addSetting( "Application:FontSize0",
+                          cbFontSize0->currentText() );
+     RCONFIG->addSetting( "Application:FontSize1",
+@@ -1163,14 +1167,13 @@ RPreferencesDialog::slotPageFormatChange
+ 
+ 
+ /** Slot language changed -> adjust charset
+-*/
++* Now handled by Qt 3
+ void
+ RPreferencesDialog::slotLanguageChanged(const QString &)
+ {
+   cbCharset->setEditText( mtCharsetToString( RCONFIG->getLanguageCharset( cbLanguage->currentText() ) ) );
+ }
+-
+-
++*/
+ 
+ /** Slot page orientation changed -> swap width/height
+ */

cad/qcad/patches/patch-rpreferencesdialog_h

@@ -0,0 +1,21 @@
+$OpenBSD: patch-rpreferencesdialog_h,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rpreferencesdialog.h.orig	Sun Mar 25 03:17:10 2001
++++ rpreferencesdialog.h	Thu May  9 03:49:08 2002
+@@ -37,7 +37,7 @@ protected slots:
+   void slotScaleTypeChanged(const QString &);
+   void slotScaleChanged(const QString &);
+   void slotPageFormatChanged(const QString &);
+-  void slotLanguageChanged(const QString &);
++  // void slotLanguageChanged(const QString &);
+   void slotPortrait();
+   void slotLandscape();
+ 
+@@ -54,7 +54,7 @@ private:
+   RComboBox *cbLanguage;
+ 
+   RComboBox *cbFontName;
+-  RComboBox *cbCharset;
++  //RComboBox *cbCharset;
+   RComboBox *cbFontSize0;
+   RComboBox *cbFontSize1;
+   RComboBox *cbFontSize2;

cad/qcad/patches/patch-rtoolbar_h

@@ -0,0 +1,15 @@
+$OpenBSD: patch-rtoolbar_h,v 1.1 2002/05/17 18:39:46 naddy Exp $
+--- rtoolbar.h.orig	Sun Mar 25 03:17:10 2001
++++ rtoolbar.h	Thu May  9 04:59:13 2002
+@@ -34,9 +34,9 @@ public:
+       \param _name Name
+   */
+   RToolBar(const QString& _label, QMainWindow* _parent,
+-           QMainWindow::ToolBarDock _dock= QMainWindow::Top, 
++           ToolBarDock _dock = DockTop, 
+            bool _newLine = false,
+-           const char* _name=0);
++           const char* _name = 0);
+   /*! Destructor
+   */
+   ~RToolBar();

cad/qcad/pkg/PLIST

@@ -1,11 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/08/11 14:45:26 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.2 2002/05/17 18:39:46 naddy Exp $
 bin/qcad
-share/doc/qcad/AUTHORS
-share/doc/qcad/COPYING
-share/doc/qcad/INSTALL
-share/doc/qcad/MANIFEST
-share/doc/qcad/README
-share/doc/qcad/TODO
 share/doc/qcad/en/001.html
 share/doc/qcad/en/002.html
 share/doc/qcad/en/003.html