diff options
Diffstat (limited to 'graphics/gd2/files/patch-ac')
| -rw-r--r-- | graphics/gd2/files/patch-ac | 168 |
1 files changed, 0 insertions, 168 deletions
diff --git a/graphics/gd2/files/patch-ac b/graphics/gd2/files/patch-ac deleted file mode 100644 index d7f41e301594..000000000000 --- a/graphics/gd2/files/patch-ac +++ /dev/null @@ -1,168 +0,0 @@ ---- Makefile.orig Wed Mar 8 14:54:37 2000 -+++ Makefile Fri Mar 10 21:09:49 2000 -@@ -3,35 +3,45 @@ - #If you do not have gcc, change the setting for COMPILER, but you must - #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc - #compiler; get gcc if you are still using it). --COMPILER=gcc -+COMPILER=${CC} - - #If the ar command fails on your system, consult the ar manpage - #for your system. --AR=ar -+#AR=ar - - #If the install command is not in your path, provide - #an explicit path for it here, or install manually. --INSTALL=install -+#INSTALL=install - - #If you don't have FreeType, libjpeg and/or Xpm installed, including the - #header files, uncomment this (default). - #CFLAGS=-O - #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a - #variation of this and comment out the line above. See also LIBS below. --CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF -- -+.if defined(WANT_X11) -+CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF -+.else -+CFLAGS+=-DHAVE_JPEG -+.endif -+ - #If you don't have FreeType and/or Xpm fully installed, uncomment this - #(default). --#LIBS=-lm -lgd -lpng -lz -+LIBS=-lm -lgd -lpng -lz -ljpeg - - #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a - #variation of this and comment out the line above. Note that - #Xpm requires X11. See also CFLAGS above. -+.if defined(WANT_X11) - LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -+.endif - - #Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files. - #If yours are somewhere else, change this. --INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11 -+CFLAGS+=-I$(LOCALBASE)/include -+.if defined(WANT_X11) -+CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11 -+.endif -+ - - #Typical install locations for freetype, zlib, xpm and libpng libraries. - #If yours are somewhere else, other than a standard location -@@ -39,16 +49,19 @@ - #-L. as this allows the gd library itself to be found. - #Put -L. first so that old versions of the gd library elsewhere - #on your system can't cause conflicts while building a new one. --LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib -+LIBDIRS=-L. -L$(LOCALBASE)/lib -+.if defined(WANT_X11) -+LIBDIRS+=-L$(X11BASE)/lib -+.endif - - #Location where libgd.a should be installed by "make install". --INSTALL_LIB=/usr/local/lib -+INSTALL_LIB=$(PREFIX)/lib - - #Location where .h files should be installed by "make install". --INSTALL_INCLUDE=/usr/local/include -+INSTALL_INCLUDE=$(PREFIX)/include/gd - - #Location where useful non-test programs should be installed by "make install". --INSTALL_BIN=/usr/local/bin -+INSTALL_BIN=$(PREFIX)/bin - - # - # -@@ -58,34 +71,41 @@ - - VERSION=1.7 - --CC=$(COMPILER) $(INCLUDEDIRS) --LINK=$(CC) $(LIBDIRS) $(LIBS) -+#CC=$(COMPILER) $(INCLUDEDIRS) -+#LINK=$(CC) $(LIBDIRS) $(LIBS) - - PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS) - - BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng - TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf - --all: libgd.a $(PROGRAMS) -+.SUFFIXES: .c .so .o -+ -+.c.so: -+ ${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} -+ -+all: libgd.a libgd.so.0 $(PROGRAMS) - - install: libgd.a $(BIN_PROGRAMS) -- $(INSTALL) -m 644 libgd.a $(INSTALL_LIB)/libgd.a -- $(INSTALL) -m 755 pngtogd $(INSTALL_BIN)/pngtogd -- $(INSTALL) -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 -- $(INSTALL) -m 755 gdtopng $(INSTALL_BIN)/gdtopng -- $(INSTALL) -m 755 gd2topng $(INSTALL_BIN)/gd2topng -- $(INSTALL) -m 755 gd2copypal $(INSTALL_BIN)/gd2copypal -- $(INSTALL) -m 755 gdparttopng $(INSTALL_BIN)/gdparttopng -- $(INSTALL) -m 755 webpng $(INSTALL_BIN)/webpng -- $(INSTALL) -m 755 bdftogd $(INSTALL_BIN)/bdftogd -- $(INSTALL) -m 644 gd.h $(INSTALL_INCLUDE)/gd.h -- $(INSTALL) -m 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h -- $(INSTALL) -m 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h -- $(INSTALL) -m 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h -- $(INSTALL) -m 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h -- $(INSTALL) -m 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h -- $(INSTALL) -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h -- $(INSTALL) -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h -+ $(INSTALL) -c -m 644 libgd.a $(INSTALL_LIB)/libgd.a -+ $(INSTALL) -c -m 755 libgd.so.0 $(INSTALL_LIB)/libgd.so.0 -+ ln -sf libgd.so.0 $(INSTALL_LIB)/libgd.so -+ $(INSTALL) -c -m 755 pngtogd $(INSTALL_BIN)/pngtogd -+ $(INSTALL) -c -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 -+ $(INSTALL) -c -m 755 gdtopng $(INSTALL_BIN)/gdtopng -+ $(INSTALL) -c -m 755 gd2topng $(INSTALL_BIN)/gd2topng -+ $(INSTALL) -c -m 755 gd2copypal $(INSTALL_BIN)/gd2copypal -+ $(INSTALL) -c -m 755 gdparttopng $(INSTALL_BIN)/gdparttopng -+ $(INSTALL) -c -m 755 webpng $(INSTALL_BIN)/webpng -+ $(INSTALL) -c -m 755 bdftogd $(INSTALL_BIN)/bdftogd -+ $(INSTALL) -c -m 644 gd.h $(INSTALL_INCLUDE)/gd.h -+ $(INSTALL) -c -m 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h -+ $(INSTALL) -c -m 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h -+ $(INSTALL) -c -m 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h -+ $(INSTALL) -c -m 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h -+ $(INSTALL) -c -m 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h -+ $(INSTALL) -c -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h -+ $(INSTALL) -c -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h - - gddemo: gddemo.o libgd.a - $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) -@@ -120,16 +140,19 @@ - gdtestttf: gdtestttf.o libgd.a - $(CC) gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS) - --libgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \ -+OBJS= gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \ - gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \ -- gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o \ -- gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h -+ gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o -+INCS= gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h -+ -+libgd.a: $(INCS) $(OBJS) - rm -f libgd.a -- $(AR) rc libgd.a gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \ -- gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o \ -- gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \ -- gdtables.o gdttf.o gdcache.o gdkanji.o -+ $(AR) rc libgd.a $(OBJS) - -ranlib libgd.a -+ -+libgd.so.0: $(INCS) $(OBJS:S/o$/so/g) -+ $(CC) -shared -Wl,-x -Wl,-assert -Wl,pure-text -Wl,-soname,$@ -o $@ $(OBJS:S/o$/so/g) $(LIBDIRS) $(LIBS) -+ ln -sf libgd.so.0 libgd.so - - clean: - rm -f *.o *.a ${PROGRAMS} |