From owner-freebsd-ports Sat Aug 31 2:41:12 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A608237B40E for ; Sat, 31 Aug 2002 02:40:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5498243E65 for ; Sat, 31 Aug 2002 02:40:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7V9e2JU065262 for ; Sat, 31 Aug 2002 02:40:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7V9e2gI065261; Sat, 31 Aug 2002 02:40:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A276B37B406 for ; Sat, 31 Aug 2002 02:34:36 -0700 (PDT) Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB49643E81 for ; Sat, 31 Aug 2002 02:34:30 -0700 (PDT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.12.4/8.12.4) with ESMTP id g7V9YSOT041135 for ; Sat, 31 Aug 2002 02:34:28 -0700 (PDT) (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.12.4/8.12.4/Submit) id g7V9YSwe041134; Sat, 31 Aug 2002 02:34:28 -0700 (PDT) Message-Id: <200208310934.g7V9YSwe041134@www.freebsd.org> Date: Sat, 31 Aug 2002 02:34:28 -0700 (PDT) From: KATO Tsuguru To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/42237: Update port: cad/qcad to 1.5.1 (fix ports/41335) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 42237 >Category: ports >Synopsis: Update port: cad/qcad to 1.5.1 (fix ports/41335) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Aug 31 02:40:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.6.2-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.5.1 New file: files/patch-rcadwidget.cpp files/patch-rconfig.cpp files/patch-relement.cpp files/patch-rfile.cpp files/patch-rfonts.cpp files/patch-rprgdef.h Remove file: files/patch-aa files/patch-ab files/patch-ac files/patch-ad files/patch-ae files/patch-af This PR supersedes following PR. [2002/08/05] ports/41355 ports Update port: cad/qcad to 1.5.1 >How-To-Repeat: >Fix: diff -urN /usr/ports/cad/qcad/Makefile cad/qcad/Makefile --- /usr/ports/cad/qcad/Makefile Fri Aug 23 18:48:20 2002 +++ cad/qcad/Makefile Sat Aug 31 00:47:55 2002 @@ -6,16 +6,15 @@ # PORTNAME= qcad -PORTVERSION= 1.4.16 +PORTVERSION= 1.5.1 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION}-src -MAINTAINER= kde@freebsd.org +MAINTAINER= kde@FreeBSD.org USE_QT_VER= 2 -USE_REINPLACE= yes MAKE_ENV= MOC="${MOC}" LIBQT="-l${QTNAME}" \ QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}" @@ -24,9 +23,6 @@ .if ${MACHINE_ARCH} == "alpha" CFLAGS+= -O0 .endif - -post-patch: - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/qcad ${PREFIX}/bin diff -urN /usr/ports/cad/qcad/distinfo cad/qcad/distinfo --- /usr/ports/cad/qcad/distinfo Mon Aug 5 19:00:22 2002 +++ cad/qcad/distinfo Mon Aug 5 19:01:58 2002 @@ -1 +1 @@ -MD5 (qcad-1.4.16-src.tar.gz) = d54d41e3229dddf1323b838563348f93 +MD5 (qcad-1.5.1-src.tar.gz) = bb4b6e2f6a211a27c0588895e7446e09 diff -urN /usr/ports/cad/qcad/files/patch-Makefile cad/qcad/files/patch-Makefile --- /usr/ports/cad/qcad/files/patch-Makefile Thu Jan 1 09:00:00 1970 +++ cad/qcad/files/patch-Makefile Tue Aug 6 05:02:59 2002 @@ -0,0 +1,43 @@ +--- Makefile.orig Sun Aug 4 00:45:51 2002 ++++ Makefile Mon Aug 5 19:25:04 2002 +@@ -8,22 +8,22 @@ + + ####### Compiler, tools and options + +-CC = gcc +-CXX = g++ ++CC ?= gcc ++CXX ?= g++ + LEX = flex + YACC = yacc +-CFLAGS = -pipe -Wall -W -O2 -DQT_NO_DEBUG +-CXXFLAGS = -pipe -Wall -W -O2 -DQT_NO_DEBUG ++CFLAGS += -DQT_NO_DEBUG -DDATADIR=\"${PREFIX}/share\" ++CXXFLAGS += -DQT_NO_DEBUG -DDATADIR=\"${PREFIX}/share\" + LEXFLAGS = + YACCFLAGS= -d +-INCPATH = -I$(QTDIR)/include -I$(QTDIR)/mkspecs/linux-g++ +-LINK = g++ ++INCPATH = ${QTCPPFLAGS} ++LINK = ${CXX} + LFLAGS = +-LIBS = $(SUBLIBS) -Wl,-rpath,$(QTDIR)/lib -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm ++LIBS = ${QTCFGLIBS} ${LIBQT} + AR = ar cqs + RANLIB = +-MOC = $(QTDIR)/bin/moc +-UIC = $(QTDIR)/bin/uic ++MOC ?= ${X11BASE}/bin/moc2 ++UIC ?= ${X11BASE}/bin/uic + QMAKE = qmake + TAR = tar -cf + GZIP = gzip -9f +@@ -414,7 +414,7 @@ + + ####### Build rules + +-all: Makefile $(TARGET) ++all: $(TARGET) + + $(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) diff -urN /usr/ports/cad/qcad/files/patch-aa cad/qcad/files/patch-aa --- /usr/ports/cad/qcad/files/patch-aa Fri May 31 19:08:17 2002 +++ cad/qcad/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,29 +0,0 @@ ---- Makefile.orig Mon May 27 00:08:53 2002 -+++ Makefile Thu May 30 02:58:38 2002 -@@ -7,16 +7,16 @@ - - ####### Compiler, tools and options - --CC = gcc --CXX = g++ --CFLAGS = -pipe -Wall -W -O2 -DNO_DEBUG --CXXFLAGS= -pipe -Wall -W -O2 -DNO_DEBUG --INCPATH = -I$(QTDIR)/include --LINK = g++ --LFLAGS = -static --LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm --MOC = $(QTDIR)/bin/moc --UIC = $(QTDIR)/bin/uic -+CC ?= gcc -+CXX ?= g++ -+CFLAGS += -DNO_DEBUG -+CXXFLAGS+= -DNO_DEBUG -+INCPATH = ${QTCPPFLAGS} -+LINK = ${CXX} -+LFLAGS = -+LIBS = ${QTCFGLIBS} ${LIBQT} -+MOC ?= ${X11BASE}/bin/moc2 -+UIC ?= ${X11BASE}/bin/uic - - TAR = tar -cf - GZIP = gzip -9f diff -urN /usr/ports/cad/qcad/files/patch-ab cad/qcad/files/patch-ab --- /usr/ports/cad/qcad/files/patch-ab Sat Oct 14 05:19:12 2000 +++ cad/qcad/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- rappwin.cpp.orig Sat Aug 12 03:31:54 2000 -+++ rappwin.cpp Sat Sep 23 14:37:46 2000 -@@ -3292,7 +3292,7 @@ - case 0: - if(true) { - if(!QFileInfo(manualStr).exists()) { -- manualStr = " /usr/share/doc/qcad/html/index.html"; -+ manualStr = " %%PREFIX%%/share/doc/qcad/html/index.html"; - } - - RLOG("\nEXEC:"); diff -urN /usr/ports/cad/qcad/files/patch-ac cad/qcad/files/patch-ac --- /usr/ports/cad/qcad/files/patch-ac Sat Oct 14 05:19:12 2000 +++ cad/qcad/files/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- rconfig.cpp.orig Sat Sep 23 14:33:24 2000 -+++ rconfig.cpp Sat Sep 23 14:36:05 2000 -@@ -178,7 +178,7 @@ - addSetting( "Print:PrintAdjustmentFactor", "1.0"); - - addSetting( "Paths:BrowserPath", (RUNNING_WINDOWS ? "C:\\Progra~1\\Intern~1\\Iexplore.exe" : "netscape")); -- addSetting( "Paths:LibraryPath1", "/usr/share/qcad/libraries" ); -+ addSetting( "Paths:LibraryPath1", "%%PREFIX%%/share/qcad/libraries" ); - - verbose=false; - } -@@ -579,7 +579,7 @@ - - // Search in /usr/share/qcad/... dir: - if(!QFileInfo(path).exists()) { -- path = QString("/usr/share/")+DEF_APPNAME_L+"/"+_relPath; -+ path = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/"+_relPath; - } - #endif - diff -urN /usr/ports/cad/qcad/files/patch-ad cad/qcad/files/patch-ad --- /usr/ports/cad/qcad/files/patch-ad Sat Oct 14 05:19:12 2000 +++ cad/qcad/files/patch-ad Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- relement.cpp.orig Sat Aug 12 03:31:54 2000 -+++ relement.cpp Sat Sep 23 14:37:06 2000 -@@ -3681,7 +3681,7 @@ - - // Search pattern in /usr/share//hatches dir: - if(!QFileInfo(patternPath).exists()) { -- patternPath = QString("/usr/share/")+DEF_APPNAME_L+"/hatches/"+_pattern+".dxf"; -+ patternPath = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/hatches/"+_pattern+".dxf"; - } - #endif - */ diff -urN /usr/ports/cad/qcad/files/patch-ae cad/qcad/files/patch-ae --- /usr/ports/cad/qcad/files/patch-ae Sat Oct 14 05:19:12 2000 +++ cad/qcad/files/patch-ae Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- rfile.cpp.orig Sat Aug 12 03:31:54 2000 -+++ rfile.cpp Sat Sep 23 14:38:35 2000 -@@ -295,7 +295,7 @@ - - #ifndef DEF_WINDOWS - // Test /usr/share//...: -- ret = QString("/usr/share/")+DEF_APPNAME_L+subdir+"/"+_name; -+ ret = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+subdir+"/"+_name; - RLOG("\nret2: "); RLOG(ret); - if(QFileInfo(ret).exists()) return ret; - -@@ -327,7 +327,7 @@ - #ifndef DEF_WINDOWS - if(_prior==0 || _prior==2) { - // Test /usr/share//...: -- ret = QString("/usr/share/")+DEF_APPNAME_L+"/"+_subdir; -+ ret = QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/"+_subdir; - if(QFileInfo(ret).exists()) return ret; - } - diff -urN /usr/ports/cad/qcad/files/patch-af cad/qcad/files/patch-af --- /usr/ports/cad/qcad/files/patch-af Sat Oct 14 05:19:12 2000 +++ cad/qcad/files/patch-af Thu Jan 1 09:00:00 1970 @@ -1,14 +0,0 @@ ---- rfonts.cpp.orig Sat Aug 12 03:31:54 2000 -+++ rfonts.cpp Sat Sep 23 14:39:57 2000 -@@ -68,10 +68,7 @@ - - #ifndef DEF_WINDOWS - // Lookup from /usr/share//fonts: -- lookupFonts( QString("/usr/share/")+DEF_APPNAME_L+"/fonts" ); -- -- // Lookup from /usr/local//fonts: -- lookupFonts( QString("/usr/local/")+DEF_APPNAME_L+"/fonts" ); -+ lookupFonts( QString("%%PREFIX%%/share/")+DEF_APPNAME_L+"/fonts" ); - - // Lookup from ~/./fonts: - lookupFonts( RCONFIG->getConfigDir().path()+"/fonts" ); diff -urN /usr/ports/cad/qcad/files/patch-rcadwidget.cpp cad/qcad/files/patch-rcadwidget.cpp --- /usr/ports/cad/qcad/files/patch-rcadwidget.cpp Thu Jan 1 09:00:00 1970 +++ cad/qcad/files/patch-rcadwidget.cpp Tue Aug 6 03:07:24 2002 @@ -0,0 +1,16 @@ +--- rcadwidget.cpp.orig Sun Aug 4 00:45:51 2002 ++++ rcadwidget.cpp Tue Aug 6 03:07:12 2002 +@@ -38,9 +38,12 @@ + :RWidget(_parent, _name, _f) + { + graphic=0; +- //setBackgroundColor(darkGray); ++#if QT_VERSION >= 300 + //setEraseColor(darkGray); + setEraseColor(rDarkGray); ++#else ++ setBackgroundColor(darkGray); ++#endif + layerWidget=new RLayerWidget(_rw, this, "rlayerwidget"); + layerWidget->hide(); + libraryBrowser=0; diff -urN /usr/ports/cad/qcad/files/patch-rconfig.cpp cad/qcad/files/patch-rconfig.cpp --- /usr/ports/cad/qcad/files/patch-rconfig.cpp Thu Jan 1 09:00:00 1970 +++ cad/qcad/files/patch-rconfig.cpp Tue Aug 6 04:58:20 2002 @@ -0,0 +1,11 @@ +--- rconfig.cpp.orig Sun Aug 4 00:45:51 2002 ++++ rconfig.cpp Tue Aug 6 04:58:09 2002 +@@ -513,7 +513,7 @@ + + // Search in /usr/share/qcad/... dir: + if(!QFileInfo(path).exists()) { +- path = QString(DATADIR)+DEF_APPNAME_L+"/"+_relPath; ++ path = QString(DATADIR)+"/"+DEF_APPNAME_L+"/"+_relPath; + } + #endif + diff -urN /usr/ports/cad/qcad/files/patch-relement.cpp cad/qcad/files/patch-relement.cpp --- /usr/ports/cad/qcad/files/patch-relement.cpp Thu Jan 1 09:00:00 1970 +++ cad/qcad/files/patch-relement.cpp Tue Aug 6 05:00:06 2002 @@ -0,0 +1,11 @@ +--- relement.cpp.orig Sun Aug 4 00:45:51 2002 ++++ relement.cpp Tue Aug 6 04:59:49 2002 +@@ -3682,7 +3682,7 @@ + + // Search pattern in /usr/share//hatches dir: + if(!QFileInfo(patternPath).exists()) { +- patternPath = QString("/usr/share/")+DEF_APPNAME_L+"/hatches/"+_pattern+".dxf"; ++ patternPath = QString("DATADIR")+"/"+DEF_APPNAME_L+"/hatches/"+_pattern+".dxf"; + } + #endif + */ diff -urN /usr/ports/cad/qcad/files/patch-rfile.cpp cad/qcad/files/patch-rfile.cpp --- /usr/ports/cad/qcad/files/patch-rfile.cpp Thu Jan 1 09:00:00 1970 +++ cad/qcad/files/patch-rfile.cpp Tue Aug 6 05:57:30 2002 @@ -0,0 +1,20 @@ +--- rfile.cpp.orig Sun Aug 4 00:45:51 2002 ++++ rfile.cpp Tue Aug 6 05:57:14 2002 +@@ -293,7 +293,7 @@ + + #ifndef DEF_WINDOWS + // Test /usr/share//...: +- ret = QString(DATADIR)+DEF_APPNAME_L+subdir+"/"+_name; ++ ret = QString(DATADIR)+"/"+DEF_APPNAME_L+subdir+"/"+_name; + RLOG("\nret2: "); RLOG(ret); + if(QFileInfo(ret).exists()) return ret; + +@@ -325,7 +325,7 @@ + #ifndef DEF_WINDOWS + if(_prior==0 || _prior==2) { + // Test /usr/share//...: +- ret = QString(DATADIR)+DEF_APPNAME_L+"/"+_subdir; ++ ret = QString(DATADIR)+"/"+DEF_APPNAME_L+"/"+_subdir; + if(QFileInfo(ret).exists()) return ret; + } + diff -urN /usr/ports/cad/qcad/files/patch-rfonts.cpp cad/qcad/files/patch-rfonts.cpp --- /usr/ports/cad/qcad/files/patch-rfonts.cpp Thu Jan 1 09:00:00 1970 +++ cad/qcad/files/patch-rfonts.cpp Tue Aug 6 05:02:26 2002 @@ -0,0 +1,14 @@ +--- rfonts.cpp.orig Sun Aug 4 00:45:51 2002 ++++ rfonts.cpp Tue Aug 6 05:02:14 2002 +@@ -68,10 +68,7 @@ + + #ifndef DEF_WINDOWS + // Lookup from /usr/share//fonts: +- lookupFonts( QString(DATADIR)+DEF_APPNAME_L+"/fonts" ); +- +- // Lookup from /usr/local//fonts: +- lookupFonts( QString(DATADIR)+DEF_APPNAME_L+"/fonts" ); ++ lookupFonts( QString(DATADIR)+"/"+DEF_APPNAME_L+"/fonts" ); + + // Lookup from ~/./fonts: + lookupFonts( RCONFIG->getConfigDir().path()+"/fonts" ); diff -urN /usr/ports/cad/qcad/files/patch-rprgdef.h cad/qcad/files/patch-rprgdef.h --- /usr/ports/cad/qcad/files/patch-rprgdef.h Thu Jan 1 09:00:00 1970 +++ cad/qcad/files/patch-rprgdef.h Mon Aug 5 19:12:32 2002 @@ -0,0 +1,17 @@ +--- rprgdef.h.orig Sun Aug 4 00:45:51 2002 ++++ rprgdef.h Mon Aug 5 19:12:05 2002 +@@ -23,12 +23,14 @@ + + + // Uncomment for Linux ++/* + #define DEF_LINUX // Are we running Linux? + #define RUNNING_LINUX true + #define RUNNING_WINDOWS false + #define RUNNING_SOLARIS false + #define RUNNING_IRIX false + #define DATADIR "/usr/share" ++*/ + + + #ifdef __FreeBSD__ diff -urN /usr/ports/cad/qcad/pkg-plist cad/qcad/pkg-plist --- /usr/ports/cad/qcad/pkg-plist Mon Aug 5 19:00:23 2002 +++ cad/qcad/pkg-plist Tue Aug 6 03:32:27 2002 @@ -249,10 +249,22 @@ share/qcad/fonts/courier.cxf share/qcad/fonts/cursive.cxf share/qcad/fonts/cyrillic.cxf +share/qcad/fonts/hershey.txt +share/qcad/fonts/italicc.cxf +share/qcad/fonts/italiccs.cxf +share/qcad/fonts/italict.cxf share/qcad/fonts/japanese.cxf -share/qcad/fonts/latin2.cxf share/qcad/fonts/normal.cxf +share/qcad/fonts/normallatin2.cxf +share/qcad/fonts/romanc.cxf +share/qcad/fonts/romancs.cxf +share/qcad/fonts/romand.cxf +share/qcad/fonts/romanp.cxf share/qcad/fonts/romans.cxf +share/qcad/fonts/romans2.cxf +share/qcad/fonts/romant.cxf +share/qcad/fonts/scriptc.cxf +share/qcad/fonts/scripts.cxf share/qcad/fonts/symbol.cxf share/qcad/hatches/0.dxf share/qcad/hatches/135.dxf @@ -521,6 +533,25 @@ share/qcad/libraries/templates/fr/A4_NF.dxf share/qcad/libraries/templates/fr/nomenclature.dxf share/qcad/libraries/templates/pt/A2.dxf +share/qcad/messages/old/qcad_cs.qm +share/qcad/messages/old/qcad_de.qm +share/qcad/messages/old/qcad_es.qm +share/qcad/messages/old/qcad_et.qm +share/qcad/messages/old/qcad_eu.qm +share/qcad/messages/old/qcad_fi.qm +share/qcad/messages/old/qcad_fr.qm +share/qcad/messages/old/qcad_ga.qm +share/qcad/messages/old/qcad_gr.qm +share/qcad/messages/old/qcad_hu.qm +share/qcad/messages/old/qcad_it.qm +share/qcad/messages/old/qcad_jp.qm +share/qcad/messages/old/qcad_kr.qm +share/qcad/messages/old/qcad_nl.qm +share/qcad/messages/old/qcad_pl.qm +share/qcad/messages/old/qcad_pt.qm +share/qcad/messages/old/qcad_ru.qm +share/qcad/messages/old/qcad_sk.qm +share/qcad/messages/old/qcad_zh.qm share/qcad/messages/qcad.lang share/qcad/messages/qcad_cs.qm share/qcad/messages/qcad_de.qm @@ -762,6 +793,7 @@ %%PORTDOCS%%@exec ln -sf %D/share/doc/qcad %D/share/qcad/doc %%PORTDOCS%%@unexec rm -f %D/share/qcad/doc @dirrm share/qcad/xpm +@dirrm share/qcad/messages/old @dirrm share/qcad/messages @dirrm share/qcad/libraries/templates/pt @dirrm share/qcad/libraries/templates/fr >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message