CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: christos
Date: Wed Jul 3 15:50:40 UTC 2019
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
Change the default to be slim
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.20 src/usr.sbin/zic/Makefile:1.21
--- src/usr.sbin/zic/Makefile:1.20 Fri Jan 6 12:25:32 2017
+++ src/usr.sbin/zic/Makefile Wed Jul 3 11:50:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/01/06 17:25:32 christos Exp $
+# $NetBSD: Makefile,v 1.21 2019/07/03 15:50:40 christos Exp $
.include "Makefile.inc"
.include
@@ -14,6 +14,7 @@ TZVERSION=0
TZVERSION!= ${TOOL_CAT} ${NETBSDSRCDIR}/lib/libc/time/version
.endif
CPPFLAGS+=-DPKGVERSION='"(tzcode) "' -DTZVERSION='"${TZVERSION}"'
+CPPFLAGS+=-DZIC_BLOAT_DEFAULT='"slim"'
.PATH: ${NETBSDSRCDIR}/lib/libc/time
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Wed Jul 3 15:50:40 UTC 2019 Modified Files: src/usr.sbin/zic: Makefile Log Message: Change the default to be slim To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/zic/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: christos
Date: Fri Jan 6 17:25:32 UTC 2017
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
don't try to run a non-existing nbcat
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.19 src/usr.sbin/zic/Makefile:1.20
--- src/usr.sbin/zic/Makefile:1.19 Thu Oct 20 13:38:28 2016
+++ src/usr.sbin/zic/Makefile Fri Jan 6 12:25:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/10/20 17:38:28 christos Exp $
+# $NetBSD: Makefile,v 1.20 2017/01/06 17:25:32 christos Exp $
.include "Makefile.inc"
.include
@@ -8,7 +8,11 @@ COPTS.zic.c += -Wno-format-nonliteral
PROG= zic
SRCS= zic.c
MAN= zic.8
+.if !empty(TOOL_CAT:M*/*) && !exists(${TOOL_CAT})
+TZVERSION=0
+.else
TZVERSION!= ${TOOL_CAT} ${NETBSDSRCDIR}/lib/libc/time/version
+.endif
CPPFLAGS+=-DPKGVERSION='"(tzcode) "' -DTZVERSION='"${TZVERSION}"'
.PATH: ${NETBSDSRCDIR}/lib/libc/time
@@ -18,4 +22,7 @@ LDADD+=-lutil
DPADD+=${LIBUTIL}
.endif
+foo:
+ echo ${TZVERSION}
+
.include
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Fri Jan 6 17:25:32 UTC 2017 Modified Files: src/usr.sbin/zic: Makefile Log Message: don't try to run a non-existing nbcat To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/zic/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: christos
Date: Thu Oct 20 17:38:28 UTC 2016
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
we keep version separately now
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.18 src/usr.sbin/zic/Makefile:1.19
--- src/usr.sbin/zic/Makefile:1.18 Fri Oct 7 17:55:29 2016
+++ src/usr.sbin/zic/Makefile Thu Oct 20 13:38:28 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/10/07 21:55:29 christos Exp $
+# $NetBSD: Makefile,v 1.19 2016/10/20 17:38:28 christos Exp $
.include "Makefile.inc"
.include
@@ -8,7 +8,7 @@ COPTS.zic.c += -Wno-format-nonliteral
PROG= zic
SRCS= zic.c
MAN= zic.8
-TZVERSION!= ${TOOL_SED} -ne 's/^VERSION=[ ]*//p' ${NETBSDSRCDIR}/lib/libc/time/Makefile
+TZVERSION!= ${TOOL_CAT} ${NETBSDSRCDIR}/lib/libc/time/version
CPPFLAGS+=-DPKGVERSION='"(tzcode) "' -DTZVERSION='"${TZVERSION}"'
.PATH: ${NETBSDSRCDIR}/lib/libc/time
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Thu Oct 20 17:38:28 UTC 2016 Modified Files: src/usr.sbin/zic: Makefile Log Message: we keep version separately now To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/zic/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: christos
Date: Fri Oct 7 21:55:30 UTC 2016
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
Handle tools build
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.17 src/usr.sbin/zic/Makefile:1.18
--- src/usr.sbin/zic/Makefile:1.17 Fri Oct 7 11:30:01 2016
+++ src/usr.sbin/zic/Makefile Fri Oct 7 17:55:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/10/07 15:30:01 christos Exp $
+# $NetBSD: Makefile,v 1.18 2016/10/07 21:55:29 christos Exp $
.include "Makefile.inc"
.include
@@ -13,7 +13,9 @@ CPPFLAGS+=-DPKGVERSION='"(tzcode) "' -DT
.PATH: ${NETBSDSRCDIR}/lib/libc/time
+.if !defined(HOSTPROG)
LDADD+=-lutil
DPADD+=${LIBUTIL}
+.endif
.include
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Fri Oct 7 21:55:30 UTC 2016 Modified Files: src/usr.sbin/zic: Makefile Log Message: Handle tools build To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/zic/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Tue Apr 28 17:00:42 UTC 2015 Modified Files: src/usr.sbin/zic: Makefile Log Message: remove unused To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/zic/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: christos
Date: Tue Apr 28 17:00:42 UTC 2015
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
remove unused
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.15 src/usr.sbin/zic/Makefile:1.16
--- src/usr.sbin/zic/Makefile:1.15 Tue Oct 7 18:14:05 2014
+++ src/usr.sbin/zic/Makefile Tue Apr 28 13:00:42 2015
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2014/10/07 22:14:05 christos Exp $
+# $NetBSD: Makefile,v 1.16 2015/04/28 17:00:42 christos Exp $
.include Makefile.inc
.include bsd.own.mk
COPTS.zic.c += -Wno-format-nonliteral
-COPTS.scheck.c += -Wno-format-nonliteral
PROG= zic
-SRCS= zic.c scheck.c ialloc.c
+SRCS= zic.c
MAN= zic.8
TZVERSION!= ${TOOL_SED} -ne 's/VERSION=[ ]*//p' ${NETBSDSRCDIR}/lib/libc/time/Makefile
CPPFLAGS+=-DPKGVERSION='(tzcode) ' -DTZVERSION='${TZVERSION}'
CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: christos
Date: Tue Oct 7 22:14:06 UTC 2014
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
set some variables we need
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.14 src/usr.sbin/zic/Makefile:1.15
--- src/usr.sbin/zic/Makefile:1.14 Wed Mar 6 13:21:41 2013
+++ src/usr.sbin/zic/Makefile Tue Oct 7 18:14:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/03/06 18:21:41 christos Exp $
+# $NetBSD: Makefile,v 1.15 2014/10/07 22:14:05 christos Exp $
.include Makefile.inc
.include bsd.own.mk
@@ -9,7 +9,8 @@ COPTS.scheck.c += -Wno-format-nonliteral
PROG= zic
SRCS= zic.c scheck.c ialloc.c
MAN= zic.8
-CPPFLAGS+=-Dunix
+TZVERSION!= ${TOOL_SED} -ne 's/VERSION=[ ]*//p' ${NETBSDSRCDIR}/lib/libc/time/Makefile
+CPPFLAGS+=-DPKGVERSION='(tzcode) ' -DTZVERSION='${TZVERSION}'
.PATH: ${NETBSDSRCDIR}/lib/libc/time
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Tue Oct 7 22:14:06 UTC 2014 Modified Files: src/usr.sbin/zic: Makefile Log Message: set some variables we need To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/zic/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Fri Sep 20 19:07:29 UTC 2013 Modified Files: src/usr.sbin/zic: Makefile.inc Log Message: the code specifies package info now. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/zic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/zic/Makefile.inc diff -u src/usr.sbin/zic/Makefile.inc:1.1 src/usr.sbin/zic/Makefile.inc:1.2 --- src/usr.sbin/zic/Makefile.inc:1.1 Sat Mar 2 16:38:19 2013 +++ src/usr.sbin/zic/Makefile.inc Fri Sep 20 15:07:29 2013 @@ -1,2 +1,2 @@ -CPPFLAGS+=-DREPORT_BUGS_TO=\gn...@netbsd.org\ -DPKGVERSION=\tzcode-2013a\ +CPPFLAGS+=-DREPORT_BUGS_TO=\gn...@netbsd.org\
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Fri Sep 20 19:07:29 UTC 2013 Modified Files: src/usr.sbin/zic: Makefile.inc Log Message: the code specifies package info now. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/zic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: christos
Date: Wed Mar 6 18:21:41 UTC 2013
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
remove compiler hacks
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.13 src/usr.sbin/zic/Makefile:1.14
--- src/usr.sbin/zic/Makefile:1.13 Tue Mar 5 08:42:04 2013
+++ src/usr.sbin/zic/Makefile Wed Mar 6 13:21:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/03/05 13:42:04 apb Exp $
+# $NetBSD: Makefile,v 1.14 2013/03/06 18:21:41 christos Exp $
.include Makefile.inc
.include bsd.own.mk
@@ -6,14 +6,6 @@
COPTS.zic.c += -Wno-format-nonliteral
COPTS.scheck.c += -Wno-format-nonliteral
-.if defined(HAVE_GCC) ${HAVE_GCC} 45
-# gcc-4.1 says:
-# warning: comparison is always false due to limited range of data type
-# and there is no -Wno-foo option to suppress that warning.
-#
-COPTS.zic.c+= ${${ACTIVE_CC} == gcc :? -Wno-error :}
-.endif # HAVE_GCC 45
-
PROG= zic
SRCS= zic.c scheck.c ialloc.c
MAN= zic.8
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Wed Mar 6 18:21:41 UTC 2013 Modified Files: src/usr.sbin/zic: Makefile Log Message: remove compiler hacks To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/zic/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: martin
Date: Tue Mar 5 10:19:58 UTC 2013
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
Add back NOGCCERROR for older gcc versions to fix the vax build
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.11 src/usr.sbin/zic/Makefile:1.12
--- src/usr.sbin/zic/Makefile:1.11 Sat Mar 2 21:38:19 2013
+++ src/usr.sbin/zic/Makefile Tue Mar 5 10:19:58 2013
@@ -1,9 +1,17 @@
-# $NetBSD: Makefile,v 1.11 2013/03/02 21:38:19 christos Exp $
+# $NetBSD: Makefile,v 1.12 2013/03/05 10:19:58 martin Exp $
.include Makefile.inc
+.if defined(HAVE_GCC) ${HAVE_GCC} = 45
COPTS.zic.c += -Wno-format-nonliteral
COPTS.scheck.c += -Wno-format-nonliteral
+.else
+# warning with older gcc:
+# comparison is always false due to limited range of data type
+# and no way to make it shut up?
+WARNS= 0
+NOGCCERROR=1
+.endif
.include bsd.own.mk
CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: apb
Date: Tue Mar 5 13:42:05 UTC 2013
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
A different way of dealing with a warning from gcc-4.1 when compiling
zic.c. Instead of setting WARNS=0 and NOGCCERROR=1, just add -Wno-error
to COPTS.zic.c when using an old version of gcc.
Also include bsd.own.mk earlier.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.12 src/usr.sbin/zic/Makefile:1.13
--- src/usr.sbin/zic/Makefile:1.12 Tue Mar 5 10:19:58 2013
+++ src/usr.sbin/zic/Makefile Tue Mar 5 13:42:04 2013
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.12 2013/03/05 10:19:58 martin Exp $
+# $NetBSD: Makefile,v 1.13 2013/03/05 13:42:04 apb Exp $
.include Makefile.inc
+.include bsd.own.mk
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45
COPTS.zic.c += -Wno-format-nonliteral
COPTS.scheck.c += -Wno-format-nonliteral
-.else
-# warning with older gcc:
-# comparison is always false due to limited range of data type
-# and no way to make it shut up?
-WARNS= 0
-NOGCCERROR=1
-.endif
-.include bsd.own.mk
+.if defined(HAVE_GCC) ${HAVE_GCC} 45
+# gcc-4.1 says:
+# warning: comparison is always false due to limited range of data type
+# and there is no -Wno-foo option to suppress that warning.
+#
+COPTS.zic.c+= ${${ACTIVE_CC} == gcc :? -Wno-error :}
+.endif # HAVE_GCC 45
PROG= zic
SRCS= zic.c scheck.c ialloc.c
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: apb Date: Tue Mar 5 13:42:05 UTC 2013 Modified Files: src/usr.sbin/zic: Makefile Log Message: A different way of dealing with a warning from gcc-4.1 when compiling zic.c. Instead of setting WARNS=0 and NOGCCERROR=1, just add -Wno-error to COPTS.zic.c when using an old version of gcc. Also include bsd.own.mk earlier. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/zic/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: christos
Date: Sat Mar 2 21:38:19 UTC 2013
Modified Files:
src/usr.sbin/zic: Makefile
Added Files:
src/usr.sbin/zic: Makefile.inc
Log Message:
fix warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/zic/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.sbin/zic/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.10 src/usr.sbin/zic/Makefile:1.11
--- src/usr.sbin/zic/Makefile:1.10 Thu Oct 25 11:14:36 2012
+++ src/usr.sbin/zic/Makefile Sat Mar 2 16:38:19 2013
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2012/10/25 15:14:36 martin Exp $
+# $NetBSD: Makefile,v 1.11 2013/03/02 21:38:19 christos Exp $
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45
-WARNS?= 2 # XXX -Wcast-qual in lib/libc/time
-.else
-# warning with older gcc:
-# comparison is always false due to limited range of data type
-# and no way to make it shut up?
-WARNS= 0
-NOGCCERROR= 1
-.endif
+.include Makefile.inc
+
+COPTS.zic.c += -Wno-format-nonliteral
+COPTS.scheck.c += -Wno-format-nonliteral
.include bsd.own.mk
Added files:
Index: src/usr.sbin/zic/Makefile.inc
diff -u /dev/null src/usr.sbin/zic/Makefile.inc:1.1
--- /dev/null Sat Mar 2 16:38:19 2013
+++ src/usr.sbin/zic/Makefile.inc Sat Mar 2 16:38:19 2013
@@ -0,0 +1,2 @@
+
+CPPFLAGS+=-DREPORT_BUGS_TO=\gn...@netbsd.org\ -DPKGVERSION=\tzcode-2013a\
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Sat Mar 2 21:38:19 UTC 2013 Modified Files: src/usr.sbin/zic: Makefile Added Files: src/usr.sbin/zic: Makefile.inc Log Message: fix warnings. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/zic/Makefile cvs rdiff -u -r0 -r1.1 src/usr.sbin/zic/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: martin
Date: Thu Oct 25 15:14:36 UTC 2012
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
Make warnings non fatal for older gcc versions - I couldn't figure out how to
shut up gcc when compiling for vax. Feel free to fix differently if you
find a better solution.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.9 src/usr.sbin/zic/Makefile:1.10
--- src/usr.sbin/zic/Makefile:1.9 Wed Apr 22 15:23:10 2009
+++ src/usr.sbin/zic/Makefile Thu Oct 25 15:14:36 2012
@@ -1,6 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2009/04/22 15:23:10 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/25 15:14:36 martin Exp $
+.if defined(HAVE_GCC) ${HAVE_GCC} = 45
WARNS?= 2 # XXX -Wcast-qual in lib/libc/time
+.else
+# warning with older gcc:
+# comparison is always false due to limited range of data type
+# and no way to make it shut up?
+WARNS= 0
+NOGCCERROR= 1
+.endif
.include bsd.own.mk
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: martin Date: Thu Oct 25 15:14:36 UTC 2012 Modified Files: src/usr.sbin/zic: Makefile Log Message: Make warnings non fatal for older gcc versions - I couldn't figure out how to shut up gcc when compiling for vax. Feel free to fix differently if you find a better solution. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/zic/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
