diff options
author | rillig <rillig@pkgsrc.org> | 2016-07-10 13:28:41 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2016-07-10 13:28:41 +0000 |
commit | acd51e38d5c035d826527c5c74385f5fc1d88ea8 (patch) | |
tree | c07b205f86570ca136f7d1f5f50edfe016d80dc2 /pkgtools/x11-links | |
parent | 0e96436537521e301c6dc426a5fbacba63efc31a (diff) | |
download | pkgsrc-acd51e38d5c035d826527c5c74385f5fc1d88ea8.tar.gz |
Fixed some pkglint warnings.
Diffstat (limited to 'pkgtools/x11-links')
-rw-r--r-- | pkgtools/x11-links/Makefile | 9 | ||||
-rw-r--r-- | pkgtools/x11-links/buildlink3.mk | 4 | ||||
-rw-r--r-- | pkgtools/x11-links/xfree.mk | 22 | ||||
-rw-r--r-- | pkgtools/x11-links/xorg.mk | 26 |
4 files changed, 30 insertions, 31 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index fc385882c8a..531a0a9539c 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.171 2016/05/18 21:04:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.172 2016/07/10 13:28:41 rillig Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in buildlink3.mk to the correct version, @@ -79,7 +79,7 @@ CREATE_X11LINK?= ${LN} -fs $$src $$dest do-build: ${MKDIR} ${X11_LINKS_BUILD_DIR} ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR} - ${FILES_LIST_CMD} | ${SED} -e "s,/[^/]*$$,," | ${SORT} -u | \ + ${FILES_LIST_CMD} | ${SED} -e 's,/[^/]*$$,,' | ${SORT} -u | \ while read dir; do \ if [ -d ${X11BASE}/$$dir ]; then \ ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \ @@ -119,8 +119,7 @@ do-build: done do-install: - ${INSTALL_DATA_DIR} ${DESTDIR:Q}${X11_LINKS_DIR:Q} - cd ${X11_LINKS_BUILD_DIR} && \ - pax -rw . ${DESTDIR:Q}${X11_LINKS_DIR:Q} + ${INSTALL_DATA_DIR} ${DESTDIR}${X11_LINKS_DIR} + cd ${X11_LINKS_BUILD_DIR} && pax -rw . ${DESTDIR}${X11_LINKS_DIR} .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index d5ffc78c128..c0db4e7c353 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -1,8 +1,8 @@ -# $NetBSD: buildlink3.mk,v 1.66 2016/05/18 21:04:07 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.67 2016/07/10 13:28:41 rillig Exp $ # # Don't include this file manually! It will be included as necessary # by bsd.buildlink3.mk. - +# # x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk, # so that symlinks created from it can be overriden by other packages. # diff --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk index 22588b347f5..8390bedc2b6 100644 --- a/pkgtools/x11-links/xfree.mk +++ b/pkgtools/x11-links/xfree.mk @@ -1,4 +1,4 @@ -# $NetBSD: xfree.mk,v 1.16 2009/03/20 19:25:13 joerg Exp $ +# $NetBSD: xfree.mk,v 1.17 2016/07/10 13:28:41 rillig Exp $ FILES_LIST= ${FILESDIR}/xfree @@ -18,17 +18,17 @@ FILES_LIST= ${FILESDIR}/xfree # Check if any headers and libraries for ${X11_MODULES} found in # ${X11BASE} actually belong to the base XFree86 or not. # -.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} -CHECK_BUILTIN.${_pkg_}:= yes -USE_BUILTIN.${_pkg_}= yes -. sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk" -CHECK_BUILTIN.${_pkg_}:= no +.for pkg in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} +CHECK_BUILTIN.${pkg}:= yes +USE_BUILTIN.${pkg}= yes +. sinclude "${BUILDLINK_PKGSRCDIR.${pkg}}/builtin.mk" +CHECK_BUILTIN.${pkg}:= no .endfor -.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} -IGNORE_PKG.${_pkg_}= yes -. if (defined(IS_BUILTIN.${_pkg_}) && !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS]) ) && \ - exists(${FILESDIR}/xfree.${_pkg_}) -FILES_LIST+= ${FILESDIR}/xfree.${_pkg_} +.for pkg in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} +IGNORE_PKG.${pkg}= yes +. if (defined(IS_BUILTIN.${pkg}) && !empty(IS_BUILTIN.${pkg}:M[yY][eE][sS]) ) && \ + exists(${FILESDIR}/xfree.${pkg}) +FILES_LIST+= ${FILESDIR}/xfree.${pkg} . endif .endfor diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk index 5695c6d5168..40b4bc1d9f3 100644 --- a/pkgtools/x11-links/xorg.mk +++ b/pkgtools/x11-links/xorg.mk @@ -1,4 +1,4 @@ -# $NetBSD: xorg.mk,v 1.26 2014/04/29 06:20:04 obache Exp $ +# $NetBSD: xorg.mk,v 1.27 2016/07/10 13:28:41 rillig Exp $ # # This is for X.org, but use "xfree" files also. @@ -81,20 +81,20 @@ FILES_LIST= ${FILESDIR}/xorg # ${X11BASE} actually belong to the base Xorg or not. # # XXX: maybe skip iconv and zlib too? -.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} -CHECK_BUILTIN.${_pkg_}:= yes -. sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk" -CHECK_BUILTIN.${_pkg_}:= no +.for pkg in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} +CHECK_BUILTIN.${pkg}:= yes +. sinclude "${BUILDLINK_PKGSRCDIR.${pkg}}/builtin.mk" +CHECK_BUILTIN.${pkg}:= no .endfor -.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} -IGNORE_PKG.${_pkg_}= yes -. if defined(USE_BUILTIN.${_pkg_}) && \ - !empty(USE_BUILTIN.${_pkg_}:M[yY][eE][sS]) -. if exists(${FILESDIR}/xorg.${_pkg_}) -FILES_LIST+= ${FILESDIR}/xorg.${_pkg_} -. elif exists(${FILESDIR}/xfree.${_pkg_}) -FILES_LIST+= ${FILESDIR}/xfree.${_pkg_} +.for pkg in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} +IGNORE_PKG.${pkg}= yes +. if defined(USE_BUILTIN.${pkg}) && \ + !empty(USE_BUILTIN.${pkg}:M[yY][eE][sS]) +. if exists(${FILESDIR}/xorg.${pkg}) +FILES_LIST+= ${FILESDIR}/xorg.${pkg} +. elif exists(${FILESDIR}/xfree.${pkg}) +FILES_LIST+= ${FILESDIR}/xfree.${pkg} . endif . endif .endfor |