| 1 |
tomjbe 10/05/05 18:27:23 |
| 2 |
|
| 3 |
Added: mup-5.6-Makefile.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-sound/mup/files/mup-5.6-Makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mup/files/mup-5.6-Makefile.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mup/files/mup-5.6-Makefile.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mup-5.6-Makefile.patch |
| 15 |
=================================================================== |
| 16 |
diff -urN mup-5.6.orig/Makefile mup-5.6/Makefile |
| 17 |
--- mup-5.6.orig/Makefile 1970-01-01 00:00:00.000000000 +0000 |
| 18 |
+++ mup-5.6/Makefile 2010-05-05 18:11:13.000000000 +0000 |
| 19 |
@@ -0,0 +1,148 @@ |
| 20 |
+PREFIX = /usr |
| 21 |
+BINDIR = $(PREFIX)/bin |
| 22 |
+MANDIR = $(PREFIX)/share/man/man1 |
| 23 |
+CC = gcc |
| 24 |
+CXX = g++ |
| 25 |
+CFLAGS = -O2 -pipe |
| 26 |
+CXXFLAGS = -O2 -pipe |
| 27 |
+X_LOCATION = /usr |
| 28 |
+FLTK_LIB_LOCATION = -L/usr/lib/fltk-1.1 |
| 29 |
+X_LIBS = -lXext -lX11 -lXpm |
| 30 |
+FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1.1 |
| 31 |
+JPEGLIB = jpeg |
| 32 |
+PNGLIB = png |
| 33 |
+ZLIB = z |
| 34 |
+ |
| 35 |
+MUP_SRC = \ |
| 36 |
+ mup/abshorz.c \ |
| 37 |
+ mup/absvert.c \ |
| 38 |
+ mup/assign.c \ |
| 39 |
+ mup/beaming.c \ |
| 40 |
+ mup/beamstem.c \ |
| 41 |
+ mup/brac.c \ |
| 42 |
+ mup/charinfo.c \ |
| 43 |
+ mup/check.c \ |
| 44 |
+ mup/debug.c \ |
| 45 |
+ mup/errors.c \ |
| 46 |
+ mup/extchtbl.c \ |
| 47 |
+ mup/font.c \ |
| 48 |
+ mup/fontdata.c \ |
| 49 |
+ mup/globals.c \ |
| 50 |
+ mup/grpsyl.c \ |
| 51 |
+ mup/ifgram.c \ |
| 52 |
+ mup/lex.c \ |
| 53 |
+ mup/locvar.c \ |
| 54 |
+ mup/lyrics.c \ |
| 55 |
+ mup/macros.c \ |
| 56 |
+ mup/main.c \ |
| 57 |
+ mup/mainlist.c \ |
| 58 |
+ mup/map.c \ |
| 59 |
+ mup/midi.c \ |
| 60 |
+ mup/midiutil.c \ |
| 61 |
+ mup/mkchords.c \ |
| 62 |
+ mup/muschtbl.c \ |
| 63 |
+ mup/nxtstrch.c \ |
| 64 |
+ mup/parstssv.c \ |
| 65 |
+ mup/parstuff.c \ |
| 66 |
+ mup/phrase.c \ |
| 67 |
+ mup/plutils.c \ |
| 68 |
+ mup/print.c \ |
| 69 |
+ mup/prntdata.c \ |
| 70 |
+ mup/prntmisc.c \ |
| 71 |
+ mup/prnttab.c \ |
| 72 |
+ mup/prolog.c \ |
| 73 |
+ mup/range.c \ |
| 74 |
+ mup/rational.c \ |
| 75 |
+ mup/relvert.c \ |
| 76 |
+ mup/restsyl.c \ |
| 77 |
+ mup/roll.c \ |
| 78 |
+ mup/setgrps.c \ |
| 79 |
+ mup/setnotes.c \ |
| 80 |
+ mup/ssv.c \ |
| 81 |
+ mup/stuff.c \ |
| 82 |
+ mup/symtbl.c \ |
| 83 |
+ mup/tie.c \ |
| 84 |
+ mup/trantab.c \ |
| 85 |
+ mup/trnspose.c \ |
| 86 |
+ mup/undrscre.c \ |
| 87 |
+ mup/utils.c \ |
| 88 |
+ mup/ytab.c |
| 89 |
+ |
| 90 |
+MUP_HDRS = \ |
| 91 |
+ mup/defines.h \ |
| 92 |
+ mup/extchar.h \ |
| 93 |
+ mup/globals.h \ |
| 94 |
+ mup/muschar.h \ |
| 95 |
+ mup/rational.h \ |
| 96 |
+ mup/ssvused.h \ |
| 97 |
+ mup/structs.h \ |
| 98 |
+ mup/ytab.h |
| 99 |
+ |
| 100 |
+MUPDISP_SRC = \ |
| 101 |
+ mupdisp/at386.c \ |
| 102 |
+ mupdisp/do_cmd.c \ |
| 103 |
+ mupdisp/dos.c \ |
| 104 |
+ mupdisp/genfile.c \ |
| 105 |
+ mupdisp/init.c \ |
| 106 |
+ mupdisp/linvga.c \ |
| 107 |
+ mupdisp/mupdisp.c \ |
| 108 |
+ mupdisp/xterm.c |
| 109 |
+ |
| 110 |
+MUPDISP_HDRS = mupdisp/dispttyp.h mupdisp/mupdisp.h |
| 111 |
+MUPDISP_BITMAPS = mupdisp/help.bm mupdisp/waitmsg.bm |
| 112 |
+MKMUPFNT_SRC = mkmupfnt/mkmupfnt.c |
| 113 |
+ |
| 114 |
+MUPMATE_SRC = \ |
| 115 |
+ mupmate/Config.C \ |
| 116 |
+ mupmate/Edit.C \ |
| 117 |
+ mupmate/File.C \ |
| 118 |
+ mupmate/Help.C \ |
| 119 |
+ mupmate/Main.C \ |
| 120 |
+ mupmate/Preferences.C \ |
| 121 |
+ mupmate/Run.C \ |
| 122 |
+ mupmate/utils.C \ |
| 123 |
+ mupmate/license.C \ |
| 124 |
+ mupmate/regform.C \ |
| 125 |
+ mupmate/template.C |
| 126 |
+ |
| 127 |
+MUPMATE_HDRS = \ |
| 128 |
+ mup/defines.h \ |
| 129 |
+ mupmate/Config.H \ |
| 130 |
+ mupmate/Edit.H \ |
| 131 |
+ mupmate/File.H \ |
| 132 |
+ mupmate/Help.H \ |
| 133 |
+ mupmate/Main.H \ |
| 134 |
+ mupmate/Preferences.H \ |
| 135 |
+ mupmate/Run.H \ |
| 136 |
+ mupmate/utils.H \ |
| 137 |
+ mupmate/globals.H \ |
| 138 |
+ mupmate/resource.h |
| 139 |
+ |
| 140 |
+MUPMATE_OTHER_FILES = \ |
| 141 |
+ mupmate/mup32.xpm |
| 142 |
+ |
| 143 |
+all: mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate |
| 144 |
+ |
| 145 |
+mup/mup: $(MUP_HDRS) $(MUP_SRC) |
| 146 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MUP_SRC) -lm |
| 147 |
+ |
| 148 |
+mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC) |
| 149 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11 |
| 150 |
+ |
| 151 |
+mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC) |
| 152 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MKMUPFNT_SRC) |
| 153 |
+ |
| 154 |
+mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES) |
| 155 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \ |
| 156 |
+ -I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \ |
| 157 |
+ $(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \ |
| 158 |
+ -l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm |
| 159 |
+ |
| 160 |
+install: all |
| 161 |
+ mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR) |
| 162 |
+ cp mup/mup $(DESTDIR)$(BINDIR)/mup |
| 163 |
+ cp mkmupfnt/mkmupfnt $(DESTDIR)$(BINDIR)/mkmupfnt |
| 164 |
+ cp mupdisp/mupdisp $(DESTDIR)$(BINDIR)/mupdisp |
| 165 |
+ cp mupmate/mupmate $(DESTDIR)$(BINDIR)/mupmate |
| 166 |
+ cp mupprnt $(DESTDIR)$(BINDIR)/mupprnt |
| 167 |
+ cp docs/*.1 $(DESTDIR)$(MANDIR) |
| 168 |
diff -urN mup-5.6.orig/makefile mup-5.6/makefile |
| 169 |
--- mup-5.6.orig/makefile 2010-05-05 18:10:57.000000000 +0000 |
| 170 |
+++ mup-5.6/makefile 1970-01-01 00:00:00.000000000 +0000 |
| 171 |
@@ -1,251 +0,0 @@ |
| 172 |
- |
| 173 |
-# Makefile for Mup (and auxiliary programs mupdisp, mkmupfnt, and mupmate). |
| 174 |
-# This is not an optimal makefile; instead it tries to be very simple, |
| 175 |
-# and easy to understand, so it can be easily modified, if needed. |
| 176 |
- |
| 177 |
-# On most Linux/Unix type systems, just doing |
| 178 |
-# make install |
| 179 |
-# as root will probably work. |
| 180 |
-# (You really only need to be root to copy the products into |
| 181 |
-# the system directories. If you change PREFIX |
| 182 |
-# to point to some other writeable area, you wouldn't need to be root.) |
| 183 |
-# For Apple Mac OX X, see the notes for what to change (CLFAGS and X_LIBS) |
| 184 |
-# If you only want the Mup program itself, you can do |
| 185 |
-# make mup/mup |
| 186 |
-# The other programs are optional: |
| 187 |
-# - mupdisp runs Mup and then runs GhostScript on the result. |
| 188 |
-# You can run Mup directly, and use gv, GSview, ghostview or any other |
| 189 |
-# PostScript viewer on the Mup output, as an alternative to mupdisp. |
| 190 |
-# - mkmupfnt is only needed if you want to use fonts beyond the basic |
| 191 |
-# standard PostScript fonts. |
| 192 |
-# - mupmate is a graphical user interface front end for Mup. |
| 193 |
-# It is not needed if you intend to only use Mup via command line interface. |
| 194 |
- |
| 195 |
-# The mupdisp and mupmate programs require X libraries and headers (www.x.org). |
| 196 |
-# The mupmate program requires FLTK libraries and headers (www.fltk.org). |
| 197 |
- |
| 198 |
-# If you want mupdisp to support Linux console mode, make sure you have |
| 199 |
-# the svgalib package installed, then find the two commented-out lines below |
| 200 |
-# related to Linux console support, and uncomment them. |
| 201 |
- |
| 202 |
-# If you are building on a system that does not support make, |
| 203 |
-# you can look at what this makefile does for how to build. |
| 204 |
-# Mup itself is generally easy to build. |
| 205 |
-# You just go to the mup directory and run your C compiler on |
| 206 |
-# all the .c files in directory, and link with the math library, |
| 207 |
-# Typically this is done using a command something like: |
| 208 |
-# cc *.c -lm |
| 209 |
-# For more information on building Mup, see: |
| 210 |
-# http://www.arkkra.com/doc/dosbld.html |
| 211 |
-# http://www.arkkra.com/doc/otherbld.html |
| 212 |
-# http://www.arkkra.com/doc/unixbld.html |
| 213 |
- |
| 214 |
-# Lines you might conceivably want to change have comments by them, |
| 215 |
-# explaining how you might want to change them. |
| 216 |
-# Any line without any comment by it is very unlikely to ever need changing. |
| 217 |
- |
| 218 |
-#----------------------------------------------------------------------- |
| 219 |
- |
| 220 |
-# These define where to put the Mup products. |
| 221 |
-# You could change this to /usr/local or your own space if you like. |
| 222 |
-PREFIX = /usr |
| 223 |
-BINDIR = $(PREFIX)/bin |
| 224 |
-MANDIR = $(PREFIX)/man/man1 |
| 225 |
-DOCDIR = $(PREFIX)/share/doc/packages/mup |
| 226 |
- |
| 227 |
-# This is the name of your C compiler. |
| 228 |
-# cc would be another common choice. |
| 229 |
-CCOMPILER = gcc |
| 230 |
- |
| 231 |
-# This is the name of your C++ compiler. |
| 232 |
-# CC would be another common choice. |
| 233 |
-CPPCOMPILER = g++ |
| 234 |
- |
| 235 |
-# -O option turns on optimization for most C compilers. |
| 236 |
-# You can add other options, if you like, as appropriate for your C compiler. |
| 237 |
-# Another common addition would be -g to get debugging information. |
| 238 |
-# For Mac OS X, you should probably add |
| 239 |
-# -Dunix |
| 240 |
-# and if you want universal binaries, add |
| 241 |
-# -arch i386 -arch ppc |
| 242 |
-# and if you want backward compatibility to older versions, add something like |
| 243 |
-# -mmacosx-version-min=10.1 |
| 244 |
-CFLAGS = -O |
| 245 |
- |
| 246 |
-# You can change this if your X libraries and headers are somewhere else |
| 247 |
-# (like /usr/X11R6). |
| 248 |
-X_LOCATION = /usr/X11 |
| 249 |
- |
| 250 |
-# If you installed fltk somewhere other than $(X_LOCATION)/lib |
| 251 |
-# set this to find them, as in |
| 252 |
-# FLTK_LIB_LOCATION = -L/usr/local/lib |
| 253 |
-FLTK_LIB_LOCATION = |
| 254 |
- |
| 255 |
-# The X libraries to link with Mupmate. |
| 256 |
-X_LIBS = -lXext -lX11 -lXpm |
| 257 |
-# On Mac OS X replace that with |
| 258 |
-# X_LIBS = -framework Carbon |
| 259 |
- |
| 260 |
-# The FLTK header files are under $(FLTK_INCLUDE)/FL |
| 261 |
-FLTK_INCLUDE = $(X_LOCATION)/include |
| 262 |
- |
| 263 |
-# You can use fltk_jpeg or jpeg library, whichever you have |
| 264 |
-JPEGLIB = fltk_jpeg |
| 265 |
- |
| 266 |
-# You can use fltk_png or png library, whichever you have |
| 267 |
-PNGLIB = fltk_png |
| 268 |
- |
| 269 |
-# You can use fltk_z or z library, whichever you have |
| 270 |
-ZLIB = fltk_z |
| 271 |
- |
| 272 |
-#----------------------------------------------------------------------- |
| 273 |
- |
| 274 |
-MUP_SRC = \ |
| 275 |
- mup/abshorz.c \ |
| 276 |
- mup/absvert.c \ |
| 277 |
- mup/assign.c \ |
| 278 |
- mup/beaming.c \ |
| 279 |
- mup/beamstem.c \ |
| 280 |
- mup/brac.c \ |
| 281 |
- mup/charinfo.c \ |
| 282 |
- mup/check.c \ |
| 283 |
- mup/debug.c \ |
| 284 |
- mup/errors.c \ |
| 285 |
- mup/extchtbl.c \ |
| 286 |
- mup/font.c \ |
| 287 |
- mup/fontdata.c \ |
| 288 |
- mup/globals.c \ |
| 289 |
- mup/grpsyl.c \ |
| 290 |
- mup/ifgram.c \ |
| 291 |
- mup/lex.c \ |
| 292 |
- mup/locvar.c \ |
| 293 |
- mup/lyrics.c \ |
| 294 |
- mup/macros.c \ |
| 295 |
- mup/main.c \ |
| 296 |
- mup/mainlist.c \ |
| 297 |
- mup/map.c \ |
| 298 |
- mup/midi.c \ |
| 299 |
- mup/midiutil.c \ |
| 300 |
- mup/mkchords.c \ |
| 301 |
- mup/muschtbl.c \ |
| 302 |
- mup/nxtstrch.c \ |
| 303 |
- mup/parstssv.c \ |
| 304 |
- mup/parstuff.c \ |
| 305 |
- mup/phrase.c \ |
| 306 |
- mup/plutils.c \ |
| 307 |
- mup/print.c \ |
| 308 |
- mup/prntdata.c \ |
| 309 |
- mup/prntmisc.c \ |
| 310 |
- mup/prnttab.c \ |
| 311 |
- mup/prolog.c \ |
| 312 |
- mup/range.c \ |
| 313 |
- mup/rational.c \ |
| 314 |
- mup/relvert.c \ |
| 315 |
- mup/restsyl.c \ |
| 316 |
- mup/roll.c \ |
| 317 |
- mup/setgrps.c \ |
| 318 |
- mup/setnotes.c \ |
| 319 |
- mup/ssv.c \ |
| 320 |
- mup/stuff.c \ |
| 321 |
- mup/symtbl.c \ |
| 322 |
- mup/tie.c \ |
| 323 |
- mup/trantab.c \ |
| 324 |
- mup/trnspose.c \ |
| 325 |
- mup/undrscre.c \ |
| 326 |
- mup/utils.c \ |
| 327 |
- mup/ytab.c |
| 328 |
- |
| 329 |
-MUP_HDRS = \ |
| 330 |
- mup/defines.h \ |
| 331 |
- mup/extchar.h \ |
| 332 |
- mup/globals.h \ |
| 333 |
- mup/muschar.h \ |
| 334 |
- mup/rational.h \ |
| 335 |
- mup/ssvused.h \ |
| 336 |
- mup/structs.h \ |
| 337 |
- mup/ytab.h |
| 338 |
- |
| 339 |
-MUPDISP_SRC = \ |
| 340 |
- mupdisp/at386.c \ |
| 341 |
- mupdisp/do_cmd.c \ |
| 342 |
- mupdisp/dos.c \ |
| 343 |
- mupdisp/genfile.c \ |
| 344 |
- mupdisp/init.c \ |
| 345 |
- mupdisp/linvga.c \ |
| 346 |
- mupdisp/mupdisp.c \ |
| 347 |
- mupdisp/xterm.c |
| 348 |
- |
| 349 |
-MUPDISP_HDRS = mupdisp/dispttyp.h mupdisp/mupdisp.h |
| 350 |
- |
| 351 |
-MUPDISP_BITMAPS = mupdisp/help.bm mupdisp/waitmsg.bm |
| 352 |
- |
| 353 |
-MKMUPFNT_SRC = mkmupfnt/mkmupfnt.c |
| 354 |
- |
| 355 |
-MUPMATE_SRC = \ |
| 356 |
- mupmate/Config.C \ |
| 357 |
- mupmate/Edit.C \ |
| 358 |
- mupmate/File.C \ |
| 359 |
- mupmate/Help.C \ |
| 360 |
- mupmate/Main.C \ |
| 361 |
- mupmate/Preferences.C \ |
| 362 |
- mupmate/Run.C \ |
| 363 |
- mupmate/utils.C \ |
| 364 |
- mupmate/license.C \ |
| 365 |
- mupmate/regform.C \ |
| 366 |
- mupmate/template.C |
| 367 |
- |
| 368 |
-MUPMATE_HDRS = \ |
| 369 |
- mup/defines.h \ |
| 370 |
- mupmate/Config.H \ |
| 371 |
- mupmate/Edit.H \ |
| 372 |
- mupmate/File.H \ |
| 373 |
- mupmate/Help.H \ |
| 374 |
- mupmate/Main.H \ |
| 375 |
- mupmate/Preferences.H \ |
| 376 |
- mupmate/Run.H \ |
| 377 |
- mupmate/utils.H \ |
| 378 |
- mupmate/globals.H \ |
| 379 |
- mupmate/resource.h |
| 380 |
- |
| 381 |
-MUPMATE_OTHER_FILES = \ |
| 382 |
- mupmate/mup32.xpm |
| 383 |
-#--------------------------------------------------------------- |
| 384 |
- |
| 385 |
-all: mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate |
| 386 |
- |
| 387 |
-mup/mup: $(MUP_HDRS) $(MUP_SRC) |
| 388 |
- $(CCOMPILER) $(CFLAGS) -o $@ $(MUP_SRC) -lm |
| 389 |
- |
| 390 |
-mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC) |
| 391 |
- $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11 |
| 392 |
- # For Linux console mode support, comment out the previous line |
| 393 |
- # and uncomment the following line |
| 394 |
- # $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ $(MUPDISP_SRC) -lvga -lX11 -lm |
| 395 |
- |
| 396 |
-mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC) |
| 397 |
- $(CCOMPILER) $(CFLAGS) -o $@ $(MKMUPFNT_SRC) |
| 398 |
- |
| 399 |
-mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES) |
| 400 |
- $(CPPCOMPILER) $(CFLAGS) -o $@ $(MUPMATE_SRC) \ |
| 401 |
- -I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \ |
| 402 |
- $(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \ |
| 403 |
- -l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm |
| 404 |
- |
| 405 |
-install: all |
| 406 |
- mkdir -p $(BINDIR) $(MANDIR) $(DOCDIR)/uguide |
| 407 |
- cp mup/mup $(BINDIR)/mup |
| 408 |
- cp mkmupfnt/mkmupfnt $(BINDIR)/mkmupfnt |
| 409 |
- cp mupdisp/mupdisp $(BINDIR)/mupdisp |
| 410 |
- # For Linux console mode support, uncomment the following line |
| 411 |
- # chown root $(BINDIR)/mupdisp ; chmod 4755 $(BINDIR)/mupdisp |
| 412 |
- cp mupmate/mupmate $(BINDIR)/mupmate |
| 413 |
- cp mupprnt $(BINDIR)/mupprnt |
| 414 |
- cp docs/*.1 $(MANDIR) |
| 415 |
- cp docs/README* docs/*.txt docs/*.ps docs/*.mup $(DOCDIR) |
| 416 |
- cp docs/uguide/* $(DOCDIR)/uguide |
| 417 |
- |
| 418 |
-clean: |
| 419 |
- rm -f mup/*.o mupdisp/*.o mkmupfnt/*.o mupmate/*.o |
| 420 |
- |
| 421 |
-clobber: clean |
| 422 |
- rm -f mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate |
Archives