summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/ExmanIDE/Makefile8
-rw-r--r--devel/ProjectCenter/Makefile4
-rw-r--r--devel/adacurses/Makefile8
-rw-r--r--devel/bullet/Makefile4
-rw-r--r--devel/cpuflags/Makefile4
-rw-r--r--devel/cscope/Makefile4
-rw-r--r--devel/distcc/Makefile.common4
-rw-r--r--devel/distccmon-gtk/Makefile4
-rw-r--r--devel/elfsh/Makefile4
-rw-r--r--devel/emacs-ilisp/Makefile4
-rw-r--r--devel/exctags/Makefile6
-rw-r--r--devel/glib2/Makefile.common6
-rw-r--r--devel/gnustep-make/Makefile4
-rw-r--r--devel/gnustep-make/gnustep.mk4
-rw-r--r--devel/gprbuild-aux/Makefile4
-rw-r--r--devel/gps/Makefile6
-rw-r--r--devel/grantlee/Makefile4
-rw-r--r--devel/lcov/Makefile4
-rw-r--r--devel/lemon/Makefile4
-rw-r--r--devel/libgphoto2/Makefile4
-rw-r--r--devel/libmemmgr/Makefile4
-rw-r--r--devel/mico/Makefile4
-rw-r--r--devel/mono-tools/Makefile4
-rw-r--r--devel/monodevelop/Makefile6
-rw-r--r--devel/noweb/Makefile4
-rw-r--r--devel/nsis/Makefile4
-rw-r--r--devel/nss/Makefile4
-rw-r--r--devel/pwlib/Makefile4
-rw-r--r--devel/rebar/Makefile4
-rw-r--r--devel/rox-lib/Makefile6
-rw-r--r--devel/rt3/Makefile.install8
-rw-r--r--devel/slib/Makefile4
-rw-r--r--devel/sloccount/Makefile6
-rw-r--r--devel/tcllib/Makefile6
-rw-r--r--devel/tclreadline/Makefile4
-rw-r--r--devel/ucl/Makefile4
-rw-r--r--devel/ucpp/Makefile4
-rw-r--r--devel/uno/Makefile4
-rw-r--r--devel/vanessa_logger/Makefile4
-rw-r--r--devel/zookeeper/Makefile4
-rw-r--r--devel/zzuf/Makefile4
41 files changed, 95 insertions, 95 deletions
diff --git a/devel/ExmanIDE/Makefile b/devel/ExmanIDE/Makefile
index 94e3183f9fc..c2071ca0bd9 100644
--- a/devel/ExmanIDE/Makefile
+++ b/devel/ExmanIDE/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/07/03 05:03:07 adam Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:13 jperkin Exp $
DISTNAME= ExmanIDE-0.9.4
PKGREVISION= 7
@@ -21,20 +21,20 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 37 # py-wxWidgets
SUBST_CLASSES+= mod
SUBST_MESSAGE.mod= Fixing deprecated module names.
-SUBST_STAGE.mod= post-patch
+SUBST_STAGE.mod= pre-configure
SUBST_FILES.mod= Profile.py SourceEditor.py StcStyle.py
SUBST_SED.mod= -e 's,wxPython\.lib\.PyCrust,wxPython.py,g'
SUBST_SED.mod+= -e 's,wxPython\.py,wx.py,g'
SUBST_CLASSES+= py
SUBST_MESSAGE.py= Fixing paths in a wrapper script.
-SUBST_STAGE.py= post-patch
+SUBST_STAGE.py= pre-configure
SUBST_FILES.py= ExmanIDE
SUBST_SED.py= -e 's,python \$$0\.pyw,${PYTHONBIN} ${PREFIX}/share/${PKGBASE}/ExmanIDE.pyw,g'
SUBST_CLASSES+= py2
SUBST_MESSAGE.py2= Fixing path in Python module.
-SUBST_STAGE.py2= post-patch
+SUBST_STAGE.py2= pre-configure
SUBST_FILES.py2= ExmanIDE.pyw
SUBST_SED.py2= -e 's,/usr/bin/env python.*$$,${PYTHONBIN},'
diff --git a/devel/ProjectCenter/Makefile b/devel/ProjectCenter/Makefile
index 9861b444a67..9b598d3620e 100644
--- a/devel/ProjectCenter/Makefile
+++ b/devel/ProjectCenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2018/04/14 07:34:15 adam Exp $
+# $NetBSD: Makefile,v 1.52 2018/07/04 13:40:13 jperkin Exp $
DISTNAME= ProjectCenter-0.6.2
PKGREVISION= 8
@@ -18,7 +18,7 @@ NO_CONFIGURE= yes
MAKE_FILE= GNUmakefile
SUBST_CLASSES+= gmake
-SUBST_STAGE.gmake= post-patch
+SUBST_STAGE.gmake= pre-configure
SUBST_FILES.gmake+= Framework/GNUmakefile.preamble
SUBST_FILES.gmake+= Modules/Preferences/Build/PCBuildPrefs.h
SUBST_SED.gmake+= -e 's|.(GMAKE)|${GMAKE:Q}|g'
diff --git a/devel/adacurses/Makefile b/devel/adacurses/Makefile
index 2ceb5eaa509..d4faf1b4a22 100644
--- a/devel/adacurses/Makefile
+++ b/devel/adacurses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/04/02 09:30:06 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:13 jperkin Exp $
PKGNAME= adacurses-${ACVERSION}
CATEGORIES= devel
@@ -28,17 +28,17 @@ PLIST_SUBST= atic=adacurses/terminal_interface-curses
USE_BUILTIN.ncurses= no
SUBST_CLASSES= adagen pragma sample
-SUBST_STAGE.adagen= post-patch
+SUBST_STAGE.adagen= pre-configure
SUBST_FILES.adagen= gen/Makefile.in
SUBST_SED.adagen= -e '/(INSTALL_PROG)/d' -e 's|@ADAGEN_LDFLAGS@||'
SUBST_MESSAGE.adagen= Adjust gen Makefile
-SUBST_STAGE.sample= post-patch
+SUBST_STAGE.sample= pre-configure
SUBST_FILES.sample= samples/Makefile.in
SUBST_SED.sample= -e 's|@LIBS@|@LIBS@ -lmenu -lform -lpanel|'
SUBST_MESSAGE.sample= Adjust samples Makefile
-SUBST_STAGE.pragma= post-patch
+SUBST_STAGE.pragma= pre-configure
SUBST_FILES.pragma= gen/terminal_interface-curses.ads.m4 \
gen/terminal_interface-curses-menus.ads.m4 \
gen/terminal_interface-curses-forms.ads.m4 \
diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile
index b56ea57ea71..8a16dac36b2 100644
--- a/devel/bullet/Makefile
+++ b/devel/bullet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/09/11 07:45:33 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:13 jperkin Exp $
PKGNAME= ${DISTNAME:S/-r2704//}
DISTNAME= bullet-2.82-r2704
@@ -22,7 +22,7 @@ CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=on
CMAKE_ARGS+= -DINSTALL_LIBS:BOOL=on
SUBST_CLASSES+= lcompat
-SUBST_STAGE.lcompat= post-patch
+SUBST_STAGE.lcompat= pre-configure
SUBST_FILES.lcompat= Demos/AllBulletDemos/CMakeLists.txt
SUBST_SED.lcompat= -e "s|{OPENGL_glu_LIBRARY}|{OPENGL_glu_LIBRARY} -lcompat|g"
SUBST_MESSAGE.lcompat= Adding -lcompat for demos
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index 059094fed12..9fadf9eaa9c 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2016/01/28 19:11:30 abs Exp $
+# $NetBSD: Makefile,v 1.154 2018/07/04 13:40:13 jperkin Exp $
DISTNAME= cpuflags-1.43
CATEGORIES= devel sysutils
@@ -24,7 +24,7 @@ MAKE_FLAGS+= INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q}
MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1
SUBST_CLASSES+= cpuflags
-SUBST_STAGE.cpuflags= post-patch
+SUBST_STAGE.cpuflags= pre-configure
SUBST_FILES.cpuflags= cpuflags.sh
SUBST_SED.cpuflags= -e s,@@SH@@,${SH:Q},
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index bcc8baca420..b57cc1d702a 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2015/08/18 07:31:04 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2018/07/04 13:40:13 jperkin Exp $
DISTNAME= cscope-15.8a
PKGREVISION= 2
@@ -20,7 +20,7 @@ SUBST_CLASSES+= path
SUBST_SED.path= -e "s,PATH=\"\\(.*\\),PATH=\"${PREFIX}/bin:\\1,"
SUBST_FILES.path= contrib/xcscope/cscope-indexer
SUBST_MESSAGE.path= Fixing path in cscope-indexer.
-SUBST_STAGE.path= post-patch
+SUBST_STAGE.path= pre-configure
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/contrib/xcscope/cscope-indexer \
diff --git a/devel/distcc/Makefile.common b/devel/distcc/Makefile.common
index eeda2c52b73..997d41897c3 100644
--- a/devel/distcc/Makefile.common
+++ b/devel/distcc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2014/04/25 16:13:31 adam Exp $
+# $NetBSD: Makefile.common,v 1.12 2018/07/04 13:40:13 jperkin Exp $
# used by devel/distcc-pump/Makefile
# used by devel/distccmon-gnome/Makefile
# used by devel/distccmon-gtk/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CHECK_PORTABILITY_SKIP+= contrib/redhat/*
SUBST_CLASSES+= doc
-SUBST_STAGE.doc= post-patch
+SUBST_STAGE.doc= pre-configure
SUBST_FILES.doc= src/distcc.c src/hosts.c
SUBST_SED.doc= -e "s|%s/distcc/hosts|%s/hosts|g"
SUBST_MESSAGE.doc= Fixing paths.
diff --git a/devel/distccmon-gtk/Makefile b/devel/distccmon-gtk/Makefile
index 84d88ef622c..72fc56d2d97 100644
--- a/devel/distccmon-gtk/Makefile
+++ b/devel/distccmon-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2018/04/16 14:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2018/07/04 13:40:13 jperkin Exp $
PKGNAME= ${DISTNAME:S/-/-gtk-/:S/rc1//}
PKGREVISION= 7
@@ -10,7 +10,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --with-gtk
SUBST_CLASSES+= gtk
-SUBST_STAGE.gtk= post-patch
+SUBST_STAGE.gtk= pre-configure
SUBST_FILES.gtk= gnome/distccmon-gnome.desktop src/mon-gnome.c
SUBST_SED.gtk= -e "s/distccmon-gnome/distccmon-gtk/g"
SUBST_MESSAGE.gtk= Renaming -gnome to -gtk.
diff --git a/devel/elfsh/Makefile b/devel/elfsh/Makefile
index 69f98ac4e47..3bcf2c63859 100644
--- a/devel/elfsh/Makefile
+++ b/devel/elfsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/08/01 16:47:37 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:13 jperkin Exp $
#
VERS= 0.51b3
@@ -19,7 +19,7 @@ LDFLAGS+= ${BUILDLINK_LDADD.dl:Q}
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
SUBST_CLASSES+= elfsh
-SUBST_STAGE.elfsh= post-patch
+SUBST_STAGE.elfsh= pre-configure
SUBST_MESSAGE.elfsh= Fixing hardcoded paths.
SUBST_FILES.elfsh= vm/include/elfsh.h
SUBST_SED.elfsh= -e '/ELFSH_SHELL/s,/bin/bash,${SH},'
diff --git a/devel/emacs-ilisp/Makefile b/devel/emacs-ilisp/Makefile
index c2c545f9c27..4f89d958f5b 100644
--- a/devel/emacs-ilisp/Makefile
+++ b/devel/emacs-ilisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/08/01 14:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2018/07/04 13:40:13 jperkin Exp $
#
DISTNAME= ilisp-20021222
@@ -18,7 +18,7 @@ BUILD_TARGET= compile
SITELISP= ${EMACS_LISPPREFIX}/ilisp
SUBST_CLASSES+= string-to-int
-SUBST_STAGE.string-to-int= post-patch
+SUBST_STAGE.string-to-int= pre-configure
SUBST_MESSAGE.string-to-int= obsolete function (as of 22.1); use `string-to-number' instead
SUBST_FILES.string-to-int+= ilisp-acl.el
SUBST_SED.string-to-int= -e 's/string-to-int/string-to-number/'
diff --git a/devel/exctags/Makefile b/devel/exctags/Makefile
index 620b1563ae6..a8eb1ff06e2 100644
--- a/devel/exctags/Makefile
+++ b/devel/exctags/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/11/14 06:01:02 richard Exp $
+# $NetBSD: Makefile,v 1.29 2018/07/04 13:40:14 jperkin Exp $
#
DISTNAME= ctags-5.8
@@ -24,7 +24,7 @@ CPPFLAGS+= -DETAGS="\"exetags\""
CFLAGS+= ${CPPFLAGS}
SUBST_CLASSES+= man
-SUBST_STAGE.man= post-patch
+SUBST_STAGE.man= pre-configure
SUBST_FILES.man= ctags.1
SUBST_SED.man= -e 's|^ctags \\-|exctags \\-|'
SUBST_SED.man+= -e 's|fBctags|fBexctags|g'
@@ -34,7 +34,7 @@ SUBST_SED.man+= -e 's|"etags|"exetags|g'
SUBST_SED.man+= -e 's|/usr/local|${PREFIX}|g'
SUBST_CLASSES+= rename
-SUBST_STAGE.rename= post-patch
+SUBST_STAGE.rename= pre-configure
SUBST_FILES.rename= c.c eiffel.c general.h lregex.c lua.c main.c \
options.c parse.c routines.c
SUBST_SED.rename= -e 's|__unused__|__unused_|g'
diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 505109fccb6..7695a1142d1 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.63 2018/04/23 08:26:50 adam Exp $
+# $NetBSD: Makefile.common,v 1.64 2018/07/04 13:40:14 jperkin Exp $
#
# used by devel/glib2/Makefile
# used by devel/gdbus-codegen/Makefile
@@ -55,7 +55,7 @@ CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
.if ${OPSYS} == "FreeBSD"
SUBST_CLASSES+= thr
-SUBST_STAGE.thr= post-patch
+SUBST_STAGE.thr= pre-configure
SUBST_FILES.thr= gthread/Makefile.in
. if ${OS_VERSION:R} >= 5
SUBST_SED.thr+= -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
@@ -106,7 +106,7 @@ CONFIGURE_ARGS+= --disable-threads
BUILD_DEFS+= VARBASE
SUBST_CLASSES+= dbusdb
SUBST_MESSAGE.dbusdb= Adjust dbus machine uuid path to dbus package
-SUBST_STAGE.dbusdb= post-patch
+SUBST_STAGE.dbusdb= pre-configure
SUBST_FILES.dbusdb= gio/gdbusconnection.c
SUBST_FILES.dbusdb+= gio/gdbusprivate.c
SUBST_FILES.dbusdb+= po/glib20.pot
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index f4dd70c1972..b8b36ec44bc 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2015/04/19 04:13:26 manu Exp $
+# $NetBSD: Makefile,v 1.58 2018/07/04 13:40:14 jperkin Exp $
DISTNAME= gnustep-make-2.6.2
PKGREVISION= 2
@@ -44,7 +44,7 @@ GNUSTEP_ARCH= ${MACHINE_ARCH}
PLIST_SUBST+= GNUSTEP_ARCH=${GNUSTEP_ARCH}
SUBST_CLASSES+= target
-SUBST_STAGE.target= post-patch
+SUBST_STAGE.target= pre-configure
SUBST_FILES.target= target.make
SUBST_SED.target+= -e 's|/usr/pkg|${PREFIX}|g'
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk
index 0868e6193e3..3bd9a2005a9 100644
--- a/devel/gnustep-make/gnustep.mk
+++ b/devel/gnustep-make/gnustep.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gnustep.mk,v 1.26 2017/12/31 16:39:41 gdt Exp $
+# $NetBSD: gnustep.mk,v 1.27 2018/07/04 13:40:14 jperkin Exp $
.if !defined(GNUSTEP_MK)
GNUSTEP_MK= #defined
@@ -64,7 +64,7 @@ GNUSTEP_LDFLAGS= ${GNUSTEP_LFLAGS} ${GNUSTEP_RFLAGS}
.if defined(FIX_GNUSTEP_INSTALLATION_DIR)
SUBST_CLASSES+= gnustep_installation_dir
-SUBST_STAGE.gnustep_installation_dir= post-patch
+SUBST_STAGE.gnustep_installation_dir= pre-configure
SUBST_FILES.gnustep_installation_dir?= GNUmakefile
SUBST_SED.gnustep_installation_dir+= -e 's|GNUSTEP_INSTALLATION_DIR.*=.*..GNUSTEP_\(.*\)_ROOT.*|GNUSTEP_INSTALLATION_DOMAIN = \1|'
SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Libraries|$${DESTDIR}${GNUSTEP_LIB_DIR}/Libraries/${PKGNAME_NOREV}|g'
diff --git a/devel/gprbuild-aux/Makefile b/devel/gprbuild-aux/Makefile
index 6d25cc0af2e..452a69a967a 100644
--- a/devel/gprbuild-aux/Makefile
+++ b/devel/gprbuild-aux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/04/02 09:30:06 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:14 jperkin Exp $
DISTNAME= gprbuild-aux-${SNAPSHOT}
CATEGORIES= devel
@@ -21,7 +21,7 @@ BUILD_DIRS= ${WRKSRC}/construction
SUBST_CLASSES= lbase
-SUBST_STAGE.lbase= post-patch
+SUBST_STAGE.lbase= pre-configure
SUBST_FILES.lbase= share/gprconfig/compilers.xml
SUBST_SED.lbase= -e "s|/usr/local|${LOCALBASE}|"
SUBST_MESSAGE.lbase= Ensure pkgsrc localbase is used
diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index 3965faac108..d4d3ada284b 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2018/04/16 14:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2018/07/04 13:40:14 jperkin Exp $
DISTNAME= gps-${GPS_VERSION}
PKGREVISION= 17
@@ -33,11 +33,11 @@ WRKSRC= ${WRKDIR}/gps-release-ide-${GPS_VERSION}-src
CONFIGURE_ARGS+= --disable-shared --with-gmp=${PREFIX}
SUBST_CLASSES+= coll python
-SUBST_STAGE.coll= post-patch
+SUBST_STAGE.coll= pre-configure
SUBST_FILES.coll= gnatlib/src/gnatcoll_readline.gpr.in
SUBST_SED.coll= -e "s|@PREFIX@|${PREFIX}|g"
SUBST_SED.coll+= -e "s|-rpath|${LINKER_RPATH_FLAG}|g"
-SUBST_STAGE.python= post-patch
+SUBST_STAGE.python= pre-configure
SUBST_FILES.python= share/plug-ins/gps_utils/console_process.py
SUBST_SED.python= -e "s|/usr/bin/python|${PYTHONBIN}|"
diff --git a/devel/grantlee/Makefile b/devel/grantlee/Makefile
index 237eab1335f..bdd68a4bd2d 100644
--- a/devel/grantlee/Makefile
+++ b/devel/grantlee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/03/12 11:15:27 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:14 jperkin Exp $
#
DISTNAME= grantlee-0.5.1
@@ -15,7 +15,7 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
SUBST_CLASSES+= fix-inc
-SUBST_STAGE.fix-inc= post-patch
+SUBST_STAGE.fix-inc= pre-configure
SUBST_MESSAGE.fix-inc= Fixing install dir for includes
SUBST_FILES.fix-inc+= CMakeLists.txt
SUBST_SED.fix-inc+= -e 's,INCLUDE_INSTALL_DIR include,INCLUDE_INSTALL_DIR include/grantlee-qt4,'
diff --git a/devel/lcov/Makefile b/devel/lcov/Makefile
index d1c608478d4..5e77b6fb969 100644
--- a/devel/lcov/Makefile
+++ b/devel/lcov/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/04/10 01:26:26 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:14 jperkin Exp $
#
DISTNAME= lcov-1.13
@@ -16,7 +16,7 @@ USE_TOOLS+= perl
REPLACE_PERL= bin/gendesc bin/genhtml bin/geninfo bin/genpng bin/lcov
SUBST_CLASSES+= egdir
-SUBST_STAGE.egdir= post-patch
+SUBST_STAGE.egdir= pre-configure
SUBST_FILES.egdir= bin/genhtml
SUBST_FILES.egdir+= bin/geninfo
SUBST_FILES.egdir+= bin/lcov
diff --git a/devel/lemon/Makefile b/devel/lemon/Makefile
index 10dea9ab4eb..87fb1a9a6f4 100644
--- a/devel/lemon/Makefile
+++ b/devel/lemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/04/03 19:58:19 adam Exp $
+# $NetBSD: Makefile,v 1.5 2018/07/04 13:40:14 jperkin Exp $
.include "../../databases/sqlite3/Makefile.common"
@@ -25,7 +25,7 @@ INSTALLATION_DIRS= bin share/lemon share/doc/lemon
SUBST_CLASSES+= paths
SUBST_FILES.paths= lemon.c
SUBST_SED.paths+= -e 's,"lempar.c","${PREFIX}/share/lemon/lempar.c",g'
-SUBST_STAGE.paths= post-patch
+SUBST_STAGE.paths= pre-configure
do-build:
cd ${WRKSRC}/tool && ${CC} ${CFLAGS} ${LDFLAGS} lemon.c -o lemon
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index d9e927b58f4..b0b2bdac936 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2018/03/31 22:43:01 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2018/07/04 13:40:14 jperkin Exp $
DISTNAME= libgphoto2-2.5.8
PKGREVISION= 3
@@ -30,7 +30,7 @@ PLIST_VARS+= libusb
BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,--version-script=./libgphoto2_port.ver:-Wl,-M./libgphoto2_port.ver
SUBST_CLASSES.SunOS+= mapfile
-SUBST_STAGE.mapfile= post-patch
+SUBST_STAGE.mapfile= pre-configure
SUBST_FILES.mapfile= libgphoto2_port/libgphoto2_port/libgphoto2_port.ver
SUBST_SED.mapfile= -e '/gpi_gphoto_port_type_map/d'
diff --git a/devel/libmemmgr/Makefile b/devel/libmemmgr/Makefile
index fa7f97ce159..26c6b614477 100644
--- a/devel/libmemmgr/Makefile
+++ b/devel/libmemmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/12/08 16:18:35 bsiegert Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:14 jperkin Exp $
#
DISTNAME= MemMgr-1.04
@@ -15,7 +15,7 @@ INSTALLATION_DIRS= include lib
USE_TOOLS+= groff
SUBST_CLASSES+= prefix
-SUBST_STAGE.prefix= post-patch
+SUBST_STAGE.prefix= pre-configure
SUBST_MESSAGE.prefix= Fixing absolute paths.
SUBST_FILES.prefix= Makefile
SUBST_SED.prefix= -e 's|/usr/local|${PREFIX}|'
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 94811a3ae6e..202f4c4d499 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/04/19 11:24:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:14 jperkin Exp $
#
#
@@ -20,7 +20,7 @@ GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
SUBST_CLASSES+= exampledir
-SUBST_STAGE.exampledir= post-patch
+SUBST_STAGE.exampledir= pre-configure
SUBST_MESSAGE.exampledir= Fixing up examples directory path
SUBST_FILES.exampledir= demo/ccm/Makefile demo/Makefile demo/MakeVars
SUBST_FILES.exampledir+= demo/csiv2/Makefile demo/csiv2/interop/Makefile
diff --git a/devel/mono-tools/Makefile b/devel/mono-tools/Makefile
index 88a865d4c2d..9088a13b6fd 100644
--- a/devel/mono-tools/Makefile
+++ b/devel/mono-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2018/04/17 22:29:37 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2018/07/04 13:40:15 jperkin Exp $
DISTNAME= mono-tools-3.10
PKGREVISION= 17
@@ -20,7 +20,7 @@ MAKE_JOBS_SAFE= no
CONFIGURE_ARGS+= --mandir=${PKGMANDIR}
SUBST_CLASSES+= fix-mcs
-SUBST_STAGE.fix-mcs= post-patch
+SUBST_STAGE.fix-mcs= pre-configure
SUBST_MESSAGE.fix-mcs= Fix compiler name
SUBST_FILES.fix-mcs= configure
SUBST_SED.fix-mcs= -e 's,gmcs,mcs,'
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index c846f50e837..683ece821c1 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2018/04/16 14:33:48 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2018/07/04 13:40:15 jperkin Exp $
MD_VERSION= 5.0.1
DISTNAME= monodevelop-${MD_VERSION}-0
@@ -35,13 +35,13 @@ MAKE_OVERRIDE+= src/addins/MonoDevelop.Autotools/templates/rules.make
MAKE_OVERRIDE+= src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
SUBST_CLASSES+= fix-gmake
-SUBST_STAGE.fix-gmake= post-patch
+SUBST_STAGE.fix-gmake= pre-configure
SUBST_MESSAGE.fix-gmake= Fixing GNU make references
SUBST_FILES.fix-gmake= ${MAKE_OVERRIDE}
SUBST_SED.fix-gmake= -e 's,MAKEPROGRAM,${MAKE_PROGRAM},'
SUBST_CLASSES+= fix-mcs
-SUBST_STAGE.fix-mcs= post-patch
+SUBST_STAGE.fix-mcs= pre-configure
SUBST_MESSAGE.fix-mcs= Fix compiler name
SUBST_FILES.fix-mcs= configure
SUBST_SED.fix-mcs= -e 's,gmcs,mcs,'
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 34ea3ee652a..6e6f741954e 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2013/10/30 02:58:19 minskim Exp $
+# $NetBSD: Makefile,v 1.42 2018/07/04 13:40:15 jperkin Exp $
DISTNAME= noweb-2.11b
PKGREVISION= 1
@@ -25,7 +25,7 @@ SUBST_FILES.mktemp+= src/shell/roff.mm contrib/conrado/d2tex
SUBST_FILES.mktemp+= contrib/jobling/correct-refs.nw
SUBST_FILES.mktemp+= contrib/norman/htmlgif/pstopbm
SUBST_SED.mktemp+= -e 's,@MKTEMP@,${TOOLS_PATH.mktemp},g'
-SUBST_STAGE.mktemp= post-patch
+SUBST_STAGE.mktemp= pre-configure
.if ${OPSYS} != "SunOS"
do-configure:
diff --git a/devel/nsis/Makefile b/devel/nsis/Makefile
index 65daadf3c8a..88504184d1e 100644
--- a/devel/nsis/Makefile
+++ b/devel/nsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2015/11/25 12:49:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:15 jperkin Exp $
#
DISTNAME= nsis-${NSIS_VER}
@@ -30,7 +30,7 @@ MAKENSIS_BIN= ${PREFIX}/share/nsis/makensis
INSTALLATION_DIRS= bin share/nsis
SUBST_CLASSES+= makensis
-SUBST_STAGE.makensis= post-patch
+SUBST_STAGE.makensis= pre-configure
SUBST_FILES.makensis= makensis.sh
SUBST_SED.makensis= -e s,@@SH@@,${SH:Q},
SUBST_SED.makensis+= -e s,@@MAKENSIS@@,${MAKENSIS_BIN:Q},
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 17c2031d98d..4776fd402d8 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2018/06/07 19:04:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.154 2018/07/04 13:40:15 jperkin Exp $
DISTNAME= nss-${NSS_RELEASE:S/.0$//}
NSS_RELEASE= 3.37.3
@@ -59,7 +59,7 @@ MAKE_ENV.SunOS+= CC_IS_CLANG=YES
.endif
SUBST_CLASSES+= 64bit
-SUBST_STAGE.64bit= post-patch
+SUBST_STAGE.64bit= pre-configure
SUBST_FILES.64bit= nss/lib/freebl/*
SUBST_SED.64bit= -e 's,NSS_USE_64,_LP64,g'
SUBST_MESSAGE.conf= Use a generic 64bit check
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 8d9ccb9e7ac..256753743d8 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2017/09/03 08:53:07 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2018/07/04 13:40:15 jperkin Exp $
DISTNAME= pwlib-v1_8_3-src
PKGNAME= pwlib-1.8.3
@@ -38,7 +38,7 @@ SUBST_SED.paths+= -e 's,@BSD_INSTALL_LIB@,${INSTALL_LIB},g'
SUBST_SED.paths+= -e 's,@BSD_INSTALL_PROGRAM@,${INSTALL_PROGRAM},g'
SUBST_SED.paths+= -e 's,@PTHREAD_FLAGS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
SUBST_SED.paths+= -e 's,@LIBOSSAUDIO@,${LIBOSSAUDIO},g'
-SUBST_STAGE.paths= post-patch
+SUBST_STAGE.paths= pre-configure
post-extract:
mkdir ${WRKSRC}/share
diff --git a/devel/rebar/Makefile b/devel/rebar/Makefile
index 18da5b846f1..0bbe91d7d8c 100644
--- a/devel/rebar/Makefile
+++ b/devel/rebar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/07/30 22:32:17 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:15 jperkin Exp $
DISTNAME= rebar-2.6.4
CATEGORIES= devel
@@ -18,7 +18,7 @@ do-install:
SUBST_CLASSES+= shebang
SUBST_FILES.shebang= src/rebar_escripter.erl
SUBST_SED.shebang+= -e 's,/usr/bin/env escript,${PREFIX}/bin/escript,'
-SUBST_STAGE.shebang= post-patch
+SUBST_STAGE.shebang= pre-configure
.include "../../lang/erlang/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/rox-lib/Makefile b/devel/rox-lib/Makefile
index 571faca103f..b5a888f01a6 100644
--- a/devel/rox-lib/Makefile
+++ b/devel/rox-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/07/03 05:03:14 adam Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:15 jperkin Exp $
DISTNAME= rox-lib-2.0.2
PKGREVISION= 14
@@ -30,7 +30,7 @@ INSTALLATION_DIRS= share/rox/ROX-Lib2
SUBST_CLASSES+= path
SUBST_MESSAGE.path= Fixing hardcoded paths.
-SUBST_STAGE.path= post-patch
+SUBST_STAGE.path= pre-configure
SUBST_FILES.path= python/rox/basedir.py
SUBST_FILES.path+= python/rox/choices.py
SUBST_FILES.path+= tests/python/testbasedir.py
@@ -39,7 +39,7 @@ SUBST_SED.path= -e 's,/usr/local,${PREFIX},g'
SUBST_CLASSES+= lib
SUBST_MESSAGE.lib= Fixing hardcoded paths for ROX-Lib.
-SUBST_STAGE.lib= post-patch
+SUBST_STAGE.lib= pre-configure
SUBST_FILES.lib= Help/findrox.py
SUBST_SED.lib= -e 's,/usr/local/lib,${PREFIX}/share/rox,g'
diff --git a/devel/rt3/Makefile.install b/devel/rt3/Makefile.install
index 5d7f731d907..53273c5e73d 100644
--- a/devel/rt3/Makefile.install
+++ b/devel/rt3/Makefile.install
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.install,v 1.21 2016/05/17 10:32:07 fhajny Exp $
+# $NetBSD: Makefile.install,v 1.22 2018/07/04 13:40:15 jperkin Exp $
.include "dirs.mk"
@@ -31,12 +31,12 @@ SUBST_STAGE.prefix= pre-configure
SUBST_CLASSES+= etcpath
SUBST_FILES.etcpath= sbin/rt-setup-database.in
SUBST_SED.etcpath= -e 's,\$$RT::EtcPath,"${RT_SHARE_DIR}/etc",'
-SUBST_STAGE.etcpath= post-patch
+SUBST_STAGE.etcpath= pre-configure
SUBST_CLASSES+= path
SUBST_FILES.path= bin/webmux.pl.in lib/RT/Interface/CLI.pm
SUBST_SED.path= -e 's,/bin:/usr/bin,/bin:/usr/bin:${PREFIX}/bin,'
-SUBST_STAGE.path= post-patch
+SUBST_STAGE.path= pre-configure
SUBST_CLASSES+= hardwired
SUBST_FILES.hardwired= share/html/NoAuth/RichText/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl \
@@ -44,7 +44,7 @@ SUBST_FILES.hardwired= share/html/NoAuth/RichText/FCKeditor/editor/dialog/fck_sp
etc/upgrade/shrink_transactions_table.pl \
etc/upgrade/upgrade-mysql-schema.pl
SUBST_SED.hardwired= -e 's,/usr/bin/perl,'${PERL5}','
-SUBST_STAGE.hardwired= post-patch
+SUBST_STAGE.hardwired= pre-configure
RT_CONFIG_FILES= RT_Config.pm RT_SiteConfig.pm
diff --git a/devel/slib/Makefile b/devel/slib/Makefile
index dd58f6125d0..7856363063f 100644
--- a/devel/slib/Makefile
+++ b/devel/slib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2016/09/15 14:02:08 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2018/07/04 13:40:15 jperkin Exp $
DISTNAME= slib-3b5
#
@@ -29,7 +29,7 @@ INFO_FILES= yes
INSTALLATION_DIRS= ${PKGINFODIR} share/slib share/doc/slib
SUBST_CLASSES+= scmpath
-SUBST_STAGE.scmpath= post-patch
+SUBST_STAGE.scmpath= pre-configure
SUBST_FILES.scmpath= guile.init
SUBST_SED.scmpath= -e "s|/usr/share/slib|${PREFIX}/share/slib|"
diff --git a/devel/sloccount/Makefile b/devel/sloccount/Makefile
index 03ab87725db..2f5a3e14915 100644
--- a/devel/sloccount/Makefile
+++ b/devel/sloccount/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/09/06 09:03:01 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:15 jperkin Exp $
DISTNAME= sloccount-2.26
@@ -50,14 +50,14 @@ REPLACE_PERL+= sql_count
SUBST_CLASSES+= generic
SUBST_MESSAGE.generic= Fixing path to internal generic_count binary.
-SUBST_STAGE.generic= post-patch
+SUBST_STAGE.generic= pre-configure
SUBST_SED.generic= -e 's,^generic_count,${PREFIX}/libexec/sloccount/&,g'
SUBST_FILES.generic= ada_count awk_count csh_count exp_count lisp_count \
makefile_count ruby_count sed_count sh_count tcl_count
SUBST_CLASSES+= prefix
SUBST_MESSAGE.prefix= Fixing path to internal binaries.
-SUBST_STAGE.prefix= post-patch
+SUBST_STAGE.prefix= pre-configure
SUBST_SED.prefix= -e 's,@PREFIX@,${PREFIX},g'
SUBST_FILES.prefix= compute_all compute_sloc_lang lex_count sloccount
diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index cb6f0739955..3c10abadd05 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/11/06 19:55:15 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:15 jperkin Exp $
DISTNAME= tcllib-1.18
CATEGORIES= devel
@@ -16,13 +16,13 @@ NO_BUILD= yes
CONFIGURE_ENV+= ac_cv_path_tclsh=${TCLSH:Q}
SUBST_CLASSES+= fix
-SUBST_STAGE.fix= post-patch
+SUBST_STAGE.fix= pre-configure
SUBST_FILES.fix= modules/doctools/mpformats/_html.tcl
SUBST_SED.fix= -e "s,/usr/bin/wget -q -O,${FETCH_CMD:Q} -V -o,g"
SUBST_MESSAGE.fix= Fixing hardcoded ftp binary.
SUBST_CLASSES+= tclsh
-SUBST_STAGE.tclsh= post-patch
+SUBST_STAGE.tclsh= pre-configure
SUBST_FILES.tclsh= modules/pki/pki.tcl apps/dtplite apps/nns apps/nnsd\
SUBST_FILES.tclsh+= apps/nnslog apps/page apps/pt apps/tcldocstrip
SUBST_SED.tclsh= -e "s,/usr/bin/env.*tclsh,${TCLSH},g"
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index adf49fcc2a3..afad3f7ac50 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/12/29 04:54:38 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:16 jperkin Exp $
#
DISTNAME= tclreadline-2.1.0
@@ -23,7 +23,7 @@ SUBST_CLASSES+= paths
SUBST_FILES.paths= ${WRKSRC}/pkgIndex.tcl.in
SUBST_FILES.paths+= ${WRKSRC}/tclreadlineInit.tcl.in
SUBST_FILES.paths+= ${WRKSRC}/tclreadlineSetup.tcl.in
-SUBST_STAGE.paths= post-patch
+SUBST_STAGE.paths= pre-configure
SUBST_SED.paths= -e 's,\/usr\/local,${PREFIX},'
SUBST_SED.paths+= -e 's,\/usr\/locanl,${PREFIX},'
diff --git a/devel/ucl/Makefile b/devel/ucl/Makefile
index 627fcf8178a..d4752195b56 100644
--- a/devel/ucl/Makefile
+++ b/devel/ucl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2015/10/12 23:19:40 agc Exp $
+# $NetBSD: Makefile,v 1.24 2018/07/04 13:40:16 jperkin Exp $
#
DISTNAME= ucl-1.03
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --enable-shared=yes
# Avoid path to build directory in example Makefile
SUBST_CLASSES+= example
-SUBST_STAGE.example= post-patch
+SUBST_STAGE.example= pre-configure
SUBST_FILES.example= examples/Makefile.in
SUBST_SED.example= -e "s|@MAKEINFO@||g"
diff --git a/devel/ucpp/Makefile b/devel/ucpp/Makefile
index dcc684b89ae..bcf6fab5533 100644
--- a/devel/ucpp/Makefile
+++ b/devel/ucpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/09/06 10:40:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:16 jperkin Exp $
DISTNAME= ucpp-1.3.2
CATEGORIES= devel
@@ -17,7 +17,7 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
CFLAGS+= -DSTD_MACROS=0 -DSTD_ASSERT=0 -DNO_UCPP_BUF
SUBST_CLASSES+= config
-SUBST_STAGE.config= post-patch
+SUBST_STAGE.config= pre-configure
SUBST_FILES.config= config.h
# remove /usr/local/include from default path
SUBST_SED.config= -e 's|"/usr/local/include", ||'
diff --git a/devel/uno/Makefile b/devel/uno/Makefile
index faf7de4ecaf..23e9d4229e6 100644
--- a/devel/uno/Makefile
+++ b/devel/uno/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/09/16 21:36:43 wiedi Exp $
+# $NetBSD: Makefile,v 1.20 2018/07/04 13:40:16 jperkin Exp $
#
DISTNAME= uno_v213
@@ -35,7 +35,7 @@ BUILDLINK_TRANSFORM+= rm:-m32
.endif
SUBST_CLASSES+= prefix
-SUBST_STAGE.prefix= post-patch
+SUBST_STAGE.prefix= pre-configure
SUBST_FILES.prefix= makefile
SUBST_SED.prefix= -e "s,/usr/bin,${PREFIX}/bin,g"
SUBST_MESSAGE.prefix= Fixing hardcoded paths.
diff --git a/devel/vanessa_logger/Makefile b/devel/vanessa_logger/Makefile
index 6ec34b1476c..b8bfd103c20 100644
--- a/devel/vanessa_logger/Makefile
+++ b/devel/vanessa_logger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/31 11:19:53 asau Exp $
+# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:16 jperkin Exp $
DISTNAME= vanessa_logger-0.0.8
CATEGORIES= devel
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Msunpro)
SUBST_CLASSES+= __function__
-SUBST_STAGE.__function__= post-patch
+SUBST_STAGE.__function__= pre-configure
SUBST_FILES.__function__= libvanessa_logger/vanessa_logger.h
SUBST_SED.__function__= -e "s|__FUNCTION__|__FILE__|g"
.endif
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index 9e2f1617f03..cd35f8d4a9a 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/09/06 11:12:19 fhajny Exp $
+# $NetBSD: Makefile,v 1.6 2018/07/04 13:40:16 jperkin Exp $
#
.include "Makefile.common"
@@ -43,7 +43,7 @@ BUILDDIR= ${WRKSRC}/build/${DISTNAME}
EGDIR= share/examples/zookeeper
SUBST_CLASSES+= paths
-SUBST_STAGE.paths= post-patch
+SUBST_STAGE.paths= pre-configure
SUBST_MESSAGE.paths= Fixing ZooKeeper default paths
SUBST_FILES.paths= conf/zoo_sample.cfg
SUBST_FILES.paths+= src/packages/templates/conf/zookeeper-env.sh
diff --git a/devel/zzuf/Makefile b/devel/zzuf/Makefile
index 418f0260612..a7c45b4be70 100644
--- a/devel/zzuf/Makefile
+++ b/devel/zzuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/10/02 13:36:32 wiedi Exp $
+# $NetBSD: Makefile,v 1.7 2018/07/04 13:40:16 jperkin Exp $
#
DISTNAME= zzuf-0.15
@@ -22,7 +22,7 @@ SUBST_CLASSES+= fix-paths
SUBST_FILES.fix-paths= doc/libzzuf.3.in
SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames
SUBST_SED.fix-paths= -e 's,/usr,${PREFIX},g'
-SUBST_STAGE.fix-paths= post-patch
+SUBST_STAGE.fix-paths= pre-configure
.include "../../mk/bsd.fast.prefs.mk"