--- wikisrc/pkgsrc/intro_to_packaging.mdwn	2014/07/09 12:44:32	1.8
+++ wikisrc/pkgsrc/intro_to_packaging.mdwn	2021/11/02 13:53:21	1.10
@@ -90,7 +90,7 @@ long ago in pkgsrc-wip
 
 Makefile:
 	
-[[!format make """
+[[!format makefile """
 # [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 PKGNAME=      osxinfo-0.1
@@ -197,7 +197,7 @@ these targets, like
 The framework uses an `mk.conf` file, usually found in /etc. Here's
 how mine looks:
 
-[[!format make """
+[[!format makefile """
 # Tue Oct 15 21:21:46 CEST 2013
 
 .ifdef BSD_PKG_MK          # begin pkgsrc settings
@@ -312,7 +312,7 @@ on the program's homepage.
 Here's how they look like at the moment:
 	
 Makefile:
-[[!format make """
+[[!format makefile """
 # [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 DISTNAME=       2bwm-0.1
@@ -395,7 +395,7 @@ in our Makefile.
 Clean, build again, and add more dependencies until it passes the
 build stage. Here's how my Makefile ends up looking like:
 
-[[!format make """
+[[!format makefile """
 # [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 DISTNAME=       2bwm-0.1
@@ -452,7 +452,7 @@ how 2bwm installs:
 
 From 2bwm's Makefile:
 
-[[!format make """
+[[!format makefile """
 install: $(TARGETS)
         test -d $(DESTDIR)$(PREFIX)/bin || mkdir -p $(DESTDIR)$(PREFIX)/bin
         install -pm 755 2bwm $(DESTDIR)$(PREFIX)/bin
@@ -550,7 +550,7 @@ You should be able to fix the prefix err
 the patching explained above thanks to the sed substitution framework.
 Here's how it looks like in my port Makefile:
 
-[[!format make """
+[[!format makefile """
 SUBST_CLASSES+=         makefile
 SUBST_STAGE.makefile=   pre-build
 SUBST_MESSAGE.makefile= Fixing makefile
@@ -606,7 +606,7 @@ asking nicely for commit access.
 You can create port options with the `options.mk` file, like for `wm/dwm`
 
 	
-[[!format make """
+[[!format makefile """
 # [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 PKG_OPTIONS_VAR=			PKG_OPTIONS.dwm
@@ -669,15 +669,15 @@ packages available for testing. You will
 on the host system. I host my [packages](http://pkgsrc.saveosx.org/)
 on a FreeBSD server with a bootstrapped pkgsrc.
 
-use this `zsh` function to :
+use this shell function to :
 
 [[!format sh """
 add () {
 	# upload the package to remote server
-	scp $1 yrmt@saveosx.org:/usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/All/ 2> /dev/null
+	scp $1 youri@saveosx.org:/usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/All/ 2> /dev/null
 	
 	# update the package summary
-	ssh yrmt@saveosx.org 'cd /usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/All/;
+	ssh youri@saveosx.org 'cd /usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/All/;
 	        rm pkg_summary.gz;
  	        /usr/pkg/sbin/pkg_info -X *.tgz | gzip -9 > pkg_summary.gz'
 	
@@ -724,7 +724,7 @@ And this shell alias to upload all my bu
 need to run `add()` mentionned above to update the pkg_summary
 
 [[!format sh """
-up='rsync -avhz --progress /pkgsrc/packages/ root@saveosx.org:/usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/'
+up='rsync -avhz --progress /pkgsrc/packages/ youri@saveosx.org:/usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/'
 """]]
 
 Then you should be able to set the url in repositories.conf to use
@@ -754,7 +754,7 @@ earlier like this:
 
 pkgsrc supports fetching archives from specific git commits on
 GitHub like this:
-[[!format make """
+[[!format makefile """
 PKGNAME=           2bwm-0.1
 CATEGORIES=        wm
 GHCOMMIT=          52a097ca644eb571b22a135951c945fcca57a25c
@@ -773,7 +773,7 @@ You can do all Makefile operations direc
 like this:
 
 
-[[!format make """
+[[!format makefile """
 post-extract:
 	${CHMOD} a-x ${WRKSRC}/elementary/apps/48/internet-mail.svg
 
@@ -785,7 +785,7 @@ do-install:
 To install, but you can also build programs from the Makefile. This
 is what qt4-sqlite3 uses:
 
-[[!format make """
+[[!format makefile """
 do-build:
 	cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
 	cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}