diff options
author | jlam <jlam@pkgsrc.org> | 2002-10-08 14:38:48 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2002-10-08 14:38:48 +0000 |
commit | 8548888a52a698d459ac8d9298b9123cd24ab3dd (patch) | |
tree | 4365a29e2f868961f89a5ffcb50fb7c8ef51f097 /misc | |
parent | a9f6119e453654067ee15a82910f161b64e02ff5 (diff) | |
download | pkgsrc-8548888a52a698d459ac8d9298b9123cd24ab3dd.tar.gz |
Combine Makefile.common and Makefile into one file again since the koffice3
package is no more.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/koffice11/Makefile | 40 | ||||
-rw-r--r-- | misc/koffice11/Makefile.common | 32 |
2 files changed, 33 insertions, 39 deletions
diff --git a/misc/koffice11/Makefile b/misc/koffice11/Makefile index 9dfa0790c43..3f3021eaa0e 100644 --- a/misc/koffice11/Makefile +++ b/misc/koffice11/Makefile @@ -1,20 +1,46 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/10/08 14:06:59 martti Exp $ +# $NetBSD: Makefile,v 1.2 2002/10/08 14:38:48 jlam Exp $ -.include "../koffice11/Makefile.common" - -DISTNAME= koffice-${VERSION} +DISTNAME= koffice-1.1.1 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/ MAINTAINER= packages@netbsd.org - -.include "../../x11/kde2/Makefile.kde2" +HOMEPAGE= http://www.koffice.org/ +COMMENT= KDE Office Suite with text processor, spreadsheet, etc. BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde -USE_BUILDLINK2= # defined +.include "../../mk/bsd.prefs.mk" +.include "../../x11/kde2/Makefile.kde2" + +USE_BUILDLINK2= # defined +REPLACE_PERL= kpresenter/kprconverter.pl + +# Ensure we export symbols in the linked shared object. +LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} + +.if ${OPSYS} == "NetBSD" +# +# 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/buildlink2.mk" .include "../../x11/kdebase2/buildlink2.mk" diff --git a/misc/koffice11/Makefile.common b/misc/koffice11/Makefile.common deleted file mode 100644 index a9a217a0156..00000000000 --- a/misc/koffice11/Makefile.common +++ /dev/null @@ -1,32 +0,0 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2002/10/08 14:06:59 martti Exp $ - -CATEGORIES= misc kde -VERSION= 1.1.1 -HOMEPAGE= http://www.koffice.org/ -COMMENT= KDE Office Suite with text processor, spreadsheet, etc. - -.include "../../mk/bsd.prefs.mk" - -REPLACE_PERL= kpresenter/kprconverter.pl - -# Ensure we export symbols in the linked shared object. -LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} - -.if ${OPSYS} == "NetBSD" -# 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/* |