summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-11-06 10:32:18 +0000
committerjoerg <joerg@pkgsrc.org>2006-11-06 10:32:18 +0000
commiteef94bce5ed57f840d8f6915a5661fa0f2d8d16d (patch)
tree01abf35a17eb885cd3903a7cca6bff21f44de1a6
parent8ca15a204ff6943efb78cfbadea7e48ce8496fbc (diff)
downloadpkgsrc-eef94bce5ed57f840d8f6915a5661fa0f2d8d16d.tar.gz
Switch to modular buildlinks.
-rw-r--r--x11/openmotif/Makefile16
-rw-r--r--x11/openmotif/buildlink3.mk10
2 files changed, 19 insertions, 7 deletions
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index f9ce1041043..15e5aff8632 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/05/21 11:41:59 rillig Exp $
+# $NetBSD: Makefile,v 1.50 2006/11/06 10:32:18 joerg Exp $
PKGVER= 2.2.3
DISTNAME= openMotif-${PKGVER}
@@ -11,6 +11,9 @@ MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://www.opengroup.org/openmotif/
COMMENT= The Open Group Motif toolkit for the X Window System
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
+
.include "../../mk/bsd.prefs.mk"
LICENSE= openmotif-license
@@ -35,9 +38,6 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
CONFLICTS+= lesstif-[0-9]*
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_X11BASE= yes
USE_LIBTOOL= yes
USE_TOOLS+= flex gmake tbl
GNU_CONFIGURE= yes
@@ -89,5 +89,11 @@ post-build:
${MV} -f $${manpage}.tblized $${manpage}; \
done
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xbitmaps/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk
index ec49c39fdf8..d0790fa1943 100644
--- a/x11/openmotif/buildlink3.mk
+++ b/x11/openmotif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/11/06 10:32:18 joerg Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENMOTIF_BUILDLINK3_MK:= ${OPENMOTIF_BUILDLINK3_MK}+
@@ -17,6 +17,12 @@ BUILDLINK_ABI_DEPENDS.openmotif?= openmotif>=2.2.3nb2
BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif
.endif # OPENMOTIF_BUILDLINK3_MK
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xbitmaps/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}