Mon May 21 18:35:22 2018 UTC ()
doc/Makefile-example: reorder targets

buildlink3.mk file inclusions come last.


(wiz)
diff -r1.24 -r1.25 pkgsrc/doc/Makefile-example
cvs diff -r1.24 -r1.25 pkgsrc/doc/Makefile-example (expand / switch to unified diff)

--- pkgsrc/doc/Makefile-example 2016/01/29 23:10:18 1.24
+++ pkgsrc/doc/Makefile-example 2018/05/21 18:35:22 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile-example,v 1.24 2016/01/29 23:10:18 rillig Exp $ 1# $NetBSD: Makefile-example,v 1.25 2018/05/21 18:35:22 wiz Exp $
2 2
3# First paragraph - distfile and binary package data 3# First paragraph - distfile and binary package data
4# DISTNAME PKGNAME PKGREVISION CATEGORIES MASTER_SITES 4# DISTNAME PKGNAME PKGREVISION CATEGORIES MASTER_SITES
5# MASTER_SITE_SUBDIR EXTRACT_SUFX DISTFILES 5# MASTER_SITE_SUBDIR EXTRACT_SUFX DISTFILES
6DISTNAME= make-3.80 6DISTNAME= make-3.80
7PKGNAME= gmake-3.80 # only to be added if the package name is different from DISTNAME 7PKGNAME= gmake-3.80 # only to be added if the package name is different from DISTNAME
8#PKGREVISION= 2 # should be added/incremented for user-visible changes 8#PKGREVISION= 2 # should be added/incremented for user-visible changes
9CATEGORIES= devel gnu # multiple categories are allowed 9CATEGORIES= devel gnu # multiple categories are allowed
10MASTER_SITES= ${MASTER_SITE_GNU:=make/} 10MASTER_SITES= ${MASTER_SITE_GNU:=make/}
11#EXTRACT_SUFX= .tar.bz2 # .tar.gz is the default, only needed in unusual circumstances 11#EXTRACT_SUFX= .tar.bz2 # .tar.gz is the default, only needed in unusual circumstances
12 12
13# Second paragraph - MAINTAINER/OWNER, HOMEPAGE and COMMENT, and LICEN[CS]E 13# Second paragraph - MAINTAINER/OWNER, HOMEPAGE and COMMENT, and LICEN[CS]E
14MAINTAINER= pkgsrc-users@NetBSD.org # set this to your email address, pkgsrc-users@ is the default 14MAINTAINER= pkgsrc-users@NetBSD.org # set this to your email address, pkgsrc-users@ is the default
@@ -59,36 +59,32 @@ TEST_TARGET= check @@ -59,36 +59,32 @@ TEST_TARGET= check
59 59
60# always include bsd.prefs.mk before any .if or .ifdef statements 60# always include bsd.prefs.mk before any .if or .ifdef statements
61.include "../../mk/bsd.prefs.mk" 61.include "../../mk/bsd.prefs.mk"
62 62
63.if defined(GNU_PROGRAM_PREFIX) 63.if defined(GNU_PROGRAM_PREFIX)
64# indent nested "if" by 2 spaces please 64# indent nested "if" by 2 spaces please
65. if ${GNU_PROGRAM_PREFIX} == "g" 65. if ${GNU_PROGRAM_PREFIX} == "g"
66CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX} 66CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX}
67. endif 67. endif
68.endif 68.endif
69PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} 69PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
70BUILD_DEFS+= GNU_PROGRAM_PREFIX 70BUILD_DEFS+= GNU_PROGRAM_PREFIX
71 71
72# buildlink3 files should come after all variables have been set, 
73# sorted alphabetically. 
74.include "../../devel/gettext-lib/buildlink3.mk" 
75 
76# The section that handles pthreads should come after all other buildlink3 
77# files have been included. 
78.include "../../mk/pthread.buildlink3.mk" 
79.if ${PTHREAD_TYPE} == "none" 
80CONFIGURE_ARGS+= --disable-threads 
81.endif 
82 
83# Makefile targets should occur after all the other definitions in the file 72# Makefile targets should occur after all the other definitions in the file
84post-install: 73post-install:
85 ${CHMOD} g-s ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make 74 ${CHMOD} g-s ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
86 ${CHGRP} ${BINGRP} ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make 75 ${CHGRP} ${BINGRP} ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make
87.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g" 76.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
88 # Solaris's "ln -fs" is not the same as on *BSD - use an explicit rm(1) instead 77 # Solaris's "ln -fs" is not the same as on *BSD - use an explicit rm(1) instead
89 ${RM} -f ${PREFIX}/bin/gmake 78 ${RM} -f ${PREFIX}/bin/gmake
90 ${LN} -s ${GNU_PROGRAM_PREFIX}make ${PREFIX}/bin/gmake 79 ${LN} -s ${GNU_PROGRAM_PREFIX}make ${PREFIX}/bin/gmake
91.endif 80.endif
92 81
 82# buildlink3 files should come after all variables have been set,
 83# sorted alphabetically.
 84.include "../../devel/gettext-lib/buildlink3.mk"
 85
 86# Files from mk/ should be after other buildlink3 files have been included.
 87.include "../../mk/pthread.buildlink3.mk"
 88
93# Finally, please include bsd.pkg.mk 89# Finally, please include bsd.pkg.mk
94.include "../../mk/bsd.pkg.mk" 90.include "../../mk/bsd.pkg.mk"