diff options
author | jmmv <jmmv> | 2004-04-14 21:15:01 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2004-04-14 21:15:01 +0000 |
commit | 44997e9b1c2623c5d30ff039d6fe310c6b77e8d8 (patch) | |
tree | 1af10ef7d20a24c1a87709a2854374e5f63d92e8 /misc | |
parent | a9b42d0abb3d6e9ac2966670d199082c6e910562 (diff) | |
download | pkgsrc-44997e9b1c2623c5d30ff039d6fe310c6b77e8d8.tar.gz |
Add support for the XFree86-dirs package in mk/dirs.mk, by modifying it to
work properly with it. Agreed with xtraeme@.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/XFree86-dirs/Makefile | 23 | ||||
-rw-r--r-- | misc/XFree86-dirs/Makefile.common | 42 | ||||
-rw-r--r-- | misc/XFree86-dirs/dirs.mk | 37 |
3 files changed, 57 insertions, 45 deletions
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) |