--- wikisrc/pkgsrc/intro_to_packaging.mdwn	2014/07/08 14:35:33	1.2
+++ wikisrc/pkgsrc/intro_to_packaging.mdwn	2014/07/08 14:44:38	1.3
@@ -93,7 +93,7 @@ long ago in pkgsrc-wip
 Makefile:
 	
 {% highlight make %}
-# [[!paste id=rcsid]]
+# [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 PKGNAME=      osxinfo-0.1
 CATEGORIES=   misc
@@ -123,12 +123,12 @@ DESCR:
 
 PLIST:
 	
-	@comment [[!paste id=rcsid]]
+	@comment [[!paste id=rcsid1]][[!paste id=rcsid2]]
 	bin/osxinfo
 
 distinfo:
 
-	[[!paste id=rcsid]]
+	[[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 	SHA1 (osxinfo/de74b8960f27844f7b264697d124411f81a1eab6.tar.gz) = 83a2838ad95ff73255bea7f496a8cc9aaa4e17ca
 	RMD160 (osxinfo/de74b8960f27844f7b264697d124411f81a1eab6.tar.gz) = 9102eb2a938be38c4adf8cfbf781c04d0844d09a
@@ -317,7 +317,7 @@ Here's how they look like at the moment:
 	
 Makefile:
 {% highlight make %}
-# [[!paste id=rcsid]]
+# [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 DISTNAME=       2bwm-0.1
 CATEGORIES=     wm
@@ -334,7 +334,7 @@ LICENSE=        isc
 distinfo:
 
 	
-	[[!paste id=rcsid]]
+	[[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 	SHA1 (2bwm-0.1.tar.gz) = e83c862dc1d9aa198aae472eeca274e5d98df0ad
 	RMD160 (2bwm-0.1.tar.gz) = d9a93a7d7ae7183f5921f9ad76abeb1401184ef9
@@ -400,7 +400,7 @@ Clean, build again, and add more depende
 build stage. Here's how my Makefile ends up looking like:
 
 {% highlight make %}
-# [[!paste id=rcsid]]
+# [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 DISTNAME=       2bwm-0.1
 CATEGORIES=     wm
@@ -539,7 +539,7 @@ you should get this new line:
 	
 	containing:
 
-		@comment [[!paste id=rcsid]]
+		@comment [[!paste id=rcsid1]][[!paste id=rcsid2]]
 		bin/2bwm
 		bin/hidden
 
@@ -618,7 +618,7 @@ You can create port options with the `op
 
 	
 {% highlight make %}
-# [[!paste id=rcsid]]
+# [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 PKG_OPTIONS_VAR=			PKG_OPTIONS.dwm
 PKG_SUPPORTED_OPTIONS=	xinerama
@@ -864,6 +864,7 @@ make installed from the pkgsrc bootstrap
 	
 	`#saveosx`
 
-[[!cut id=rcsid text="\$NetBSD$"]]
+[[!cut id=rcsid1 text="$Net"]]
+[[!cut id=rcsid2 text="BSD$"]]
 [[!meta title="An introduction to packaging"]]
 [[!meta author="Youri Mouton"]]