Date: Wed, 20 Jul 2016 15:33:20 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418840 - in head: audio/squeezeboxserver biology/ariadne comms/linrad converters/tuc databases/postgresql91-docs devel/arduino-mk devel/cdecl devel/dwarves devel/libfastjson devel/xorg... Message-ID: <201607201533.u6KFXK99080748@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Jul 20 15:33:20 2016 New Revision: 418840 URL: https://svnweb.freebsd.org/changeset/ports/418840 Log: 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 Modified: head/audio/squeezeboxserver/Makefile (contents, props changed) head/biology/ariadne/Makefile (contents, props changed) head/comms/linrad/Makefile (contents, props changed) head/converters/tuc/Makefile (contents, props changed) head/databases/postgresql91-docs/Makefile (contents, props changed) head/devel/arduino-mk/Makefile (contents, props changed) head/devel/cdecl/Makefile (contents, props changed) head/devel/dwarves/Makefile (contents, props changed) head/devel/libfastjson/Makefile (contents, props changed) head/devel/xorg-macros/Makefile (contents, props changed) head/editors/manedit/Makefile (contents, props changed) head/editors/thoteditor/Makefile (contents, props changed) head/editors/vim/Makefile (contents, props changed) head/emulators/bsvc/Makefile (contents, props changed) head/emulators/virtualbox-ose/Makefile (contents, props changed) head/finance/beanie/Makefile (contents, props changed) head/games/blockrage/Makefile (contents, props changed) head/games/gemdropx/Makefile (contents, props changed) head/games/legend-of-edgar/Makefile (contents, props changed) head/games/miscom/Makefile (contents, props changed) head/games/netwalk/Makefile (contents, props changed) head/games/openbor/Makefile (contents, props changed) head/games/ufoai/Makefile (contents, props changed) head/games/vodovod/Makefile (contents, props changed) head/graphics/rayshade/Makefile (contents, props changed) head/graphics/sane-epkowa/Makefile (contents, props changed) head/japanese/kinput2/Makefile (contents, props changed) head/japanese/xtr/Makefile (contents, props changed) head/multimedia/libsmacker/Makefile (contents, props changed) head/multimedia/mpeg4ip/Makefile (contents, props changed) head/multimedia/mplayer-skins/Makefile (contents, props changed) head/multimedia/vdr-plugin-epgsearch/Makefile (contents, props changed) head/multimedia/vdr/Makefile (contents, props changed) head/net-im/jabber/Makefile (contents, props changed) head/net-mgmt/xymon-server/Makefile (contents, props changed) head/net/crtmpserver/Makefile (contents, props changed) head/net/dgd/Makefile (contents, props changed) head/net/samba42/Makefile (contents, props changed) head/net/samba43/Makefile (contents, props changed) head/net/samba44/Makefile (contents, props changed) head/net/tiny-network-utilities/Makefile (contents, props changed) head/print/asprint/Makefile (contents, props changed) head/print/splix/Makefile (contents, props changed) head/russian/ircd-hybrid/Makefile (contents, props changed) head/security/calife/Makefile (contents, props changed) head/security/luasec/Makefile (contents, props changed) head/security/openssl-devel/Makefile (contents, props changed) head/security/openssl/Makefile (contents, props changed) head/security/putty/Makefile (contents, props changed) head/security/tripwire/Makefile (contents, props changed) head/security/yubico-piv-tool/Makefile (contents, props changed) head/shells/rc/Makefile (contents, props changed) head/sysutils/bbcp/Makefile (contents, props changed) head/sysutils/eventlog/Makefile (contents, props changed) head/sysutils/file/Makefile (contents, props changed) head/sysutils/gkrellm2/Makefile (contents, props changed) head/sysutils/py-stdiff/Makefile (contents, props changed) head/sysutils/sd-agent/Makefile (contents, props changed) head/sysutils/syslog-ng-devel/Makefile (contents, props changed) head/sysutils/syslog-ng-incubator/Makefile (contents, props changed) head/sysutils/syslog-ng36/Makefile (contents, props changed) head/sysutils/syslog-ng37/Makefile (contents, props changed) head/www/mod_clamav/Makefile (contents, props changed) head/www/mod_encoding/Makefile (contents, props changed) head/www/vdr-plugin-live/Makefile (contents, props changed) head/x11-fonts/urwfonts/Makefile (contents, props changed) head/x11-wm/larswm/Makefile (contents, props changed) Modified: head/audio/squeezeboxserver/Makefile ============================================================================== --- head/audio/squeezeboxserver/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/audio/squeezeboxserver/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -155,7 +155,7 @@ post-patch: -e 's/default-character-set/character-set-server/'\ -e 's/default-collation/collation-server/' ${WRKSRC}/MySQL/my.tt # table_open_cache was known as table_cache in MySQL 5.1.2 and earlier - @if [ "$(MYSQL_VER)" != "50" ] ; then \ + @if [ "${MYSQL_VER}" != "50" ] ; then \ ${REINPLACE_CMD} \ -e 's/table_cache/table_open_cache/' ${WRKSRC}/MySQL/my.tt ;\ fi Modified: head/biology/ariadne/Makefile ============================================================================== --- head/biology/ariadne/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/biology/ariadne/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -22,7 +22,7 @@ MAKE_JOBS_UNSAFE= yes post-patch: @${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=| ; \ - s|-c $(OPTIMISE)|-c $(CFLAGS) $(OPTIMIZE)|g' \ + s|-c $$(OPTIMISE)|-c ${CFLAGS} ${OPTIMIZE}|g' \ ${WRKSRC}/Makefile do-install: Modified: head/comms/linrad/Makefile ============================================================================== --- head/comms/linrad/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/comms/linrad/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -61,7 +61,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/help.lir ${STAGEDIR}${DATADIR}/help.lir ${INSTALL_SCRIPT} -m0555 ${FILESDIR}/linrad ${STAGEDIR}${PREFIX}/bin/linrad # Some day we may want the svga version as well. -# ${INSTALL_PROGRAM} -m0555 ${WRKSRC}/${PORTNAME} $(STAGEDIR}${PREFIX}/bin/${PORTNAME}.svga +# ${INSTALL_PROGRAM} -m0555 ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.svga ${INSTALL_PROGRAM} -m0555 ${WRKSRC}/${BINFILE} ${STAGEDIR}${PREFIX}/bin/x${PORTNAME} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${LINRAD_DOCFILES} Modified: head/converters/tuc/Makefile ============================================================================== --- head/converters/tuc/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/converters/tuc/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -16,6 +16,6 @@ PLIST_FILES= bin/tuc \ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tuc ${STAGEDIR}${PREFIX}/bin - $(INSTALL_MAN) ${WRKSRC}/tuc.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/tuc.1 ${STAGEDIR}${PREFIX}/man/man1 .include <bsd.port.mk> Modified: head/databases/postgresql91-docs/Makefile ============================================================================== --- head/databases/postgresql91-docs/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/databases/postgresql91-docs/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -32,7 +32,7 @@ do-build: ${MAKE_CMD} -C ${WRKSRC} html do-install: - @ $(MKDIR) ${STAGEDIR}${PGDOCSDIR} + @ ${MKDIR} ${STAGEDIR}${PGDOCSDIR} ( cd ${WRKSRC}/doc/src/sgml/html && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} ) Modified: head/devel/arduino-mk/Makefile ============================================================================== --- head/devel/arduino-mk/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/devel/arduino-mk/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -34,7 +34,7 @@ NEW_BOARDS_TXT= ${PREFIX}/arduino/hardwa 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" \ Modified: head/devel/cdecl/Makefile ============================================================================== --- head/devel/cdecl/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/devel/cdecl/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -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++ Modified: head/devel/dwarves/Makefile ============================================================================== --- head/devel/dwarves/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/devel/dwarves/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -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> Modified: head/devel/libfastjson/Makefile ============================================================================== --- head/devel/libfastjson/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/devel/libfastjson/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -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> Modified: head/devel/xorg-macros/Makefile ============================================================================== --- head/devel/xorg-macros/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/devel/xorg-macros/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -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 Modified: head/editors/manedit/Makefile ============================================================================== --- head/editors/manedit/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/editors/manedit/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -16,7 +16,7 @@ MAKEFILE= Makefile.FreeBSD USES= alias tar:bzip2 USE_GNOME= gtk12 -MAKE_ARGS= STAGEDIR="$(STAGEDIR)" +MAKE_ARGS= STAGEDIR="${STAGEDIR}" pre-configure: @${CP} ${FILESDIR}/mntent* ${WRKSRC} Modified: head/editors/thoteditor/Makefile ============================================================================== --- head/editors/thoteditor/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/editors/thoteditor/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -14,7 +14,7 @@ COMMENT= Structured document editor, off THOT_SUBDIR= Target USES= gmake motif -WRKSRC= $(WRKDIR)/Thot/$(THOT_SUBDIR) +WRKSRC= ${WRKDIR}/Thot/${THOT_SUBDIR} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-thot --enable-plugin --without-insure --without-amaya \ --disable-java --disable-intr --disable-jit --disable-math \ @@ -37,7 +37,7 @@ post-patch: ${WRKDIR}/Thot/thotlib/include/sysdep.h do-configure: - (cd $(WRKSRC);../configure $(CONFIGURE_ARGS)) + (cd ${WRKSRC};../configure ${CONFIGURE_ARGS}) post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/thot/doc Modified: head/editors/vim/Makefile ============================================================================== --- head/editors/vim/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/editors/vim/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -73,10 +73,10 @@ CONSOLE_PLIST_SUB= GUI="@comment " CSCOPE_MAKE_ARGS= CONF_OPT_CSCOPE=--enable-cscope CSCOPE_RUN_DEPENDS= cscope:devel/cscope EXUBERANT_CTAGS_RUN_DEPENDS= exctags:devel/ctags -GNOME_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$(X_LIBS) -lX11 -lXpm -lXt" +GNOME_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt" GNOME_PLIST_SUB= GUI="" GNOME_USE= GNOME=libgnomeui XORG=glproto,xpm,xt -GTK2_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$(X_LIBS) -lX11 -lXpm -lXt" +GTK2_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt" GTK2_PLIST_SUB= GUI="" GTK2_USE= GNOME=gtk20 XORG=xpm,xt LUA_MAKE_ARGS= CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE} @@ -94,7 +94,7 @@ RUBY_MAKE_ARGS= CONF_OPT_RUBY=--enable- RUBY_USE= RUBY=yes TCL_MAKE_ARGS= CONF_OPT_TCL="--enable-tclinterp --with-tclsh=tclsh${TCL_VER}" TCL_USES= tcl:85+ -X11_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$(X_LIBS) -lX11 -lXt" +X11_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$$(X_LIBS) -lX11 -lXt" X11_PLIST_SUB= GUI="@comment " X11_USE= XORG=x11,xt Modified: head/emulators/bsvc/Makefile ============================================================================== --- head/emulators/bsvc/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/emulators/bsvc/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -34,6 +34,6 @@ post-patch: s/strstream\.h/strstream/; \ s/fstream\.h/fstream/' \{\} \; @${FIND} ${WRKSRC} -name Makefile -exec \ - ${REINPLACE_CMD} -e 's/make/$(MAKE)/' \{\} \; + ${REINPLACE_CMD} -e 's/make/${MAKE}/' \{\} \; .include <bsd.port.mk> Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/emulators/virtualbox-ose/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -257,7 +257,7 @@ post-patch: @${ECHO} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> ${WRKSRC}/LocalConfig.kmk .endif .if ${PORT_OPTIONS:MR0LOGGING} @${ECHO} 'VBOX_WITH_R0_LOGGING = 1' >> ${WRKSRC}/LocalConfig.kmk Modified: head/finance/beanie/Makefile ============================================================================== --- head/finance/beanie/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/finance/beanie/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -19,7 +19,7 @@ LATE_INSTALL_ARGS= BEANIEROOT="${STAGEDI MAKE_JOBS_UNSAFE= yes post-patch: - @${CP} ${WRKSRC}/beanie.mk.sample $(WRKSRC)/beanie.mk + @${CP} ${WRKSRC}/beanie.mk.sample ${WRKSRC}/beanie.mk @${CP} ${WRKSRC}/tmac/lhead.sample.r ${WRKSRC}/tmac/lhead.r .include <bsd.port.mk> Modified: head/games/blockrage/Makefile ============================================================================== --- head/games/blockrage/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/games/blockrage/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -37,7 +37,7 @@ post-patch: 's|prefix=/usr/local|prefix=${PREFIX}|; \ s|MYCC=gcc|MYCC?=${CC}|; \ s|-s -O2 -Wall||; \ - s|sdl-config|$(SDL_CONFIG)|; \ + s|sdl-config|${SDL_CONFIG}|; \ s|MAKE=make|MAKE=${MAKE}|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|gcc -s|${CC}|' \ Modified: head/games/gemdropx/Makefile ============================================================================== --- head/games/gemdropx/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/games/gemdropx/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -29,10 +29,10 @@ DESKTOP_ENTRIES="Gem Drop X" "" "${PORTN post-patch: @${REINPLACE_CMD} \ - -e 's|sdl-config|$(SDL_CONFIG)| ; \ + -e 's|sdl-config|${SDL_CONFIG}| ; \ s|CC=gcc|CC?=${CC}| ; \ s|CXX=gcc|CXX?=${CC}| ; \ - s|CFLAGS=-Wall $(SDL_CFLAGS)|CFLAGS+=-w $(SDL_CFLAGS)|' \ + s|CFLAGS=-Wall ${SDL_CFLAGS}|CFLAGS+=-w ${SDL_CFLAGS}|' \ ${WRKSRC}/Makefile @${FIND} ${WRKDIR} -name .xvpics | ${XARGS} ${RM} -rf Modified: head/games/legend-of-edgar/Makefile ============================================================================== --- head/games/legend-of-edgar/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/games/legend-of-edgar/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -38,7 +38,7 @@ post-patch: s|/share/games/edgar/|/share/edgar/|; \ s|/share/man/|/man/|; \ s|-Wall ||; \ - s|sdl-config|$(SDL_CONFIG)|; \ + s|sdl-config|${SDL_CONFIG}|; \ s|-s ||' \ ${WRKSRC}/makefile @${REINPLACE_CMD} -e 's|SDL/SDL|${LOCALBASE}/include/SDL/SDL|g' \ Modified: head/games/miscom/Makefile ============================================================================== --- head/games/miscom/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/games/miscom/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -30,7 +30,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> .if ${ARCH} == "i386" -CFLAGS+= -DSOUNDSDIR='\"$(DATADIR)\"' -DSOUND_SUPPORT -DMORE_SOUNDBUF +CFLAGS+= -DSOUNDSDIR='\"${DATADIR}\"' -DSOUND_SUPPORT -DMORE_SOUNDBUF .endif do-install: Modified: head/games/netwalk/Makefile ============================================================================== --- head/games/netwalk/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/games/netwalk/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -35,7 +35,7 @@ post-patch: @${REINPLACE_CMD} -e \ 's|CC = gcc|CC = ${CC}|; \ s|CFLAGS=-Wall -O2 -fomit-frame-pointer|CFLAGS+= -fomit-frame-pointer|; \ - s|sdl-config|$(SDL_CONFIG)|; \ + s|sdl-config|${SDL_CONFIG}|; \ s|PREFIX = /usr|PREFIX = ${PREFIX}|' \ ${WRKSRC}/Makefile Modified: head/games/openbor/Makefile ============================================================================== --- head/games/openbor/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/games/openbor/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -21,7 +21,7 @@ MAKE_ENV= BUILD_LINUX=1 SDKPATH="${LOCAL GCC_TARGET="${CONFIGURE_TARGET:S/amd64/x86_64/}" MAKE_ARGS= CC="${CC}" LIBRARIES="${LOCALBASE}/lib" \ TARGET_ARCH=${ARCH:S/i386/x86/} ARCHFLAGS="" \ - TARGET_FINAL='$(TARGET)' BUILD_MMX="" + TARGET_FINAL='${TARGET}' BUILD_MMX="" LDFLAGS+= -Wl,--as-needed PLIST_FILES= bin/${PORTNAME} \ share/pixmaps/${PORTNAME}.png Modified: head/games/ufoai/Makefile ============================================================================== --- head/games/ufoai/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/games/ufoai/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -97,7 +97,7 @@ post-extract: post-build: @cd ${WRKSRC} && ${MAKE_CMD} lang -.if $(PORT_OPTIONS:MUFORADIANT) +.if ${PORT_OPTIONS:MUFORADIANT} @cd ${WRKSRC} && ${MAKE_CMD} uforadiant .endif Modified: head/games/vodovod/Makefile ============================================================================== --- head/games/vodovod/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/games/vodovod/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -42,7 +42,7 @@ post-patch: @${REINPLACE_CMD} -e 's|PREFIX=/usr|PREFIX=${PREFIX}|' \ -e 's|CC = g++|CC ?= g++|' \ -e 's|CC|CXX|' \ - -e 's|sdl-config|$(SDL_CONFIG)|' \ + -e 's|sdl-config|${SDL_CONFIG}|' \ -e '/^MY_CFLAGS/ s| = | = ${CXXFLAGS} |' \ ${WRKSRC}/Makefile Modified: head/graphics/rayshade/Makefile ============================================================================== --- head/graphics/rayshade/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/graphics/rayshade/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -20,7 +20,7 @@ LICENSE_NAME= Rayshade license LICENSE_FILE= ${WRKSRC}/Doc/Copyright LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept -BUILD_DEPENDS= $(LOCALBASE)/lib/librle.a:graphics/urt +BUILD_DEPENDS= ${LOCALBASE}/lib/librle.a:graphics/urt WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION:R} Modified: head/graphics/sane-epkowa/Makefile ============================================================================== --- head/graphics/sane-epkowa/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/graphics/sane-epkowa/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -75,7 +75,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} LDFLA .include <bsd.port.pre.mk> -.if $(PORTVERSION) != "2.15.0" +.if ${PORTVERSION} != "2.15.0" do-patch: # nothing to do do-build: Modified: head/japanese/kinput2/Makefile ============================================================================== --- head/japanese/kinput2/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/japanese/kinput2/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -32,23 +32,23 @@ WNN6_DESC= Wnn6 support WNN6_LIB_DEPENDS= libwnn6.so:japanese/Wnn6-lib WNN6_CONF= '\#define UseWnn' \ '\#define UseWnn6' \ - WNNINCDIR=$(LOCALBASE)/include/wnn6/wnn \ - WNNLIB="-L$(LOCALBASE)/lib -lwnn6 -lcrypt" + WNNINCDIR=${LOCALBASE}/include/wnn6/wnn \ + WNNLIB="-L${LOCALBASE}/lib -lwnn6 -lcrypt" WNN6_PLIST_FILES= ${WNN_PLIST_FILES} WNN7_DESC= Wnn7 support WNN7_LIB_DEPENDS= libwnn7.so:japanese/Wnn7-lib WNN7_CONF= '\#define UseWnn' \ '\#define UseWnn6' \ - WNNINCDIR=$(LOCALBASE)/include/wnn7/wnn \ - WNNLIB="-L$(LOCALBASE)/lib -lwnn7 -lcrypt" + WNNINCDIR=${LOCALBASE}/include/wnn7/wnn \ + WNNLIB="-L${LOCALBASE}/lib -lwnn7 -lcrypt" WNN7_PLIST_FILES= ${WNN_PLIST_FILES} FREEWNN_DESC= FreeWnn support FREEWNN_LIB_DEPENDS= libwnn.so:japanese/FreeWnn-lib FREEWNN_CONF= '\#define UseWnn' \ - WNNINCDIR=$(LOCALBASE)/include/wnn \ - WNNLIB="-L$(LOCALBASE)/lib -lwnn -lcrypt" + WNNINCDIR=${LOCALBASE}/include/wnn \ + WNNLIB="-L${LOCALBASE}/lib -lwnn -lcrypt" FREEWNN_PLIST_FILES= ${WNN_PLIST_FILES} SJ3_DESC= SJ3 support Modified: head/japanese/xtr/Makefile ============================================================================== --- head/japanese/xtr/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/japanese/xtr/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -23,7 +23,7 @@ OPTIONS_DEFINE= DOCS post-extract: @${ECHO_MSG} "===> Converting Kanji code for ${DISTNAME}" - @(cd ${WRKSRC} && $(SH) EUCsetup ) + @(cd ${WRKSRC} && ${SH} EUCsetup ) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xtr ${STAGEDIR}${PREFIX}/bin/xtr Modified: head/multimedia/libsmacker/Makefile ============================================================================== --- head/multimedia/libsmacker/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/multimedia/libsmacker/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -3,7 +3,7 @@ PORTNAME= libsmacker PORTVERSION= 1.0 CATEGORIES= multimedia -MASTER_SITES= SF/${PORTNAME}/$(DISTNAME)/ +MASTER_SITES= SF/${PORTNAME}/${DISTNAME}/ MAINTAINER= kennedy.greg@gmail.com COMMENT= C library for decoding .smk Smacker Video files Modified: head/multimedia/mpeg4ip/Makefile ============================================================================== --- head/multimedia/mpeg4ip/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/multimedia/mpeg4ip/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -97,7 +97,7 @@ pre-configure: ${WRKSRC}/lib/Makefile.in @${FIND} ${WRKSRC} -type f -name Makefile.in | \ ${XARGS} -n 10 ${REINPLACE_CMD} -e \ - 's|-I$(top_srcdir)/lib/mp4v2||; \ + 's|-I$$(top_srcdir)/lib/mp4v2||; \ s|$$(top_builddir)/lib/mp4v2/libmp4v2.la||; \ s|$$(top_srcdir)/lib/mp4v2/libmp4v2.la||; \ s|@LIBS@|@LIBS@ -lmp4v2|; \ Modified: head/multimedia/mplayer-skins/Makefile ============================================================================== --- head/multimedia/mplayer-skins/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/multimedia/mplayer-skins/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -49,7 +49,7 @@ PORT_OPTIONS+= ${ALLSKINS} post-build-script: DISTFILES+= ${DEFAULT_FILE}${EXTRACT_SUFX} .for f in ${ALLSKINS} -.if $(PORT_OPTIONS:M${f}) +.if ${PORT_OPTIONS:M${f}} PLIST_SUB+= ${f}="" WITHOUT_SKIN_${f}="@comment " DISTFILES+= ${${f}_FILE}${EXTRACT_SUFX} .else Modified: head/multimedia/vdr-plugin-epgsearch/Makefile ============================================================================== --- head/multimedia/vdr-plugin-epgsearch/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/multimedia/vdr-plugin-epgsearch/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -19,7 +19,7 @@ USES= pkgconfig tar:bzip2 PATCH_STRIP= -p1 PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/vdr-plugin-${PLUGIN} -MAKE_ARGS+= INCLUDES="-I$(LOCALBASE)/include -I$(LOCALBASE)/include/vdr -I${WRKSRC}" +MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include -I${LOCALBASE}/include/vdr -I${WRKSRC}" .include "${.CURDIR}/../vdr/Makefile.plugins" Modified: head/multimedia/vdr/Makefile ============================================================================== --- head/multimedia/vdr/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/multimedia/vdr/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -30,12 +30,12 @@ CPE_VENDOR= tvdr SHEBANG_FILES= svdrpsend DIST_SUBDIR= vdr PORTDOCS= COPYING INSTALL MANUAL README HISTORY -CONFDIR= $(ETCDIR) +CONFDIR= ${ETCDIR} USE_CSTD= gnu89 MAKE_ARGS+= CC="${CC}" MAKE_ARGS+= CXX="${CXX}" MAKE_ARGS+= VDR_USER=${VDR_USER} -MAKE_ARGS+= CONFDIR=$(CONFDIR) +MAKE_ARGS+= CONFDIR=${CONFDIR} MAKE_ARGS+= OSTYPE=FreeBSD MAKE_ARGS+= LIRC_DEVICE=/var/run/lirc/lircd MAKE_ARGS+= LIBDIR=../../lib Modified: head/net-im/jabber/Makefile ============================================================================== --- head/net-im/jabber/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/net-im/jabber/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -102,7 +102,7 @@ post-patch: 's|locale, LOCALEDIR)|locale)|' \ ${WRKSRC}/jabberd/lib/messages.cc @${REINPLACE_CMD} -e \ - 's|"$(localedir)|"$$(DESTDIR)$(localedir)|' \ + 's|"$$(localedir)|"$$(DESTDIR)$$(localedir)|' \ ${WRKSRC}/po/Makefile.in @${LN} -s jabberd.8.in ${WRKSRC}/man/jabberd14.8.in Modified: head/net-mgmt/xymon-server/Makefile ============================================================================== --- head/net-mgmt/xymon-server/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/net-mgmt/xymon-server/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -69,7 +69,7 @@ LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net post-patch: ${REINPLACE_CMD} -e 's|web-build client|web-build|' ${WRKSRC}/build/Makefile.rules ${REINPLACE_CMD} -e 's|install-docs install-client|install-docs|' ${WRKSRC}/build/Makefile.rules - ${REINPLACE_CMD} -e 's|$(INSTALLETCDIR)/protocols.cfg|$(INSTALLETCDIR)/protocols.cfg.DIST|' ${WRKSRC}/xymonnet/Makefile + ${REINPLACE_CMD} -e 's|$$(INSTALLETCDIR)/protocols.cfg|$$(INSTALLETCDIR)/protocols.cfg.DIST|' ${WRKSRC}/xymonnet/Makefile ${REINPLACE_CMD} -e 's|TRACEROUTE="traceroute"|TRACEROUTE="mtr -c 2 -n --report"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST ${RM} ${WRKSRC}/docs/manpages/man1/xymonping.1.html ${RM} ${WRKSRC}/xymonnet/xymonping.1 Modified: head/net/crtmpserver/Makefile ============================================================================== --- head/net/crtmpserver/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/net/crtmpserver/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -36,8 +36,8 @@ post-patch: .endif pre-install: - @${SH} $(WRKSRC)/fixConfFile.sh "${WRKSRC}/builders/cmake/crtmpserver/crtmpserver.lua" "${PREFIX}" "${WRKSRC}" - @${SH} $(WRKSRC)/fixConfFile.sh "${WRKSRC}/builders/cmake/crtmpserver/all.debug.lua" "${PREFIX}" "${WRKSRC}" + @${SH} ${WRKSRC}/fixConfFile.sh "${WRKSRC}/builders/cmake/crtmpserver/crtmpserver.lua" "${PREFIX}" "${WRKSRC}" + @${SH} ${WRKSRC}/fixConfFile.sh "${WRKSRC}/builders/cmake/crtmpserver/all.debug.lua" "${PREFIX}" "${WRKSRC}" post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/var/log/crtmpserver Modified: head/net/dgd/Makefile ============================================================================== --- head/net/dgd/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/net/dgd/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -26,7 +26,7 @@ WRKSRC= ${BASE_WRKSRC}/src PATCH_WRKSRC= ${BASE_WRKSRC} ALL_TARGET= install MAKE_JOBS_UNSAFE= yes -MAKE_ENV+= EXTRA_DEFINES="$(EXTRA_DEFINES)" +MAKE_ENV+= EXTRA_DEFINES="${EXTRA_DEFINES}" PORTDOCS= * Modified: head/net/samba42/Makefile ============================================================================== --- head/net/samba42/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/net/samba42/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -477,7 +477,7 @@ pre-configure: # XXX: Gross hack to allow build newer Samba while old one is installed. # This implies that LINKFLAGS_PYEMBED contains flags which are already -# used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread +# used in other parts of LINKFLAGS, namely -L${LOCALBASE}/lib and -pthread post-configure: -${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \ ${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py Modified: head/net/samba43/Makefile ============================================================================== --- head/net/samba43/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/net/samba43/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -477,7 +477,7 @@ pre-configure: # XXX: Gross hack to allow build newer Samba while old one is installed. # This implies that LINKFLAGS_PYEMBED contains flags which are already -# used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread +# used in other parts of LINKFLAGS, namely -L${LOCALBASE}/lib and -pthread post-configure: -${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \ ${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py Modified: head/net/samba44/Makefile ============================================================================== --- head/net/samba44/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/net/samba44/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -463,7 +463,7 @@ pre-configure: # XXX: Gross hack to allow build newer Samba while old one is installed. # This implies that LINKFLAGS_PYEMBED contains flags which are already -# used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread +# used in other parts of LINKFLAGS, namely -L${LOCALBASE}/lib and -pthread post-configure: -${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \ ${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py Modified: head/net/tiny-network-utilities/Makefile ============================================================================== --- head/net/tiny-network-utilities/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/net/tiny-network-utilities/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -23,7 +23,7 @@ NO_ARCH= yes FILES_EXEC= tiny-dhcp-server tiny-udp-proxy tiny-udp-anti-nat FILES_LIB= net_checksums tiny_utils -PLIST_FILES= $(FILES_EXEC:%=bin/%) $(FILES_LIB:%=${PYTHON_SITELIBDIR}/%.py) +PLIST_FILES= ${FILES_EXEC:%=bin/%} ${FILES_LIB:%=${PYTHON_SITELIBDIR}/%.py} .include <bsd.port.pre.mk> Modified: head/print/asprint/Makefile ============================================================================== --- head/print/asprint/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/print/asprint/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -17,6 +17,6 @@ ALL_TARGET= asprint MAKEFILE= makefile do-install: - ${INSTALL_PROGRAM} $(WRKSRC)/asprint ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/asprint ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/print/splix/Makefile ============================================================================== --- head/print/splix/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/print/splix/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -69,8 +69,8 @@ do-install: ${MKDIR} ${STAGEDIR}${BIN_DEST_DIR} .for MODEL in ${MODELS} ${MKDIR} ${STAGEDIR}${DEST_DIR_${MODEL}} -.for PPD in $(PPD_${MODEL}) - ${INSTALL_DATA} ${WRKSRC}/ppd/${PPD}.ppd ${STAGEDIR}$(DEST_DIR_${MODEL}) +.for PPD in ${PPD_${MODEL}} + ${INSTALL_DATA} ${WRKSRC}/ppd/${PPD}.ppd ${STAGEDIR}${DEST_DIR_${MODEL}} .endfor .endfor Modified: head/russian/ircd-hybrid/Makefile ============================================================================== --- head/russian/ircd-hybrid/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/russian/ircd-hybrid/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -26,7 +26,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/e USERS= ircdru GROUPS= ircdru -PLIST_SUB= USR=$(USERS) GRP=$(GROUPS) +PLIST_SUB= USR=${USERS} GRP=${GROUPS} .if defined(WITH_SMALL_NET) CONFIGURE_ARGS+=-enable-small-net Modified: head/security/calife/Makefile ============================================================================== --- head/security/calife/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/security/calife/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -20,10 +20,10 @@ CONFIGURE_ARGS= --with-etcdir=${PREFIX}/ CONFIGURE_ARGS+= --with-pam do-install: - $(INSTALL_PROGRAM) ${WRKSRC}/calife ${STAGEDIR}${PREFIX}/bin/calife - $(INSTALL_MAN) ${WRKSRC}/calife.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - $(INSTALL_MAN) ${WRKSRC}/calife.auth.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 - $(INSTALL_DATA) ${WRKSRC}/calife.auth-dist ${STAGEDIR}${PREFIX}/etc/calife.auth.sample + ${INSTALL_PROGRAM} ${WRKSRC}/calife ${STAGEDIR}${PREFIX}/bin/calife + ${INSTALL_MAN} ${WRKSRC}/calife.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/calife.auth.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 + ${INSTALL_DATA} ${WRKSRC}/calife.auth-dist ${STAGEDIR}${PREFIX}/etc/calife.auth.sample ${INSTALL_DATA} ${WRKSRC}/pam/freebsd9 ${STAGEDIR}${PREFIX}/etc/pam.d/calife.sample .include <bsd.port.mk> Modified: head/security/luasec/Makefile ============================================================================== --- head/security/luasec/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/security/luasec/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -16,7 +16,7 @@ GH_ACCOUNT= brunoos ALL_TARGET= bsd LIBDIR= -L${LUA_LIBDIR} -L${WRKSRC}/src/luasocket MAKE_ENV+= INCDIR="-I${LUA_INCDIR} -I${WRKSRC}/src" LUAPATH=${LUA_MODSHAREDIR} \ - CPATH=${LUA_MODLIBDIR} LD=$(CC) + CPATH=${LUA_MODLIBDIR} LD=${CC} USES= lua:51 USE_OPENSSL= yes CFLAGS+= -DOPENSSL_NO_SSL3 Modified: head/security/openssl-devel/Makefile ============================================================================== --- head/security/openssl-devel/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/security/openssl-devel/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -118,13 +118,13 @@ post-patch: post-configure: ${REINPLACE_CMD} \ -e 's|^MANDIR=.*$$|MANDIR=$$(PREFIX)/man|' \ - -e 's|LIBVERSION=[^ ]* |LIBVERSION=$(OPENSSL_SHLIBVER) |' \ - -e 's|$$(SHLIB_MAJOR).$$(SHLIB_MINOR)|$(OPENSSL_SHLIBVER)|g' \ + -e 's|LIBVERSION=[^ ]* |LIBVERSION=${OPENSSL_SHLIBVER} |' \ + -e 's|$$(SHLIB_MAJOR).$$(SHLIB_MINOR)|${OPENSSL_SHLIBVER}|g' \ -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \ -e 's| install_html_docs$$||' \ ${WRKSRC}/Makefile ${REINPLACE_CMD} \ - -e 's|^LIBVERSION=$$|LIBVERSION=$(OPENSSL_SHLIBVER) |' \ + -e 's|^LIBVERSION=$$|LIBVERSION=${OPENSSL_SHLIBVER} |' \ ${WRKSRC}/Makefile.shared post-install-SHARED-on: Modified: head/security/openssl/Makefile ============================================================================== --- head/security/openssl/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/security/openssl/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -216,7 +216,7 @@ do-configure: ${REINPLACE_CMD} \ -e 's|^MANDIR=.*$$|MANDIR=$$(PREFIX)/man|' \ -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \ - -e 's|LIBVERSION=[^ ]* |LIBVERSION=$(OPENSSL_SHLIBVER) |' \ + -e 's|LIBVERSION=[^ ]* |LIBVERSION=${OPENSSL_SHLIBVER} |' \ ${WRKSRC}/Makefile post-install: Modified: head/security/putty/Makefile ============================================================================== --- head/security/putty/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/security/putty/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -44,7 +44,7 @@ MAKE_ARGS+= GTK_CONFIG=: .if ${PORT_OPTIONS:MGSSAPI} _COMPAT= -DSTATIC_GSSAPI USES+= gssapi:base,flags -MAKE_ARGS+= KRB5CONFIG=$(KRB5CONFIG) +MAKE_ARGS+= KRB5CONFIG=${KRB5CONFIG} .else _COMPAT= -DNO_GSSAPI .endif Modified: head/security/tripwire/Makefile ============================================================================== --- head/security/tripwire/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/security/tripwire/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -139,7 +139,7 @@ make-pkg-install: @ ${ECHO_CMD} 'esac' >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} PACKAGE_INSTALLER=yes >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} POLICYSRC=/tmp/$$$$.tmp >> ${PKGPOSTINSTALL} - @ ${ECHO_CMD} PREFIX="$(PREFIX)" >> ${PKGPOSTINSTALL} + @ ${ECHO_CMD} PREFIX="${PREFIX}" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} DO_NOT_CONFIG=yes >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} TW_CLOBBER="false" >> ${PKGPOSTINSTALL} @ ${ECHO_CMD} TW_PROMPT="false" >> ${PKGPOSTINSTALL} Modified: head/security/yubico-piv-tool/Makefile ============================================================================== --- head/security/yubico-piv-tool/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/security/yubico-piv-tool/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -18,9 +18,9 @@ USES= libtool pathfix pkgconfig USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= OPENSSL_CFLAGS="$(OPENSSL_CFLAGS)" \ - OPENSSL_LIBS="-L$(OPENSSLLIB) -lcrypto" -OPENSSL_CFLAGS= -I$(OPENSSLINC) +CONFIGURE_ENV= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \ + OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" +OPENSSL_CFLAGS= -I${OPENSSLINC} PLIST_FILES= bin/yubico-piv-tool \ include/ykcs11/ykcs11-version.h \ Modified: head/shells/rc/Makefile ============================================================================== --- head/shells/rc/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/shells/rc/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -18,6 +18,6 @@ OPTIONS_DEFINE= READLINE READLINE_USES= readline READLINE_CONFIGURE_WITH=--with-readline -READLINE_MAKE_ARGS_OFF= CFLAGS="$(CFLAGS) -static" +READLINE_MAKE_ARGS_OFF= CFLAGS="${CFLAGS} -static" .include <bsd.port.mk> Modified: head/sysutils/bbcp/Makefile ============================================================================== --- head/sysutils/bbcp/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/sysutils/bbcp/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -22,7 +22,7 @@ BUILD_WRKSRC= ${WRKSRC}/src OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's|g++|$(CXX)|' -e 's|gcc|$(CC)|' \ + @${REINPLACE_CMD} -e 's|g++|${CXX}|' -e 's|gcc|${CC}|' \ ${WRKSRC}/src/Makefile do-install: Modified: head/sysutils/eventlog/Makefile ============================================================================== --- head/sysutils/eventlog/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/sysutils/eventlog/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -6,7 +6,7 @@ PORTVERSION= 0.2.12 PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/3.2.2/source/ -DISTFILES= $(PORTNAME)_$(PORTVERSION).tar.gz +DISTFILES= ${PORTNAME}_${PORTVERSION}.tar.gz MAINTAINER= cy@FreeBSD.org COMMENT= Replacement of the simple syslog() API providing structure to messages Modified: head/sysutils/file/Makefile ============================================================================== --- head/sysutils/file/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/sysutils/file/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -25,7 +25,7 @@ check regression-test test: build @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check post-patch: - @${REINPLACE_CMD} -e 's|$(datadir)/misc|$(datadir)/${PORTNAME}|g' \ + @${REINPLACE_CMD} -e 's|$$(datadir)/misc|$$(datadir)/${PORTNAME}|g' \ ${WRKSRC}/configure .include <bsd.port.mk> Modified: head/sysutils/gkrellm2/Makefile ============================================================================== --- head/sysutils/gkrellm2/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/sysutils/gkrellm2/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -50,7 +50,7 @@ PORTDOCS= COPYRIGHT CREDITS README Theme ALL_TARGET= freebsd -MAKE_ENV+= INSTALLROOT=${PREFIX} INSTALL_PREFIX=$(STAGEDIR) \ +MAKE_ENV+= INSTALLROOT=${PREFIX} INSTALL_PREFIX=${STAGEDIR} \ PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ SINSTALLDIR=${PREFIX}/sbin \ MANDIR=${MAN1PREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8 \ Modified: head/sysutils/py-stdiff/Makefile ============================================================================== --- head/sysutils/py-stdiff/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/sysutils/py-stdiff/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -17,7 +17,7 @@ PORTDOCS= * post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} - $(INSTALL_MAN) ${WRKSRC}/INSTALL.txt ${STAGEDIR}/${DOCSDIR}/ - $(INSTALL_MAN) ${WRKSRC}/LICENSE.txt ${STAGEDIR}/${DOCSDIR}/ + ${INSTALL_MAN} ${WRKSRC}/INSTALL.txt ${STAGEDIR}/${DOCSDIR}/ + ${INSTALL_MAN} ${WRKSRC}/LICENSE.txt ${STAGEDIR}/${DOCSDIR}/ (cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/) .include <bsd.port.mk> Modified: head/sysutils/sd-agent/Makefile ============================================================================== --- head/sysutils/sd-agent/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/sysutils/sd-agent/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -9,7 +9,7 @@ COMMENT= Server Density Agent for FreeBS LICENSE= BSD3CLAUSE -RUN_DEPENDS= $(LOCALBASE)/sbin/sysinfo:sysutils/sysinfo +RUN_DEPENDS= ${LOCALBASE}/sbin/sysinfo:sysutils/sysinfo USERS= sd-agent GROUPS= sd-agent @@ -20,23 +20,23 @@ GH_ACCOUNT= serverdensity USES= python shebangfix SHEBANG_FILES= agent.py -USE_RC_SUBR= $(PORTNAME) -SUB_LIST+= RCNAME=$(PORTNAME:S/-/_/g) +USE_RC_SUBR= ${PORTNAME} +SUB_LIST+= RCNAME=${PORTNAME:S/-/_/g} NO_ARCH= yes -INSTALLDIR= $(STAGEDIR)$(PREFIX)/libexec/$(PORTNAME) +INSTALLDIR= ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} FLIST= agent.py checks.py daemon.py logtail.py minjson.py pep8.sh plugins.py sd-deploy.py do-build:: - $(SED) -i .bak 's,%%PREFIX%%,$(PREFIX),' $(WRKSRC)/agent.py + ${SED} -i .bak 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/agent.py do-install:: - $(MKDIR) $(INSTALLDIR)/plugins -.for f in $(FLIST) - $(INSTALL_SCRIPT) $(WRKSRC)/$f $(INSTALLDIR) + ${MKDIR} ${INSTALLDIR}/plugins +.for f in ${FLIST} + ${INSTALL_SCRIPT} ${WRKSRC}/$f ${INSTALLDIR} .endfor - $(MKDIR) $(STAGEDIR)$(ETCDIR) - $(INSTALL_DATA) $(WRKSRC)/config.cfg $(STAGEDIR)$(ETCDIR)/config.cfg.sample + ${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/config.cfg ${STAGEDIR}${ETCDIR}/config.cfg.sample .include <bsd.port.mk> Modified: head/sysutils/syslog-ng-devel/Makefile ============================================================================== --- head/sysutils/syslog-ng-devel/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/sysutils/syslog-ng-devel/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -6,7 +6,7 @@ PORTVERSION= 3.7.3 PORTREVISION= 1 PKGNAMESUFFIX= -devel CATEGORIES= sysutils -DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/) +DISTVERSION= ${PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/} DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ @@ -21,7 +21,7 @@ LIB_DEPENDS= libevtlog.so:sysutils/event CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ syslog-ng-devel-[0-9]* -WRKSRC= $(WRKDIR)/$(PORTNAME)-$(DISTVERSION) +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS JAVA PYTHON Modified: head/sysutils/syslog-ng-incubator/Makefile ============================================================================== --- head/sysutils/syslog-ng-incubator/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/sysutils/syslog-ng-incubator/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -12,7 +12,7 @@ DISTFILES= syslog-ng-incubator-${PORTVER MAINTAINER= cy@FreeBSD.org COMMENT= The syslog-ng module incubator -WRKSRC= $(WRKDIR)/$(PORTNAME)-$(PORTVERSION) +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAKE_JOBS_UNSAFE= yes Modified: head/sysutils/syslog-ng36/Makefile ============================================================================== --- head/sysutils/syslog-ng36/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/sysutils/syslog-ng36/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -7,7 +7,7 @@ PORTVERSION= 3.6.4 PKGNAMESUFFIX= 36 .endif CATEGORIES= sysutils -DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/) +DISTVERSION= ${PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/} DISTFILES= syslog-ng-${DISTVERSION}.tar.gz MASTER_SITES= https://github.com/balabit/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ \ http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${DISTVERSION}/source/ \ @@ -23,7 +23,7 @@ LIB_DEPENDS= libevtlog.so:sysutils/event CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ syslog-ng-devel-[0-9]* -WRKSRC= $(WRKDIR)/$(PORTNAME)-$(DISTVERSION) +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS OPENSSL Modified: head/sysutils/syslog-ng37/Makefile ============================================================================== --- head/sysutils/syslog-ng37/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/sysutils/syslog-ng37/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -8,7 +8,7 @@ PORTREVISION= 4 PKGNAMESUFFIX= 37 .endif CATEGORIES= sysutils -DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/) +DISTVERSION= ${PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/} #DISTFILES= syslog-ng-${DISTVERSION}.tar.gz #MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ DISTFILES= syslog-ng-${DISTVERSION}_with_man.tar.gz @@ -26,7 +26,7 @@ BUILD_DEPENDS= xsltproc:textproc/libxsl CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ syslog-ng-devel-[0-9]* -WRKSRC= $(WRKDIR)/$(PORTNAME)-$(DISTVERSION) +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS JAVA PYTHON Modified: head/www/mod_clamav/Makefile ============================================================================== --- head/www/mod_clamav/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/www/mod_clamav/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -38,7 +38,7 @@ post-patch: do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} - $(APXS) -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \ + ${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \ -i -n 'clamav' ${WRKSRC}/.libs/mod_clamav.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so Modified: head/www/mod_encoding/Makefile ============================================================================== --- head/www/mod_encoding/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/www/mod_encoding/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -48,7 +48,7 @@ CONFIGURE_ENV+= ac_cv_lib_iconv_iconv=no do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} - $(APXS) -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \ + ${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \ -i -n ${MODULENAME} ${WRKSRC}/${MODULENAME}.la ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so Modified: head/www/vdr-plugin-live/Makefile ============================================================================== --- head/www/vdr-plugin-live/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/www/vdr-plugin-live/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -20,7 +20,7 @@ PATCH_STRIP= -p1 PORTDOCS= COPYING README HISTORY WRKSRC= ${WRKDIR}/${PLUGIN}-${PORTVERSION} VDR_PLUGIN_MAKEFILES= ${WRKSRC}/httpd/Makefile ${WRKSRC}/pages/Makefile -MAKE_ARGS+= INCLUDES="-I$(LOCALBASE)/include -I${WRKSRC}" +MAKE_ARGS+= INCLUDES="-I${LOCALBASE}/include -I${WRKSRC}" MAKE_ARGS+= PREFIX="${PREFIX}" USES= compiler:features Modified: head/x11-fonts/urwfonts/Makefile ============================================================================== --- head/x11-fonts/urwfonts/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/x11-fonts/urwfonts/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -19,7 +19,7 @@ SUB_FILES= pkg-message do-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} .for FILE in Fontmap - ${INSTALL_DATA} ${WRKSRC}/$(FILE) ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${FONTSDIR} .endfor ${INSTALL_DATA} ${WRKSRC}/*.pfb ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${WRKSRC}/*.afm ${STAGEDIR}${FONTSDIR} Modified: head/x11-wm/larswm/Makefile ============================================================================== --- head/x11-wm/larswm/Makefile Wed Jul 20 15:32:50 2016 (r418839) +++ head/x11-wm/larswm/Makefile Wed Jul 20 15:33:20 2016 (r418840) @@ -22,7 +22,7 @@ PLIST_FILES= bin/larsclock bin/larsmenu post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${PORTDOCS} - ${INSTALL_DATA} $(WRKSRC)/${file} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607201533.u6KFXK99080748>