diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-20 11:44:15 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-20 11:44:15 +0000 |
| commit | d30c150a392b15645b59f724ddabe9f7e1bed006 (patch) | |
| tree | d6abb663a1ea247edcad075b0fe1a2d5b3326752 | |
| parent | 85bde80d48fcb1f3655a087b8f4a055e32e36baa (diff) | |
| download | pkgsrc-d30c150a392b15645b59f724ddabe9f7e1bed006.tar.gz | |
Don't put package specific stuff like USE_BUILDLINK_ONLY into the common
Makefile, and include x11.buildlink.mk and bsd.pkg.mk separately. This
will allow converting either to buildlink2 independently of the other.
| -rw-r--r-- | misc/koffice/Makefile | 6 | ||||
| -rw-r--r-- | misc/koffice/Makefile.common | 7 | ||||
| -rw-r--r-- | misc/koffice3/Makefile | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index b659bae0cc9..a4819371896 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/06/20 19:13:50 jschauma Exp $ +# $NetBSD: Makefile,v 1.12 2002/09/20 11:44:15 jlam Exp $ DISTNAME= koffice-${VERSION} PKGREVISION= 1 @@ -12,6 +12,10 @@ MAINTAINER= jschauma@netbsd.org BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde +USE_BUILDLINK_ONLY= # defined + .include "../../x11/kde2/buildlink.mk" .include "../../x11/kdebase2/buildlink.mk" .include "../../misc/koffice/Makefile.common" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/misc/koffice/Makefile.common b/misc/koffice/Makefile.common index ab075e32806..5db572a68de 100644 --- a/misc/koffice/Makefile.common +++ b/misc/koffice/Makefile.common @@ -1,12 +1,10 @@ -# $NetBSD: Makefile.common,v 1.2 2002/09/04 14:47:38 agc Exp $ +# $NetBSD: Makefile.common,v 1.3 2002/09/20 11:44:15 jlam 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 @@ -32,6 +30,3 @@ post-install: @# 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" diff --git a/misc/koffice3/Makefile b/misc/koffice3/Makefile index 7aba5087b65..d52a885326b 100644 --- a/misc/koffice3/Makefile +++ b/misc/koffice3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/08/01 05:48:17 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/20 11:44:16 jlam Exp $ DISTNAME= koffice PKGNAME= koffice3-${VERSION} @@ -15,8 +15,12 @@ PTHREAD_OPTS+= require WRKSRC= ${WRKDIR}/${DISTNAME}-${VERSION} PATCHDIR= ../../misc/koffice/patches DESCR_SRC= ../../misc/koffice/DESCR + +USE_BUILDLINK_ONLY= # defined .include "../../x11/kde3/buildlink.mk" .include "../../x11/kdebase3/buildlink.mk" .include "../../mk/pthread.buildlink.mk" .include "../../misc/koffice/Makefile.common" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" |