/sys-libs/timezone-data/files/timezone-data-2008h-makefile.patch

https://github.com/1000timesdead/portage · Patch · 138 lines · 111 code · 27 blank · 0 comment · 0 complexity · bf648701672ba4325950eb4ce4a18174 MD5 · raw file 

    

  1. - Fix up default paths
    2. 

  2.  - Support env DESTDIR / LDFLAGS / CFLAGS / CC
    3. 

  3.  - Use awk instead of nawk
    4. 

  4.  - Don't build/install libtz.a
    5. 

  5.  - Don't install man-pages provided by sys-apps/man-pages
    6. 

  6.  - Move zic zdump to sbin and tzselect to bin ala glibc
    7. 

  7.  - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc
    8. 

  8.  - Install leaps zoneinfo into zoneinfo/right/ ala glibc
    9. 

  9.  - Disable broken web test
    10. 

  10.  - Make sure tzselect uses #!/bin/bash and not #!/bin/ksh
    11. 

  11.  - Flags to the linking are passed as LDFLAGS, not LFLAGS
    12. 

  12.  - LDFLAGS was missed for the 'date' target
    13. 

  13. 

  14. --- Makefile
    15. 

  15. +++ Makefile
    16. 

  16. @@ -35,5 +35,5 @@
    17. 

  17.  # Everything gets put in subdirectories of. . .
    18. 

  18.  
    19. 

  19. -TOPDIR=		/usr/local
    20. 

  20. +TOPDIR=		$(DESTDIR)/usr
    21. 

  21.  
    22. 

  22.  # "Compiled" time zone information is placed in the "TZDIR" directory
    23. 

  23. @@ -41,9 +41,9 @@
    24. 

  24.  # Use an absolute path name for TZDIR unless you're just testing the software.
    25. 

  25.  
    26. 

  26. -TZDIR=		$(TOPDIR)/etc/zoneinfo
    27. 

  27. +TZDIR=		$(TOPDIR)/share/zoneinfo
    28. 

  28.  
    29. 

  29.  # The "tzselect", "zic", and "zdump" commands get installed in. . .
    30. 

  30.  
    31. 

  31. -ETCDIR=		$(TOPDIR)/etc
    32. 

  32. +SBINDIR=		$(TOPDIR)/sbin
    33. 

  33.  
    34. 

  34.  # If you "make INSTALL", the "date" command gets installed in. . .
    35. 

  35. @@ -53,5 +53,5 @@
    36. 

  36.  # Manual pages go in subdirectories of. . .
    37. 

  37.  
    38. 

  38. -MANDIR=		$(TOPDIR)/man
    39. 

  39. +MANDIR=		$(TOPDIR)/share/man
    40. 

  40.  
    41. 

  41.  # Library functions are put in an archive in LIBDIR.
    42. 

  42. @@ -211,5 +211,5 @@
    43. 

  43.  # falls on a Friday, Saturday, or Sunday.
    44. 

  44.  
    45. 

  45. -CFLAGS=
    46. 

  46. +CFLAGS += -std=gnu99
    47. 

  47.  
    48. 

  48.  # If you want zic's -s option used when installing, uncomment the next line
    49. 

  49. @@ -220,5 +220,5 @@
    50. 

  50.  
    51. 

  51.  # The name of a Posix-compliant `awk' on your system.
    52. 

  52. -AWK=		nawk
    53. 

  53. +AWK=		awk
    54. 

  54.  
    55. 

  55.  # The path where SGML DTDs are kept.
    56. 

  56. @@ -241,8 +241,10 @@
    57. 

  57.  
    58. 

  58.  ###############################################################################
    59. 

  59.  
    60. 

  60. -cc=		cc
    61. 

  61. -CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
    62. 

  62. +CC+=		-DTZDIR=\"$(TZDIR)\"
    63. 

  63. +ifeq ($(NLS),1)
    64. 

  64. +CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
    65. 

  65. +endif
    66. 

  66.  
    67. 

  67.  TZCSRCS=	zic.c localtime.c asctime.c scheck.c ialloc.c
    68. 

  68.  TZCOBJS=	zic.o localtime.o asctime.o scheck.o ialloc.o
    69. 

  69. @@ -281,11 +281,13 @@
    70. 

  70.  ALL:		all date
    71. 

  71.  
    72. 

  72. -install:	all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
    73. 

  73. +install:	all $(DATA) $(REDO) $(MANS) $(TABDATA)
    74. 

  74.  		$(ZIC) -y $(YEARISTYPE) \
    75. 

  75.  			-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
    76. 

  76.  		-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
    77. 

  77.  		cp iso3166.tab zone.tab $(TZDIR)/.
    78. 

  78. -		-mkdir $(TOPDIR) $(ETCDIR)
    79. 

  79. -		cp tzselect zic zdump $(ETCDIR)/.
    80. 

  80. +		-mkdir $(TOPDIR) $(SBINDIR)
    81. 

  81. +		cp zic zdump $(SBINDIR)/.
    82. 

  82. +		-mkdir $(TOPDIR) $(BINDIR)
    83. 

  83. +		cp tzselect $(BINDIR)/.
    84. 

  84.  		-mkdir $(TOPDIR) $(MANDIR) \
    85. 

  85.  			$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
    86. 

  86. @@ -297,6 +299,4 @@
    87. 

  87.  			$(MANDIR)/man8/zic.8
    88. 

  88.  		cp newctime.3 newtzset.3 $(MANDIR)/man3/.
    89. 

  89. -		cp tzfile.5 $(MANDIR)/man5/.
    90. 

  90. -		cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
    91. 

  91.  
    92. 

  92.  INSTALL:	ALL install date.1
    93. 

  93. @@ -309,10 +309,10 @@
    94. 

  94.  		cp date.1 $(MANDIR)/man1/.
    95. 

  95.  
    96. 

  96.  zdump:		$(TZDOBJS)
    97. 

  97. -		$(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
    98. 

  98. +		$(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
    99. 

  99.  
    100. 

  100.  zic:		$(TZCOBJS) yearistype
    101. 

  101. -		$(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
    102. 

  102. +		$(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
    103. 

  103.  
    104. 

  104.  yearistype:	yearistype.sh
    105. 

  105.  		cp yearistype.sh yearistype
    106. 

  106. @@ -333,7 +333,7 @@
    107. 

  107.  # to using them, or vice versa.
    108. 

  108.  other_two:	zic leapseconds $(TDATA)
    109. 

  109. -		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
    110. 

  110. +		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
    111. 

  111.  		$(ZIC) -y $(YEARISTYPE) \
    112. 

  112. -			-d $(TZDIR)-leaps -L leapseconds $(TDATA)
    113. 

  113. +			-d $(TZDIR)/right -L leapseconds $(TDATA)
    114. 

  114.  
    115. 

  115.  posix_right:	posix_only other_two
    116. 

  116. @@ -351,7 +351,7 @@
    117. 

  117.  			then ranlib $@ ; fi
    118. 

  118.  
    119. 

  119.  date:		$(DATEOBJS)
    120. 

  120. -		$(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \
    121. 

  121. +		$(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o strftime.o \
    122. 

  122.  			$(LDLIBS) -lc -o $@
    123. 

  123.  
    124. 

  124.  tzselect:	tzselect.ksh
    125. 

  125. @@ -366,5 +366,5 @@
    126. 

  126.  		chmod +x $@
    127. 

  127.  
    128. 

  128. -check:		check_tables check_web
    129. 

  129. +check:		check_tables
    130. 

  130.  
    131. 

  131.  check_tables:	checktab.awk $(PRIMARY_YDATA)
    132. 

  132. --- tzselect.ksh
    133. 

  133. +++ tzselect.ksh
    134. 

  134. @@ -1,3 +1,3 @@
    135. 

  135. -#! /bin/ksh
    136. 

  136. +#! /bin/bash
    137. 

  137.  
    138. 

  138.  # '@(#)tzselect.ksh	1.8'
    139.