Unbreak by fixing the build with gcc 3.4

No objections by: maintainer

6 files changed, 142 insertions, 10 deletions

diff --git a/sysutils/barry/Makefile b/sysutils/barry/Makefile
index 92329483717c..132128a176e2 100644
--- a/sysutils/barry/Makefile
+++ b/sysutils/barry/Makefile
@@ -23,16 +23,12 @@ USE_KDELIBS_VER=3
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
-pre-build:
-	${REINPLACE_CMD} "s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/Makefile
+post-patch:
+	@${FIND} ${WRKSRC} -name "*.h" -and -not -name "linklocator.h" | \
+		${XARGS} ${REINPLACE_CMD} -e 's/^};/}/g'
+	@${REINPLACE_CMD} "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
 
 pre-install:
-	${MKDIR} ${DESTDIR}${PREFIX}/share/applnk/Utilities
+	@${MKDIR} ${DESTDIR}${PREFIX}/share/applnk/Utilities
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/barry/files/patch-Makefile.in b/sysutils/barry/files/patch-Makefile.in
new file mode 100644
index 000000000000..5b741ce02b5f
--- /dev/null
+++ b/sysutils/barry/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Sun Apr 24 02:27:28 2005
++++ src/Makefile.in	Sun Apr 24 02:27:43 2005
+@@ -240,7 +240,7 @@
+ INCLUDES = $(all_includes)
+ 
+ barry_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+-barry_LDADD = $(LIB_KIO) $(LIB_KHTML)
++barry_LDADD = $(LIB_KIO) $(LIB_KHTML) $(LIBPTHREAD)
+ 
+ barry_SOURCES = actionprogressdialog.cc application.cc configdialog.cc \
+ 	databaseinfodialog.cc databasewrapper.cc dependlistview.cc \
diff --git a/sysutils/barry/files/patch-history.h b/sysutils/barry/files/patch-history.h
new file mode 100644
index 000000000000..8d02392e68d8
--- /dev/null
+++ b/sysutils/barry/files/patch-history.h
@@ -0,0 +1,92 @@
+--- src/history.h.bak	Sun Jun  8 22:09:10 2003
++++ src/history.h	Sun Apr 24 02:18:42 2005
+@@ -22,44 +22,7 @@
+ 
+ namespace Barry
+ {
+-	class History;
+-
+-	class Command
+-	{
+-		public:
+-			enum CreationFlags {
+-				None = 0x0, Run = 0x1, Register = 0x2
+-			};
+-			virtual ~Command();
+-
+-			template <class T>
+-			static T *create( CreationFlags flags = None )
+-			{
+-				T *cmd = new T;
+-				if ( flags & Register )
+-					History::self().registerCommand( cmd );
+-				if ( flags & Run )
+-					cmd->exec();
+-				return cmd;
+-			}
+-
+-			void unexec();
+-			void exec();
+-			virtual QString text() const = 0;
+-
+-		protected:
+-			Command();
+-			bool executed() const { return m_executed; }
+-
+-		private:
+-			Command( const Command &rhs );
+-			Command &operator=( const Command &rhs );
+-
+-			virtual void doExec() = 0;
+-			virtual void doUnexec() = 0;
+-
+-			bool m_executed;
+-	};
++	class Command;
+ 
+ 	class History : public QObject
+ 	{
+@@ -100,6 +63,43 @@
+ 			unsigned int m_maxEntries;
+ 			KToolBarPopupAction *m_backAction;
+ 			KToolBarPopupAction *m_forwardAction;
++	};
++
++	class Command
++	{
++		public:
++			enum CreationFlags {
++				None = 0x0, Run = 0x1, Register = 0x2
++			};
++			virtual ~Command();
++
++			template <class T>
++			static T *create( CreationFlags flags = None )
++			{
++				T *cmd = new T;
++				if ( flags & Register )
++					History::self().registerCommand( cmd );
++				if ( flags & Run )
++					cmd->exec();
++				return cmd;
++			}
++
++			void unexec();
++			void exec();
++			virtual QString text() const = 0;
++
++		protected:
++			Command();
++			bool executed() const { return m_executed; }
++
++		private:
++			Command( const Command &rhs );
++			Command &operator=( const Command &rhs );
++
++			virtual void doExec() = 0;
++			virtual void doUnexec() = 0;
++
++			bool m_executed;
+ 	};
+ };
+ 
diff --git a/sysutils/barry/files/patch-orphanedfilesdialog.cc b/sysutils/barry/files/patch-orphanedfilesdialog.cc
new file mode 100644
index 000000000000..9b8df25563c1
--- /dev/null
+++ b/sysutils/barry/files/patch-orphanedfilesdialog.cc
@@ -0,0 +1,11 @@
+--- src/orphanedfilesdialog.cc.orig	Sun Apr 24 02:21:02 2005
++++ src/orphanedfilesdialog.cc	Sun Apr 24 02:21:10 2005
+@@ -52,7 +52,7 @@
+ 			++i;
+ 		return i;
+ 	}
+-};
++}
+ 
+ using namespace Barry;
+ 
diff --git a/sysutils/barry/files/patch-port.cc b/sysutils/barry/files/patch-port.cc
new file mode 100644
index 000000000000..6b04f6133751
--- /dev/null
+++ b/sysutils/barry/files/patch-port.cc
@@ -0,0 +1,11 @@
+--- src/port.cc.orig	Sun Apr 24 02:21:49 2005
++++ src/port.cc	Sun Apr 24 02:21:55 2005
+@@ -64,7 +64,7 @@
+ 			QString m_link;
+ 			long long m_size;
+ 	};
+-};
++}
+ 
+ // This would be nice in Qt
+ template <class Container>
diff --git a/sysutils/barry/files/patch-portlistview.cc b/sysutils/barry/files/patch-portlistview.cc
new file mode 100644
index 000000000000..0681fd041528
--- /dev/null
+++ b/sysutils/barry/files/patch-portlistview.cc
@@ -0,0 +1,11 @@
+--- src/portlistview.cc.orig	Sun Apr 24 02:22:33 2005
++++ src/portlistview.cc	Sun Apr 24 02:22:41 2005
+@@ -42,7 +42,7 @@
+ 			QListViewItem *m_oldItem;
+ 			QListViewItem *m_newItem;
+ 	};
+-};
++}
+ 
+ using namespace Barry;
+