Split Makefile into Makefile and Makefile.common, so we can build

koffice3 using most of the defined variables.  (*This* koffice does
not build under KDE3!)

Point MAINTAINER -> me upon Hubert weaseling out ;-)

2 files changed, 40 insertions, 35 deletions

diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index f47793e2828..b659bae0cc9 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,48 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:27 fredb Exp $
+# $NetBSD: Makefile,v 1.11 2002/06/20 19:13:50 jschauma Exp $
 
-DISTNAME=	koffice-1.1.1
+DISTNAME=	koffice-${VERSION}
 PKGREVISION=	1
-CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/koffice-1.1.1/src/ \
 		ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.1.1/src/ \
 		ftp://ftp.de.kde.org/pub/kde/stable/koffice-1.1.1/src/
 
 .include "../../x11/kde2/Makefile.kde2"
 
-MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://www.koffice.org/
-COMMENT=	KDE Office Suite with text processor, spreadsheet, etc.
+MAINTAINER=	jschauma@netbsd.org
 
 BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
 
-USE_BUILDLINK_ONLY=	YES
-
-.include "../../mk/bsd.prefs.mk"
-
-REPLACE_PERL=		kpresenter/kprconverter.pl
-
-.if ${OPSYS} == "NetBSD"
-LIBS+=			-Wl,--export-dynamic
-
-# On egcs-1.1.2, the C++ compiler system isn't quite ISO-compliant.  It lacks
-# a std::auto_ptr implementation in <memory>, doesn't handle static inline
-# functions in headers properly (although that concept, in itself, is quite
-# flawed), and just plain has bugs when compiling large functions with
-# optimization.  For certains parts of KOffice, we pass in
-# ${OPTIMIZATION_BUG_CXXFLAGS}, which is meant to be appended to
-# ${KDE_CXXFLAGS} so that it can turn off all code optimization by the
-# compiler.
-#
-MAKE_ENV+=		OPTIMIZATION_BUG_CXXFLAGS="-O0"
-.endif
-
-post-install:
-	@# The global desktop template files need to be user-writeable, or
-	@# else users won't be able to alter them after copying them to
-	@# their local directories.
-	${CHMOD} u+w ${PREFIX}/share/kde/templates/.source/*
-
 .include "../../x11/kde2/buildlink.mk"
 .include "../../x11/kdebase2/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
+.include "../../misc/koffice/Makefile.common"
diff --git a/misc/koffice/Makefile.common b/misc/koffice/Makefile.common
new file mode 100644
index 00000000000..7f13cc2baad
--- /dev/null
+++ b/misc/koffice/Makefile.common
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile.common,v 1.1 2002/06/20 19:13:50 jschauma Exp $
+
+CATEGORIES=	misc kde
+VERSION=	1.1.1
+HOMEPAGE=	http://www.koffice.org/
+COMMENT=	KDE Office Suite with text processor, spreadsheet, etc.
+
+USE_BUILDLINK_ONLY=	YES
+
+.include "../../mk/bsd.prefs.mk"
+
+REPLACE_PERL=		kpresenter/kprconverter.pl
+
+.if ${OPSYS} == "NetBSD"
+LIBS+=			-Wl,--export-dynamic
+
+# On egcs-1.1.2, the C++ compiler system isn't quite ISO-compliant.  It lacks
+# a std::auto_ptr implementation in <memory>, doesn't handle static inline
+# functions in headers properly (although that concept, in itself, is quite
+# flawed), and just plain has bugs when compiling large functions with
+# optimization.  For certains parts of KOffice, we pass in
+# ${OPTIMIZATION_BUG_CXXFLAGS}, which is meant to be appended to
+# ${KDE_CXXFLAGS} so that it can turn off all code optimization by the
+# compiler.
+#
+MAKE_ENV+=		OPTIMIZATION_BUG_CXXFLAGS="-O0"
+.endif
+
+post-install:
+	@# The global desktop template files need to be user-writeable, or
+	@# else users won't be able to alter them after copying them to
+	@# their local directories.
+	${CHMOD} u+w ${PREFIX}/share/kde/templates/.source/*
+
+.include "../../mk/x11.buildlink.mk"
+.include "../../mk/bsd.pkg.mk"