pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/cross/nios2-gcc41



Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu Jul  7 13:26:16 UTC 2016

Modified Files:
        pkgsrc/cross/nios2-gcc41: options.mk

Log Message:
Fixed pkglint warnings about using SED and MV instead of SUBST.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/cross/nios2-gcc41/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cross/nios2-gcc41/options.mk
diff -u pkgsrc/cross/nios2-gcc41/options.mk:1.2 pkgsrc/cross/nios2-gcc41/options.mk:1.3
--- pkgsrc/cross/nios2-gcc41/options.mk:1.2     Tue Dec  3 02:34:52 2013
+++ pkgsrc/cross/nios2-gcc41/options.mk Thu Jul  7 13:26:16 2016
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2013/12/03 02:34:52 mef Exp $
+# $NetBSD: options.mk,v 1.3 2016/07/07 13:26:16 rillig Exp $
+
 ### Set options
-PKG_OPTIONS_VAR=        PKG_OPTIONS.nios2-gcc
-PKG_SUPPORTED_OPTIONS=  doc sysroot
-PKG_SUGGESTED_OPTIONS=      sysroot
+PKG_OPTIONS_VAR=       PKG_OPTIONS.nios2-gcc
+PKG_SUPPORTED_OPTIONS= doc sysroot
+PKG_SUGGESTED_OPTIONS= sysroot
 
 .include "../../mk/bsd.options.mk"
 
@@ -13,15 +14,14 @@ CFLAGS+=            -DTARGET_SYSTEM_ROOT=0 -DTARGE
 
 # conditional SUBST_CLASSES
 .if empty(PKG_OPTIONS:Mdoc)
-post-patch:
-       (cd ${WRKSRC};                                  \
-       ${MV}  gcc/Makefile.in gcc/Makefile.in.orig;    \
-       ${SED} '-e s/@@DOC@@//'                         \
-              '-e s/@@INSTALL_HTML@@//'                \
-              '-e s/@@INSTALL_PDF@@//'                 \
-       gcc/Makefile.in.orig > gcc/Makefile.in;         \
-       )
+SUBST_CLASSES+=                nios
+SUBST_STAGE.nios=      post-patch
+SUBST_FILES.nios=      gcc/Makefile.in
+SUBST_SED.nios=                -e s/@@DOC@@//
+SUBST_SED.nios+=       -e s/@@INSTALL_HTML@@//
+SUBST_SED.nios+=       -e s/@@INSTALL_PDF@@//
 .else
+
 # bin/tex is required
 BUILD_DEPENDS+=                web2c-[0-9]*:../../print/web2c
 BUILD_DEPENDS+=                tex-cm-[0-9]*:../../fonts/tex-cm
@@ -30,12 +30,11 @@ BUILD_DEPENDS+=             tex-pdftex-doc-[0-9]*:.
 BUILD_DEPENDS+=                tex-pdftex-[0-9]*:../../print/tex-pdftex
 BUILD_DEPENDS+=                gtexinfo-[0-9]*:../../devel/gtexinfo
 PLIST.doc=             yes
-post-patch:
-       (cd ${WRKSRC};                                  \
-       ${MV}  gcc/Makefile.in gcc/Makefile.in.orig;    \
-       ${SED} '-e s/@@DOC@@/doc/'                      \
-              '-e s/@@INSTALL_HTML@@/install-html/'    \
-              '-e s/@@INSTALL_PDF@@/install-pdf/'      \
-       gcc/Makefile.in.orig > gcc/Makefile.in;         \
-       )
+
+SUBST_CLASSES+=                nios
+SUBST_STAGE.nios=      post-patch
+SUBST_FILES.nios=      gcc/Makefile.in
+SUBST_SED.nios=                -e s/@@DOC@@/doc/
+SUBST_SED.nios+=       -e s/@@INSTALL_HTML@@/install-html/
+SUBST_SED.nios+=       -e s/@@INSTALL_PDF@@/install-pdf/
 .endif



Home | Main Index | Thread Index | Old Index