/app-text/gonzui/files/gonzui-1.2-r2-gentoo.patch

https://github.com/1000timesdead/portage · Patch · 238 lines · 204 code · 34 blank · 0 comment · 0 complexity · 9bbd9f4b30c7d53b4021f819ddddcad4 MD5 · raw file 

    

  1. diff -Naur gonzui-1.2.orig/Makefile.am gonzui-1.2/Makefile.am
    2. 

  2. --- gonzui-1.2.orig/Makefile.am	2005-03-25 18:00:20.000000000 +0900
    3. 

  3. +++ gonzui-1.2/Makefile.am	2011-01-14 11:51:36.207687824 +0900
    4. 

  4. @@ -28,7 +28,7 @@
    5. 

  5.  		gonzui.rb.in > gonzui.rb
    6. 

  6.  	chmod -w gonzui.rb
    7. 

  7.  
    8. 

  8. -gonzuirc.sample.in: gonzuirc.sample.in.in
    9. 

  9. +gonzuirc.sample.in: gonzui.rb gonzuirc.sample.in.in
    10. 

  10.  	ruby gonzui-db --gonzuirc gonzuirc.sample.in.in --dump-config \
    11. 

  11.  		> gonzuirc.sample.in
    12. 

  12.  
    13. 

  13. diff -Naur gonzui-1.2.orig/acinclude.m4 gonzui-1.2/acinclude.m4
    14. 

  14. --- gonzui-1.2.orig/acinclude.m4	2005-02-16 23:11:11.000000000 +0900
    15. 

  15. +++ gonzui-1.2/acinclude.m4	2011-01-14 15:52:41.631014210 +0900
    16. 

  16. @@ -54,7 +54,8 @@
    17. 

  17.    RUBY_CFLAGS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["CFLAGS"]'`"
    18. 

  18.    RUBY_DLEXT="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLEXT"]'`"
    19. 

  19.    RUBY_DLDFLAGS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLDFLAGS"]'`"
    20. 

  20. -  RUBY_LIBS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LIBS"]'`"
    21. 

  21. +  RUBY_SO_NAME="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["RUBY_SO_NAME"]'`"
    22. 

  22. +  RUBY_LIBS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"]+" "+Config::MAKEFILE_CONFIG["LIBS"]'`"
    23. 

  23.    RUBY_HDRHDIR="`ruby -rmkmf -e 'puts Config::CONFIG["archdir"]'`"
    24. 

  24.    RUBY_CPPFLAGS='-I. -I$(RUBY_HDRHDIR)'
    25. 

  25.    changequote([, ])
    26. 

  26. @@ -64,6 +65,7 @@
    27. 

  27.    AC_SUBST(RUBY_CFLAGS)
    28. 

  28.    AC_SUBST(RUBY_DLEXT)
    29. 

  29.    AC_SUBST(RUBY_DLDFLAGS)
    30. 

  30. +  AC_SUBST(RUBY_SO_NAME)
    31. 

  31.    AC_SUBST(RUBY_LIBS)
    32. 

  32.    AC_SUBST(RUBY_HDRHDIR)
    33. 

  33.    AC_SUBST(RUBY_CPPFLAGS)
    34. 

  34. diff -Naur gonzui-1.2.orig/configure.ac gonzui-1.2/configure.ac
    35. 

  35. --- gonzui-1.2.orig/configure.ac	2005-07-05 00:07:52.000000000 +0900
    36. 

  36. +++ gonzui-1.2/configure.ac	2011-01-14 11:51:36.207687824 +0900
    37. 

  37. @@ -9,7 +9,6 @@
    38. 

  38.  AC_PROG_CC
    39. 

  39.  AC_PROG_INSTALL
    40. 

  40.  AC_PROG_MAKE_SET
    41. 

  41. -AM_MAINTAINER_MODE
    42. 

  42.  AM_PATH_RUBY
    43. 

  43.  AM_RUN_LOG_DIRS
    44. 

  44.  AM_USER_GROUP
    45. 

  45. diff -Naur gonzui-1.2.orig/gonzui/Makefile.am gonzui-1.2/gonzui/Makefile.am
    46. 

  46. --- gonzui-1.2.orig/gonzui/Makefile.am	2005-03-17 15:48:44.000000000 +0900
    47. 

  47. +++ gonzui-1.2/gonzui/Makefile.am	2011-01-14 17:58:12.112150295 +0900
    48. 

  48. @@ -51,16 +51,16 @@
    49. 

  49.  
    50. 

  50.  SUFFIXES = .c .o # for automake 1.4-p6
    51. 

  51.  .c.o:
    52. 

  52. -	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    53. 

  53. +	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    54. 

  54.  
    55. 

  55.  $(TEXTTOKENIZER_DLLIB): $(TEXTTOKENIZER_OBJS)
    56. 

  56.  	rm -f $@
    57. 

  57. -	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(TEXTTOKENIZER_OBJS) $(RUBY_LIBS)
    58. 

  58. +	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(TEXTTOKENIZER_OBJS) $(RUBY_LIBS)
    59. 

  59.  
    60. 

  60.  $(DELTA_DLLIB): $(DELTA_OBJS)
    61. 

  61.  	rm -f $@
    62. 

  62. -	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(DELTA_OBJS) $(RUBY_LIBS)
    63. 

  63. +	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(DELTA_OBJS) $(RUBY_LIBS)
    64. 

  64.  
    65. 

  65.  $(AUTOPACK_DLLIB): $(AUTOPACK_OBJS)
    66. 

  66.  	rm -f $@
    67. 

  67. -	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(AUTOPACK_OBJS) $(RUBY_LIBS)
    68. 

  68. +	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(AUTOPACK_OBJS) $(RUBY_LIBS)
    69. 

  69. diff -Naur gonzui-1.2.orig/gonzui/webapp/Makefile.am gonzui-1.2/gonzui/webapp/Makefile.am
    70. 

  70. --- gonzui-1.2.orig/gonzui/webapp/Makefile.am	2005-03-14 18:24:17.000000000 +0900
    71. 

  71. +++ gonzui-1.2/gonzui/webapp/Makefile.am	2011-01-14 17:58:36.352009521 +0900
    72. 

  72. @@ -24,8 +24,8 @@
    73. 

  73.  
    74. 

  74.  SUFFIXES = .c .o # for automake 1.4-p6
    75. 

  75.  .c.o:
    76. 

  76. -	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    77. 

  77. +	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    78. 

  78.  
    79. 

  79.  $(XMLFORMATTER_DLLIB): $(XMLFORMATTER_OBJS)
    80. 

  80.  	rm -f $@
    81. 

  81. -	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(XMLFORMATTER_OBJS) $(RUBY_LIBS)
    82. 

  82. +	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(XMLFORMATTER_OBJS) $(RUBY_LIBS)
    83. 

  83. diff -Naur gonzui-1.2.orig/langscan/Makefile.am gonzui-1.2/langscan/Makefile.am
    84. 

  84. --- gonzui-1.2.orig/langscan/Makefile.am	2005-07-05 00:07:57.000000000 +0900
    85. 

  85. +++ gonzui-1.2/langscan/Makefile.am	2011-01-14 11:51:36.207687824 +0900
    86. 

  86. @@ -26,6 +26,7 @@
    87. 

  87.  		brainfuck.rb \
    88. 

  88.  		c.rb \
    89. 

  89.  		css.rb \
    90. 

  90. +		ebuild.rb \
    91. 

  91.  		elisp.rb \
    92. 

  92.  		java.rb \
    93. 

  93.  		javascript.rb \
    94. 

  94. diff -Naur gonzui-1.2.orig/langscan/c/Makefile.am gonzui-1.2/langscan/c/Makefile.am
    95. 

  95. --- gonzui-1.2.orig/langscan/c/Makefile.am	2005-03-20 21:08:25.000000000 +0900
    96. 

  96. +++ gonzui-1.2/langscan/c/Makefile.am	2011-01-14 18:00:08.163475904 +0900
    97. 

  97. @@ -35,9 +35,9 @@
    98. 

  98.  
    99. 

  99.  SUFFIXES = .c .o # for automake 1.4-p6
    100. 

  100.  .c.o:
    101. 

  101. -	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    102. 

  102. +	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    103. 

  103.  
    104. 

  104.  $(LANGSCAN_C_DLLIB): $(LANGSCAN_C_OBJS)
    105. 

  105.  	rm -f $@
    106. 

  106. -	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_C_OBJS) $(RUBY_LIBS)
    107. 

  107. +	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_C_OBJS) $(RUBY_LIBS)
    108. 

  108.  
    109. 

  109. diff -Naur gonzui-1.2.orig/langscan/java/Makefile.am gonzui-1.2/langscan/java/Makefile.am
    110. 

  110. --- gonzui-1.2.orig/langscan/java/Makefile.am	2005-03-20 21:08:39.000000000 +0900
    111. 

  111. +++ gonzui-1.2/langscan/java/Makefile.am	2011-01-14 18:00:22.287393757 +0900
    112. 

  112. @@ -27,7 +27,7 @@
    113. 

  113.  
    114. 

  114.  # We do this to workaround flex 2.5.4 issue because our .l
    115. 

  115.  # file could not be processed with flex 2.5.4.
    116. 

  116. -javatok.c: javatok.l
    117. 

  117. +javatok.c: javatok.l java.h
    118. 

  118.  	flex -d -ojavatok.c javatok.l || cp javatok.c.dist javatok.c
    119. 

  119.  	cmp -s javatok.c javatok.c.dist || cp javatok.c javatok.c.dist
    120. 

  120.  
    121. 

  121. @@ -35,8 +35,8 @@
    122. 

  122.  
    123. 

  123.  SUFFIXES = .c .o # for automake 1.4-p6
    124. 

  124.  .c.o:
    125. 

  125. -	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    126. 

  126. +	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    127. 

  127.  
    128. 

  128.  $(LANGSCAN_JAVA_DLLIB): $(LANGSCAN_JAVA_OBJS)
    129. 

  129.  	rm -f $@
    130. 

  130. -	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_JAVA_OBJS) $(RUBY_LIBS)
    131. 

  131. +	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_JAVA_OBJS) $(RUBY_LIBS)
    132. 

  132. diff -Naur gonzui-1.2.orig/langscan/javascript/Makefile.am gonzui-1.2/langscan/javascript/Makefile.am
    133. 

  133. --- gonzui-1.2.orig/langscan/javascript/Makefile.am	2005-03-22 01:09:55.000000000 +0900
    134. 

  134. +++ gonzui-1.2/langscan/javascript/Makefile.am	2011-01-14 18:00:41.683280922 +0900
    135. 

  135. @@ -27,7 +27,7 @@
    136. 

  136.  
    137. 

  137.  # We do this to workaround flex 2.5.4 issue because our .l
    138. 

  138.  # file could not be processed with flex 2.5.4.
    139. 

  139. -javascripttok.c: javascripttok.l
    140. 

  140. +javascripttok.c: javascripttok.l javascript.h
    141. 

  141.  	flex -d -ojavascripttok.c javascripttok.l || cp javascripttok.c.dist javascripttok.c
    142. 

  142.  	cmp -s javascripttok.c javascripttok.c.dist || cp javascripttok.c javascripttok.c.dist
    143. 

  143.  
    144. 

  144. @@ -35,8 +35,8 @@
    145. 

  145.  
    146. 

  146.  SUFFIXES = .c .o # for automake 1.4-p6
    147. 

  147.  .c.o:
    148. 

  148. -	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    149. 

  149. +	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    150. 

  150.  
    151. 

  151.  $(LANGSCAN_JAVASCRIPT_DLLIB): $(LANGSCAN_JAVASCRIPT_OBJS)
    152. 

  152.  	rm -f $@
    153. 

  153. -	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_JAVASCRIPT_OBJS) $(RUBY_LIBS)
    154. 

  154. +	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_JAVASCRIPT_OBJS) $(RUBY_LIBS)
    155. 

  155. diff -Naur gonzui-1.2.orig/langscan/pairmatcher/Makefile.am gonzui-1.2/langscan/pairmatcher/Makefile.am
    156. 

  156. --- gonzui-1.2.orig/langscan/pairmatcher/Makefile.am	2005-03-20 20:42:22.000000000 +0900
    157. 

  157. +++ gonzui-1.2/langscan/pairmatcher/Makefile.am	2011-01-14 18:01:22.883041149 +0900
    158. 

  158. @@ -21,9 +21,9 @@
    159. 

  159.  
    160. 

  160.  SUFFIXES = .c .o # for automake 1.4-p6
    161. 

  161.  .c.o:
    162. 

  162. -	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    163. 

  163. +	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    164. 

  164.  
    165. 

  165.  $(PAIRMATCHER_C_DLLIB): $(PAIRMATCHER_C_OBJS)
    166. 

  166.  	rm -f $@
    167. 

  167. -	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(PAIRMATCHER_C_OBJS) $(RUBY_LIBS)
    168. 

  168. +	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(PAIRMATCHER_C_OBJS) $(RUBY_LIBS)
    169. 

  169.  
    170. 

  170. diff -Naur gonzui-1.2.orig/langscan/php/Makefile.am gonzui-1.2/langscan/php/Makefile.am
    171. 

  171. --- gonzui-1.2.orig/langscan/php/Makefile.am	2005-03-20 21:08:45.000000000 +0900
    172. 

  172. +++ gonzui-1.2/langscan/php/Makefile.am	2011-01-14 18:01:41.290933978 +0900
    173. 

  173. @@ -27,7 +27,7 @@
    174. 

  174.  
    175. 

  175.  # We do this to workaround flex 2.5.4 issue because our .l
    176. 

  176.  # file could not be processed with flex 2.5.4.
    177. 

  177. -phptok.c: phptok.l
    178. 

  178. +phptok.c: phptok.l php.h
    179. 

  179.  	flex -F -8 -d -ophptok.c phptok.l || cp phptok.c.dist phptok.c
    180. 

  180.  	cmp -s phptok.c phptok.c.dist || cp phptok.c phptok.c.dist
    181. 

  181.  
    182. 

  182. @@ -35,8 +35,8 @@
    183. 

  183.  
    184. 

  184.  SUFFIXES = .c .o # for automake 1.4-p6
    185. 

  185.  .c.o:
    186. 

  186. -	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    187. 

  187. +	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    188. 

  188.  
    189. 

  189.  $(LANGSCAN_PHP_DLLIB): $(LANGSCAN_PHP_OBJS)
    190. 

  190.  	rm -f $@
    191. 

  191. -	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_PHP_OBJS) $(RUBY_LIBS)
    192. 

  192. +	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_PHP_OBJS) $(RUBY_LIBS)
    193. 

  193. diff -Naur gonzui-1.2.orig/langscan/python/Makefile.am gonzui-1.2/langscan/python/Makefile.am
    194. 

  194. --- gonzui-1.2.orig/langscan/python/Makefile.am	2005-03-20 21:08:58.000000000 +0900
    195. 

  195. +++ gonzui-1.2/langscan/python/Makefile.am	2011-01-14 18:01:57.318840641 +0900
    196. 

  196. @@ -27,7 +27,7 @@
    197. 

  197.  
    198. 

  198.  # We do this to workaround flex 2.5.4 issue because our .l
    199. 

  199.  # file could not be processed with flex 2.5.4.
    200. 

  200. -pythontok.c: pythontok.l
    201. 

  201. +pythontok.c: pythontok.l python.h
    202. 

  202.  	flex -d -opythontok.c pythontok.l || cp pythontok.c.dist pythontok.c
    203. 

  203.  	cmp -s pythontok.c pythontok.c.dist || cp pythontok.c pythontok.c.dist
    204. 

  204.  
    205. 

  205. @@ -35,8 +35,8 @@
    206. 

  206.  
    207. 

  207.  SUFFIXES = .c .o # for automake 1.4-p6
    208. 

  208.  .c.o:
    209. 

  209. -	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    210. 

  210. +	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    211. 

  211.  
    212. 

  212.  $(LANGSCAN_PYTHON_DLLIB): $(LANGSCAN_PYTHON_OBJS)
    213. 

  213.  	rm -f $@
    214. 

  214. -	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_PYTHON_OBJS) $(RUBY_LIBS)
    215. 

  215. +	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_PYTHON_OBJS) $(RUBY_LIBS)
    216. 

  216. diff -Naur gonzui-1.2.orig/langscan/sh/Makefile.am gonzui-1.2/langscan/sh/Makefile.am
    217. 

  217. --- gonzui-1.2.orig/langscan/sh/Makefile.am	2005-04-08 21:42:40.000000000 +0900
    218. 

  218. +++ gonzui-1.2/langscan/sh/Makefile.am	2011-01-14 17:59:52.227568573 +0900
    219. 

  219. @@ -27,7 +27,7 @@
    220. 

  220.  
    221. 

  221.  # We do this to workaround flex 2.5.4 issue because our .l
    222. 

  222.  # file could not be processed with flex 2.5.4.
    223. 

  223. -shtok.c: shtok.l
    224. 

  224. +shtok.c: shtok.l sh.h
    225. 

  225.  	flex -d -oshtok.c shtok.l || cp shtok.c.dist shtok.c
    226. 

  226.  	cmp -s shtok.c shtok.c.dist || cp shtok.c shtok.c.dist
    227. 

  227.  
    228. 

  228. @@ -35,8 +35,8 @@
    229. 

  229.  
    230. 

  230.  SUFFIXES = .c .o # for automake 1.4-p6
    231. 

  231.  .c.o:
    232. 

  232. -	$(RUBY_CC) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    233. 

  233. +	$(RUBY_CC) $(CFLAGS) $(RUBY_CFLAGS) $(RUBY_CPPFLAGS) -c $<
    234. 

  234.  
    235. 

  235.  $(LANGSCAN_SH_DLLIB): $(LANGSCAN_SH_OBJS)
    236. 

  236.  	rm -f $@
    237. 

  237. -	$(RUBY_LDSHARED) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_SH_OBJS) $(RUBY_LIBS)
    238. 

  238. +	$(RUBY_LDSHARED) $(LDFLAGS) $(RUBY_DLDFLAGS) -o $@ $(LANGSCAN_SH_OBJS) $(RUBY_LIBS)
    239.