The "recent file list" has bugged me as long as I've used
qcad and I consider it a bug that it's reversed from
the usual sorting order. So I patched it to have the
newest entry in top, while there I patched few other things too:
- bumped pkg
- @bin marker
- specify gpl version in comment
- use of SUBST_CMD
Index: Makefile
===================================================================
RCS file: /cvs/ports/cad/qcad/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile 15 Sep 2007 21:36:57 -0000 1.16
+++ Makefile 24 Jun 2008 13:42:08 -0000
@@ -4,12 +4,12 @@
V= 2.0.5.0
DISTNAME= qcad-${V}-1-community.src
-PKGNAME= qcad-${V}
+PKGNAME= qcad-${V}p0
CATEGORIES= cad graphics
HOMEPAGE= http://www.ribbonsoft.com/qcad.html
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@@ -30,13 +30,12 @@
MAKE_ENV+= QTDIR=${MODQT_LIBDIR} \
MAKE=${MAKE_PROGRAM}
+SUBST_VARS= CXXFLAGS LOCALBASE MODQT_LIBDIR
+
pre-configure:
- @perl -pi -e 's,!!CXXFLAGS!!,${CXXFLAGS},' ${WRKSRC}/mkspecs/defs.pro
- @perl -pi -e 's,!!DOCDIR!!,${PREFIX}/share/doc/qcad,' \
- ${WRKSRC}/qcadlib/src/engine/rs_system.h
- @perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},' \
- ${WRKSRC}/qcadlib/src/engine/rs_system.cpp
- @perl -pi -e 's,!!QTDIR!!,${MODQT_LIBDIR},' \
+ ${SUBST_CMD} ${WRKSRC}/mkspecs/defs.pro \
+ ${WRKSRC}/qcadlib/src/engine/rs_system.h \
+ ${WRKSRC}/qcadlib/src/engine/rs_system.cpp \
${WRKSRC}/qcad/src/qc_applicationwindow.cpp
do-build:
Index: patches/patch-mkspecs_defs_pro
===================================================================
RCS file: /cvs/ports/cad/qcad/patches/patch-mkspecs_defs_pro,v
retrieving revision 1.1
diff -u -r1.1 patch-mkspecs_defs_pro
--- patches/patch-mkspecs_defs_pro 9 Jan 2007 16:30:37 -0000 1.1
+++ patches/patch-mkspecs_defs_pro 24 Jun 2008 13:42:08 -0000
@@ -5,8 +5,8 @@
# $Id: patch-mkspecs_defs_pro,v 1.1 2007/01/09 16:30:37 steven Exp $
-QMAKE_CXXFLAGS_DEBUG += -pedantic
-QMAKE_CXXFLAGS += -pedantic
-+QMAKE_CXXFLAGS_DEBUG += !!CXXFLAGS!!
-+QMAKE_CXXFLAGS += !!CXXFLAGS!!
++QMAKE_CXXFLAGS_DEBUG += ${CXXFLAGS}
++QMAKE_CXXFLAGS += ${CXXFLAGS}
+QMAKE_CXXFLAGS_RELEASE =
win32 {
Index: patches/patch-qcad_src_qc_applicationwindow_cpp
===================================================================
RCS file: /cvs/ports/cad/qcad/patches/patch-qcad_src_qc_applicationwindow_cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-qcad_src_qc_applicationwindow_cpp
--- patches/patch-qcad_src_qc_applicationwindow_cpp 9 Jan 2007 16:30:37
-0000 1.1
+++ patches/patch-qcad_src_qc_applicationwindow_cpp 24 Jun 2008 13:42:08
-0000
@@ -1,12 +1,24 @@
$OpenBSD: patch-qcad_src_qc_applicationwindow_cpp,v 1.1 2007/01/09 16:30:37
steven Exp $
---- qcad/src/qc_applicationwindow.cpp.orig Sat Jan 6 16:31:24 2007
-+++ qcad/src/qc_applicationwindow.cpp Sat Jan 6 16:54:10 2007
-@@ -2943,7 +2943,7 @@ void QC_ApplicationWindow::slotHelpManua
+--- qcad/src/qc_applicationwindow.cpp.orig Tue Nov 22 13:49:33 2005
++++ qcad/src/qc_applicationwindow.cpp Mon Jun 23 21:36:49 2008
+@@ -1581,9 +1581,9 @@ void QC_ApplicationWindow::updateRecentFilesMenu() {
+ RS_DEBUG->print("QC_ApplicationWindow::updateRecentFilesMenu()");
+
+ RS_DEBUG->print("Updating recent file menu...");
+- for (int i=0; i<recentFiles->getNumber(); ++i) {
++ for (int i=recentFiles->getNumber(); i>=0; --i) {
+ QString label = QString( "&%1 %2" ).
+- arg(i+1).arg(recentFiles->get(i));
++
arg(recentFiles->getNumber()-i).arg(recentFiles->get(i));
+
+ if (fileMenu->findItem(i)) {
+ RS_DEBUG->print("Changeing item %d", i);
+@@ -2943,7 +2943,7 @@ void QC_ApplicationWindow::slotHelpManual() {
RS_SYSTEM->getAppDir().latin1());
RS_DEBUG->print("QC_ApplicationWindow::slotHelpManual(): appdir: %s",
RS_SYSTEM->getAppDir().latin1());
- assistant = new QAssistantClient(RS_SYSTEM->getAppDir()+"/bin", this);
-+ assistant = new QAssistantClient("!!QTDIR!!/bin", this);
++ assistant = new QAssistantClient("${MODQT_LIBDIR}/bin", this);
connect(assistant, SIGNAL(error(const QString&)),
this, SLOT(slotError(const QString&)));
QStringList args;
Index: patches/patch-qcadlib_src_engine_rs_system_cpp
===================================================================
RCS file: /cvs/ports/cad/qcad/patches/patch-qcadlib_src_engine_rs_system_cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-qcadlib_src_engine_rs_system_cpp
--- patches/patch-qcadlib_src_engine_rs_system_cpp 9 Jan 2007 16:30:38
-0000 1.1
+++ patches/patch-qcadlib_src_engine_rs_system_cpp 24 Jun 2008 13:42:08
-0000
@@ -8,7 +8,7 @@
- // Redhat style:
- dirList.append("/usr/share/" + appDirName);
+ // OpenBSD style:
-+ dirList.append("!!LOCALBASE!!/share/" + appDirName);
++ dirList.append("${LOCALBASE}/share/" + appDirName);
- // SuSE style:
- dirList.append("/usr/X11R6/" + appDirName);
@@ -31,7 +31,7 @@
-
- dirList.append("/usr/X11R6/share/" + appDirName + "/" + subDirectory);
+ // OpenBSD style:
-+ dirList.append("!!LOCALBASE!!/share/" + appDirName + "/" +
subDirectory);
++ dirList.append("${LOCALBASE}/share/" + appDirName + "/" +
subDirectory);
dirList.append(getHomeDir() + "/." + appDirName + "/" + subDirectory);
#ifdef __APPLE__
Index: patches/patch-qcadlib_src_engine_rs_system_h
===================================================================
RCS file: /cvs/ports/cad/qcad/patches/patch-qcadlib_src_engine_rs_system_h,v
retrieving revision 1.1
diff -u -r1.1 patch-qcadlib_src_engine_rs_system_h
--- patches/patch-qcadlib_src_engine_rs_system_h 9 Jan 2007 16:30:38
-0000 1.1
+++ patches/patch-qcadlib_src_engine_rs_system_h 24 Jun 2008 13:42:08
-0000
@@ -7,7 +7,7 @@
RS_String getDocPath() {
- RS_StringList lst = getDirectoryList("doc");
- return lst.first();
-+ return "!!DOCDIR!!";
++ return "${LOCALBASE}/share/doc/qcad";
}
/**
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/cad/qcad/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 9 Jan 2007 16:30:38 -0000 1.5
+++ pkg/PLIST 24 Jun 2008 13:42:08 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.5 2007/01/09 16:30:38 steven Exp $
-bin/qcad
[EMAIL PROTECTED] bin/qcad
share/doc/qcad/
share/doc/qcad/appendix.html
share/doc/qcad/appendix_bib.html
