CVS commit: pkgsrc/doc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon May 21 18:35:22 UTC 2018

Modified Files:
        pkgsrc/doc: Makefile-example

Log Message:
doc/Makefile-example: reorder targets

buildlink3.mk file inclusions come last.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/doc/Makefile-example

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/Makefile-example
diff -u pkgsrc/doc/Makefile-example:1.24 pkgsrc/doc/Makefile-example:1.25
--- pkgsrc/doc/Makefile-example:1.24    Fri Jan 29 23:10:18 2016
+++ pkgsrc/doc/Makefile-example Mon May 21 18:35:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-example,v 1.24 2016/01/29 23:10:18 rillig Exp $
+# $NetBSD: Makefile-example,v 1.25 2018/05/21 18:35:22 wiz Exp $
 
 # First paragraph - distfile and binary package data
 # DISTNAME PKGNAME PKGREVISION CATEGORIES MASTER_SITES
@@ -69,17 +69,6 @@ CONFIGURE_ARGS+=     --program-prefix=${GNU_
 PLIST_SUBST+=          GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
 BUILD_DEFS+=           GNU_PROGRAM_PREFIX
 
-# buildlink3 files should come after all variables have been set,
-# sorted alphabetically.
-.include "../../devel/gettext-lib/buildlink3.mk"
-
-# The section that handles pthreads should come after all other buildlink3
-# files have been included.
-.include "../../mk/pthread.buildlink3.mk"
-.if ${PTHREAD_TYPE} == "none"
-CONFIGURE_ARGS+=       --disable-threads
-.endif
-
 # Makefile targets should occur after all the other definitions in the file
 post-install:
        ${CHMOD} g-s ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
@@ -90,5 +79,12 @@ post-install:
        ${LN} -s ${GNU_PROGRAM_PREFIX}make ${PREFIX}/bin/gmake
 .endif
 
+# buildlink3 files should come after all variables have been set,
+# sorted alphabetically.
+.include "../../devel/gettext-lib/buildlink3.mk"
+
+# Files from mk/ should be after other buildlink3 files have been included.
+.include "../../mk/pthread.buildlink3.mk"
+
 # Finally, please include bsd.pkg.mk
 .include "../../mk/bsd.pkg.mk"