summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-pkgs/XFree86/Makefile.common11
-rw-r--r--misc/XFree86-dirs/Makefile23
-rw-r--r--misc/XFree86-dirs/Makefile.common42
-rw-r--r--misc/XFree86-dirs/dirs.mk37
-rw-r--r--mk/dirs.mk9
5 files changed, 75 insertions, 47 deletions
diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common
index 13e69363ec6..2e0d72f036b 100644
--- a/meta-pkgs/XFree86/Makefile.common
+++ b/meta-pkgs/XFree86/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2004/03/29 00:30:17 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.7 2004/04/14 21:15:01 jmmv Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -17,6 +17,9 @@
# src-6 contains the documentation source.
# src-7 contains the hardcopy documentation.
+.if !defined(XFREE86_MAKEFILE_COMMON)
+XFREE86_MAKEFILE_COMMON= # defined
+
.include "../../mk/bsd.prefs.mk"
#
@@ -95,6 +98,8 @@ MISCMAN_SUFFIX= ${MAN_SUFFIX}
.endif # NetBSD
+.if !defined(XFREE86_ONLY_DIRS)
+
PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR}
PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB}
PLIST_SUBST+= SHARED_LIB_MINOR=${SHARED_LIB_MINOR}
@@ -250,3 +255,7 @@ do-install:
. endif
.endif # NO_XFREE86_TARGETS
+
+.endif # !defined(XFREE86_ONLY_DIRS)
+
+.endif # !defined(XFREE86_MAKEFILE_COMMON)
diff --git a/misc/XFree86-dirs/Makefile b/misc/XFree86-dirs/Makefile
index 9a48bc4bff3..206afbf8461 100644
--- a/misc/XFree86-dirs/Makefile
+++ b/misc/XFree86-dirs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/03/28 21:55:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/14 21:15:01 jmmv Exp $
#
-DISTNAME= XFree86-dirs-${XFREE86_DIRS_VERSION}
+DISTNAME= XFree86-dirs-1.0
CATEGORIES= misc
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,7 +10,24 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= # empty
COMMENT= Shared XFree86 directories
-XFREE86_DIRS_REGISTER= yes
+NO_BUILD= # defined
+NO_BUILDLINK= # defined
+NO_CHECKSUM= # defined
+NO_CONFIGURE= # defined
+NO_EXTRACT= # defined
+NO_XFREE86_TARGETS= # defined
+USE_LANGUAGES= # empty
+USE_PKGINSTALL= yes
+WRKSRC= ${WRKDIR}
+
+XFREE86_ONLY_DIRS= # defined
+.include "../../mk/bsd.prefs.mk"
+.include "dirs.mk"
+
+_SORTED!= ${ECHO} ${XFREE86_DIRS} | ${TR} -s ' \t' '\n' | ${SORT}
+MAKE_DIRS+= ${_SORTED:S/^/${X11ROOT}\//}
+
+do-install: # nothing
.include "Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/XFree86-dirs/Makefile.common b/misc/XFree86-dirs/Makefile.common
deleted file mode 100644
index 9625abd2d59..00000000000
--- a/misc/XFree86-dirs/Makefile.common
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2004/03/28 21:55:49 xtraeme Exp $
-#
-
-XFREE86_DIRS_VERSION= 1.0
-
-WRKSRC= ${WRKDIR}
-USE_LANGUAGES= # empty
-USE_PKGINSTALL= yes
-NO_EXTRACT= # defined
-NO_CHECKSUM= # defined
-NO_BUILDLINK= # defined
-NO_CONFIGURE= # defined
-NO_BUILD= # defined
-NO_XFREE86_TARGETS= # defined
-
-XFREE86_DIRS= bin
-XFREE86_DIRS+= include
-XFREE86_DIRS+= include/X11
-XFREE86_DIRS+= include/X11/bitmaps
-XFREE86_DIRS+= lib
-XFREE86_DIRS+= lib/X11
-XFREE86_DIRS+= lib/X11/app-defaults
-XFREE86_DIRS+= lib/X11/config
-XFREE86_DIRS+= lib/X11/doc
-XFREE86_DIRS+= lib/X11/etc
-XFREE86_DIRS+= lib/X11/fonts
-XFREE86_DIRS+= lib/X11/fs
-XFREE86_DIRS+= ${MAN_DIR}
-XFREE86_DIRS+= ${LIBMAN_DIR}
-XFREE86_DIRS+= ${KERNMAN_DIR}
-XFREE86_DIRS+= ${FILEMAN_DIR}
-XFREE86_DIRS+= ${MISCMAN_DIR}
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../meta-pkgs/XFree86/Makefile.common"
-
-.if ${XFREE86_DIRS_REGISTER} == "yes"
-_SORTED!= ${ECHO} ${XFREE86_DIRS} | ${TR} -s ' \t' '\n' | ${SORT}
-MAKE_DIRS+= ${_SORTED:S/^/${X11ROOT}\//}
-.endif
-
-do-install: # nothing
diff --git a/misc/XFree86-dirs/dirs.mk b/misc/XFree86-dirs/dirs.mk
new file mode 100644
index 00000000000..279eb97e521
--- /dev/null
+++ b/misc/XFree86-dirs/dirs.mk
@@ -0,0 +1,37 @@
+# $NetBSD: dirs.mk,v 1.1 2004/04/14 21:15:01 jmmv Exp $
+#
+
+.if !defined(DIRS_XFREE86_MK)
+DIRS_XFREE86_MK= # defined
+
+.include "../../misc/XFree86-dirs/Makefile.common"
+
+XFREE86_DIRS= bin
+XFREE86_DIRS+= include
+XFREE86_DIRS+= include/X11
+XFREE86_DIRS+= include/X11/bitmaps
+XFREE86_DIRS+= lib
+XFREE86_DIRS+= lib/X11
+XFREE86_DIRS+= lib/X11/app-defaults
+XFREE86_DIRS+= lib/X11/config
+XFREE86_DIRS+= lib/X11/doc
+XFREE86_DIRS+= lib/X11/etc
+XFREE86_DIRS+= lib/X11/fonts
+XFREE86_DIRS+= lib/X11/fs
+XFREE86_DIRS+= ${MAN_DIR}
+XFREE86_DIRS+= ${LIBMAN_DIR}
+XFREE86_DIRS+= ${KERNMAN_DIR}
+XFREE86_DIRS+= ${FILEMAN_DIR}
+XFREE86_DIRS+= ${MISCMAN_DIR}
+
+.if defined(_USE_XFREE86_DIRS) && !empty(_USE_XFREE86_DIRS)
+DEPENDS+= XFree86-dirs>=${_USE_XFREE86_DIRS}:../../misc/XFree86-dirs
+
+. for dir in ${XFREE86_DIRS}
+PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \
+ { print "@comment in XFree86-dirs: "$$0; next; }
+. endfor
+. undef dir
+.endif
+
+.endif # !defined(DIRS_XFREE86_MK)
diff --git a/mk/dirs.mk b/mk/dirs.mk
index 0894d751113..53dcd07851c 100644
--- a/mk/dirs.mk
+++ b/mk/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.2 2004/04/14 19:30:22 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.3 2004/04/14 21:15:01 jmmv Exp $
#
.if !defined(DIRS_MK)
@@ -8,6 +8,7 @@ _USE_GNOME1_DIRS= # empty
_USE_GNOME2_DIRS= # empty
_USE_XDG_DIRS= # empty
_USE_XDG_X11_DIRS= # empty
+_USE_XFREE86_DIRS= # empty
.for dir in ${USE_DIRS}
pkg:= ${dir:C/-[^-]*$//}
@@ -21,6 +22,8 @@ _USE_GNOME2_DIRS:= ${ver}
_USE_XDG_DIRS:= ${ver}
. elif ${pkg} == "xdg" && ${_USE_XDG_X11_DIRS} < ${ver} && defined(USE_X11BASE)
_USE_XDG_X11_DIRS:= ${ver}
+. elif ${pkg} == "xdg" && ${_USE_XFREE86_DIRS} < ${ver}
+_USE_XFREE86_DIRS:= ${ver}
. endif
.endfor
@@ -44,4 +47,8 @@ _USE_XDG_X11_DIRS:= ${ver}
. include "../../misc/xdg-x11-dirs/dirs.mk"
.endif
+.if !empty(_USE_XFREE86_DIRS)
+. include "../../misc/XFree86-dirs/dirs.mk"
+.endif
+
.endif # !defined(DIRS_MK)
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 20:04:09 +0000