Index: mk/subst.mk
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/mk/subst.mk,v
retrieving revision 1.53
diff -u -r1.53 subst.mk
--- mk/subst.mk	26 Jan 2008 15:23:21 -0000	1.53
+++ mk/subst.mk	4 Sep 2013 01:17:52 -0000
@@ -48,6 +48,11 @@
 #	before any substitutions are done to it. Since that test is not
 #	perfect, it can be disabled by setting this variable to "yes".
 #
+# SUBST_COND.<class>
+#	Add condition to substitute. Default is 1 (True), do always.
+#       Typical example in Makefile is 
+#       SUBST_COND.<class>=       X11_TYPE:Mmodular
+#
 # See also:
 #	PLIST_SUBST
 #
@@ -85,6 +90,8 @@
 .  endfor
 SUBST_POSTCMD.${_class_}?=	${RM} -f "$$tmpfile"
 SUBST_SKIP_TEXT_CHECK.${_class_}?=	no
+# default: Have something, meaning true, do always
+SUBST_COND.${_class_}?=		doit
 
 .if !empty(SUBST_SKIP_TEXT_CHECK.${_class_}:M[Yy][Ee][Ss])
 _SUBST_IS_TEXT_FILE.${_class_}=	${TRUE}
@@ -105,6 +112,7 @@
 subst-${_class_}: ${_SUBST_COOKIE.${_class_}}
 
 ${_SUBST_COOKIE.${_class_}}:
+. if !empty(SUBST_COND.${_class_})
 .  if !empty(SUBST_MESSAGE.${_class_})
 	${RUN} ${ECHO_SUBST_MSG} ${SUBST_MESSAGE.${_class_}:Q}
 .  endif
@@ -135,4 +143,7 @@
 		fi;							\
 	done
 	${RUN} ${TOUCH} ${TOUCH_FLAGS} ${.TARGET:Q}
+. else
+			${INFO_MSG} "[subst.mk:${_class_}] Skipping SUBST due to SUBST_COND "
+. endif
 .endfor
Index: wip/trustedQSL/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/trustedQSL/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- wip/trustedQSL/Makefile	31 Aug 2013 16:56:14 -0000	1.24
+++ wip/trustedQSL/Makefile	4 Sep 2013 01:18:00 -0000
@@ -1,18 +1,17 @@
 # $NetBSD$
 
 DISTNAME=		tqsl-2.0
-# It is Release Candidate, so 2.0 is too big for that.
-PKGNAME=		tqsl-1.99.1
+PKGNAME=		${DISTNAME}rc3
 CATEGORIES=		ham
 MASTER_SITES=		http://www.arrl.org/files/file/LoTW%20Instructions/
-MASTER_SITES=		http://www.arrl.org/files/file/TrustedQSL-Beta/
-EXTRACT_SUFX=		.tgz
+MASTER_SITES=		http://downloads.sourceforge.net/project/trustedqsl/TrustedQSL/v2.0-rc3/
 
 MAINTAINER=		makoto@ki.nu
 HOMEPAGE=		http://sourceforge.net/projects/trustedqsl/
 COMMENT=		TrustedQSL, uploading QSL Data to LoTW of ARRL
 #LICENSE=		See LICENSE file (ARRL)
 
+DIST_SUBDIR=		${PKGNAME_NOREV}
 USE_TOOLS+=		perl gmake cmake
 USE_LANGUAGES+=		c c++
 USE_LIBTOOL=		yes
@@ -21,6 +20,7 @@
 
 #.if !empty(X11_TYPE:Mmodular)
 SUBST_CLASSES+=		x11r7
+SUBST_COND.x11r7=	X11_TYPE:Mmodular
 SUBST_STAGE.x11r7=	post-build
 SUBST_FILES.x11r7=	apps/cmake_install.cmake
 SUBST_MESSAGE.x11r7=	Remove X11R7/lib from RPATH_CHANGE, for modular only
@@ -39,18 +39,18 @@
 SUBST_SED.swaprpath=	-e '/OLD_RPATH/s,${WRKSRC}/src:${PREFIX}/lib:',${PREFIX}/lib:${WRKSRC}/src,
 
 
-SUBST_CLASSES+=		rpath-link
-SUBST_STAGE.rpath-link= post-build
-SUBST_FILES.rpath-link=	src/cmake_install.cmake
-SUBST_MESSAGE.rpath-link=	Truely experimental and interim fix for RPATH-LINK
-SUBST_SED.rpath-link=	-e '/OLD_RPATH/s,::::::::::::,,'
-SUBST_SED.rpath-link+=	-e '/NEW_RPATH/s,:${PREFIX}/lib,,'
-
-#SUBST_CLASSES+=		lastcolon
-#SUBST_STAGE.lastcolon=	post-build
-#SUBST_FILES.lastcolon=	apps/cmake_install.cmake
-#SUBST_MESSAGE.lastcolon=	Removing the very last colon from OLD_RPATH in RPATH_CHANGE
-#SUBST_SED.lastcolon=	-e '/OLD_RPATH/s,${WRKSRC}/src:,${WRKSRC}/src,'
+#SUBST_CLASSES+=		rpath-link
+#SUBST_STAGE.rpath-link= post-build
+#SUBST_FILES.rpath-link=	src/cmake_install.cmake
+#SUBST_MESSAGE.rpath-link=	Truely experimental and interim fix for RPATH-LINK
+#SUBST_SED.rpath-link=	-e '/OLD_RPATH/s,::::::::::::,,'
+#SUBST_SED.rpath-link+=	-e '/NEW_RPATH/s,:${PREFIX}/lib,,'
+
+SUBST_CLASSES+=		lastcolon
+SUBST_STAGE.lastcolon=	post-build
+SUBST_FILES.lastcolon=	apps/cmake_install.cmake
+SUBST_MESSAGE.lastcolon=	Removing the very last colon from OLD_RPATH in RPATH_CHANGE
+SUBST_SED.lastcolon=	-e '/OLD_RPATH/s,${WRKSRC}/src:,${WRKSRC}/src,'
 
 # There is an unresolved build failure, where -R for /usr/pkg/lib does
 # not precede /usr/X11R7/lib, and on a netbsd-5 system with base xorg,
@@ -67,8 +67,10 @@
 	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=yes \
 	.)
 
-.include "../../textproc/expat/buildlink3.mk"
 .include "../../databases/db5/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/jbigkit/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/wxGTK28/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 
Index: wip/trustedQSL/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/trustedQSL/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- wip/trustedQSL/PLIST	31 Aug 2013 15:50:22 -0000	1.3
+++ wip/trustedQSL/PLIST	4 Sep 2013 01:18:00 -0000
@@ -102,4 +102,4 @@
 share/TrustedQSL/help/tqslapp/update.htm
 share/TrustedQSL/help/tqslapp/update1.bmp
 share/TrustedQSL/help/tqslapp/update2.bmp
-share/man/man5/trustedqsl.5
+share/man/man5/tqsl.5
Index: wip/trustedQSL/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/trustedQSL/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- wip/trustedQSL/distinfo	31 Aug 2013 15:50:22 -0000	1.9
+++ wip/trustedQSL/distinfo	4 Sep 2013 01:18:00 -0000
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (tqsl-2.0.tgz) = dc14e1887db2c82597f4f91b6fec44e6b641c45f
-RMD160 (tqsl-2.0.tgz) = f132225e5ffefdde934231a032812a40589c6f3c
-Size (tqsl-2.0.tgz) = 2156966 bytes
+SHA1 (tqsl-2.0rc3/tqsl-2.0.tar.gz) = 60c144446b696453c2481b176f6d9ada13a81f2f
+RMD160 (tqsl-2.0rc3/tqsl-2.0.tar.gz) = a82186b1d9e056ee221e61d675782386f4fdb24d
+Size (tqsl-2.0rc3/tqsl-2.0.tar.gz) = 2158923 bytes
 SHA1 (patch-apps_tqsl_cpp) = 93ba43c8ad0955d77b47622ac722765ba146586b
 SHA1 (patch-src_tqslconvert_cpp) = 6a0a4e54c1f351a0bd8e0e6f8c04a87ea975330e