diff options
| author | rillig <rillig@pkgsrc.org> | 2008-01-04 01:25:51 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2008-01-04 01:25:51 +0000 |
| commit | 56363b1929495edeac5d1a9cbf1c6c591c234f96 (patch) | |
| tree | 0c3f363cf95926a85ac5eb8922bbc4becc8836b0 | |
| parent | e4d0e731fae736b2927b64b5013cd975b85793a4 (diff) | |
| download | pkgsrc-56363b1929495edeac5d1a9cbf1c6c591c234f96.tar.gz | |
Fixed pkglint warnings.
| -rw-r--r-- | x11/neXtaw/Makefile | 6 | ||||
| -rw-r--r-- | x11/neXtaw/buildlink3.mk | 19 |
2 files changed, 12 insertions, 13 deletions
diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile index c7039adcce4..fcf109769de 100644 --- a/x11/neXtaw/Makefile +++ b/x11/neXtaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2007/06/20 16:49:18 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2008/01/04 01:25:51 rillig Exp $ DISTNAME= neXtaw-0.15.1 PKGREVISION= 3 @@ -28,11 +28,11 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/doc/README.XAW3D ${DOCDIR} ${INSTALL_DATA_DIR} ${EGDIR} - cd ${WRKSRC}/doc/app-defaults; for file in *; do \ + set -e; cd ${WRKSRC}/doc/app-defaults; for file in *; do \ case "$${file}" in \ Makefile*) continue ;; \ esac; \ - ${INSTALL_DATA} $${file} ${EGDIR}; \ + ${INSTALL_DATA} "$$file" ${EGDIR}; \ done .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk index abf6dec0a62..ef874276be6 100644 --- a/x11/neXtaw/buildlink3.mk +++ b/x11/neXtaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/12/24 18:57:49 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2008/01/04 01:25:51 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NEXTAW_BUILDLINK3_MK:= ${NEXTAW_BUILDLINK3_MK}+ @@ -18,25 +18,24 @@ BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw .include "../../mk/bsd.fast.prefs.mk" -.if ${X11_TYPE} == "modular" +. if ${X11_TYPE} == "modular" .PHONY: buildlink-neXtaw-inc-hack buildlink-neXtaw-cookie: buildlink-neXtaw-inc-hack - + buildlink-neXtaw-inc-hack: buildlink-directories [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \ ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \ ${LN} -s neXtaw ${BUILDLINK_DIR}/include/X11/Xaw -.endif -.endif # NEXTAW_BUILDLINK3_MK +. endif -.include "../../mk/bsd.fast.prefs.mk" +LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib \ + -lneXtaw + +.endif # NEXTAW_BUILDLINK3_MK .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib \ - -lneXtaw - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |