diff options
author | mat <mat@FreeBSD.org> | 2016-07-20 23:33:20 +0800 |
---|---|---|
committer | mat <mat@FreeBSD.org> | 2016-07-20 23:33:20 +0800 |
commit | db56f13ef4400c01c2a9ef2ba0e545effb4949f9 (patch) | |
tree | d74ba65fed8db0fd098d71428aebd9af6e665d09 /devel | |
parent | 3152a538183a1b60ad1cc78f4daf75bf3776cbfb (diff) | |
download | freebsd-ports-gnome-db56f13ef4400c01c2a9ef2ba0e545effb4949f9.tar.gz freebsd-ports-gnome-db56f13ef4400c01c2a9ef2ba0e545effb4949f9.tar.zst freebsd-ports-gnome-db56f13ef4400c01c2a9ef2ba0e545effb4949f9.zip |
Cleanup $() variables in ports Makefiles.
Mostly replace with ${}, but sometime, replace with $$() because it is
what was intended in the first place. (I think.)
Sponsored by: Absolight
Diffstat (limited to 'devel')
-rw-r--r-- | devel/arduino-mk/Makefile | 2 | ||||
-rw-r--r-- | devel/cdecl/Makefile | 2 | ||||
-rw-r--r-- | devel/dwarves/Makefile | 14 | ||||
-rw-r--r-- | devel/libfastjson/Makefile | 2 | ||||
-rw-r--r-- | devel/xorg-macros/Makefile | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/devel/arduino-mk/Makefile b/devel/arduino-mk/Makefile index d87d1bb89e44..909ed6c0243a 100644 --- a/devel/arduino-mk/Makefile +++ b/devel/arduino-mk/Makefile @@ -34,7 +34,7 @@ NEW_BOARDS_TXT= ${PREFIX}/arduino/hardware/arduino/boards.txt INSLIST= AnalogInOutSerial Blink BlinkWithoutDelay Fade HelloWorld \ WebServer master_reader toneMelody post-patch: - @ARDUINO="`$(ARDUINO_CMD)`" && \ + @ARDUINO="`${ARDUINO_CMD}`" && \ ${REINPLACE_CMD} -e "s|%%ARDUINO%%|$${ARDUINO}|g" \ ${WRKSRC}/arduino-mk/Arduino.mk @${REINPLACE_CMD} -e "s|'${OLD_BOARDS_TXT}'|'${NEW_BOARDS_TXT}'|g" \ diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile index c0b6be342612..463478797729 100644 --- a/devel/cdecl/Makefile +++ b/devel/cdecl/Makefile @@ -14,7 +14,7 @@ CONFLICTS= cutils-[0-9]* USES= readline USE_CSTD= c89 ALL_TARGET= ${PORTNAME} -MAKE_ENV+= STAGEDIR=$(STAGEDIR) +MAKE_ENV+= STAGEDIR=${STAGEDIR} PLIST_FILES= bin/cdecl bin/c++decl man/man1/cdecl.1.gz man/man1/c++decl.1.gz PORTDOCS= testset testset++ diff --git a/devel/dwarves/Makefile b/devel/dwarves/Makefile index bd2aae5f6e90..ec0daf9c046e 100644 --- a/devel/dwarves/Makefile +++ b/devel/dwarves/Makefile @@ -14,13 +14,13 @@ MAINTAINER= cem@FreeBSD.org COMMENT= Debugging Information Manipulation Tools LICENSE= GPLv2 -LICENSE_FILE_GPLv2= $(WRKSRC)/COPYING +LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LIB_DEPENDS= libargp.so:devel/argp-standalone \ libdw.so:devel/elfutils PATCH_DEPENDS= gnulib>=0:devel/gnulib -WRKSRC= $(WRKDIR)/dwarves-b52386d +WRKSRC= ${WRKDIR}/dwarves-b52386d USES= cmake:outsource localbase tar:bzip2 USE_LDCONFIG= yes @@ -29,11 +29,11 @@ CMAKE_VERBOSE= 1 post-patch: @${CP} -a \ - $(LOCALBASE)/share/gnulib/lib/gettext.h \ - $(LOCALBASE)/share/gnulib/lib/obstack.c \ - $(LOCALBASE)/share/gnulib/lib/obstack.h \ - $(WRKSRC)/ + ${LOCALBASE}/share/gnulib/lib/gettext.h \ + ${LOCALBASE}/share/gnulib/lib/obstack.c \ + ${LOCALBASE}/share/gnulib/lib/obstack.h \ + ${WRKSRC}/ @${REINPLACE_CMD} -e 's|_GL_ATTRIBUTE_PURE|__attribute__((__pure__))|g' \ - $(WRKSRC)/obstack.h $(WRKSRC)/obstack.c + ${WRKSRC}/obstack.h ${WRKSRC}/obstack.c .include <bsd.port.mk> diff --git a/devel/libfastjson/Makefile b/devel/libfastjson/Makefile index 0f01605974b9..0070fc2be165 100644 --- a/devel/libfastjson/Makefile +++ b/devel/libfastjson/Makefile @@ -19,7 +19,7 @@ USES= autoreconf libtool pkgconfig INSTALL_TARGET= install-strip post-patch: - ${REINPLACE_CMD} -e 's|$(libdir)/pkgconfig|$(libdir)data/pkgconfig|' \ + ${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(libdir)data/pkgconfig|' \ ${WRKSRC}/Makefile.am .include <bsd.port.mk> diff --git a/devel/xorg-macros/Makefile b/devel/xorg-macros/Makefile index c9c9ae02e8a4..49a320b3d3b4 100644 --- a/devel/xorg-macros/Makefile +++ b/devel/xorg-macros/Makefile @@ -4,7 +4,7 @@ PORTNAME= xorg-macros PORTVERSION= 1.19.0 CATEGORIES= devel x11 -DISTNAME= util-macros-$(PORTVERSION) +DISTNAME= util-macros-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT= X.Org development aclocal macros |