3 files changed, 49 insertions, 5 deletions

diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile
index 89260397c911..aa2096077f2c 100644
--- a/graphics/gd1/Makefile
+++ b/graphics/gd1/Makefile
@@ -22,4 +22,7 @@ USE_XLIB=	YES
 pre-install:
 	${MKDIR} ${PREFIX}/include/gd
 
+post-install:
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
 .include <bsd.port.mk>
diff --git a/graphics/gd1/files/patch-ac b/graphics/gd1/files/patch-ac
index e7708da82910..0b29d8069089 100644
--- a/graphics/gd1/files/patch-ac
+++ b/graphics/gd1/files/patch-ac
@@ -1,5 +1,5 @@
---- Makefile.orig	Thu Oct 14 01:20:11 1999
-+++ Makefile	Sat Dec 11 19:01:31 1999
+--- Makefile.orig	Wed Oct 13 16:20:11 1999
++++ Makefile	Mon Dec 27 10:42:48 1999
 @@ -3,35 +3,35 @@
  #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
@@ -65,7 +65,7 @@
  
  #
  #
-@@ -58,8 +58,8 @@
+@@ -58,34 +58,41 @@
  
  VERSION=1.7
  
@@ -76,8 +76,16 @@
  
  PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS)
  
-@@ -69,23 +69,23 @@
- all: libgd.a $(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
@@ -98,6 +106,8 @@
 -	$(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
@@ -117,3 +127,30 @@
  
  gddemo: gddemo.o libgd.a
  	$(CC) gddemo.o -o gddemo	$(LIBDIRS) $(LIBS)
+@@ -120,16 +127,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 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 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}
diff --git a/graphics/gd1/pkg-plist b/graphics/gd1/pkg-plist
index 16438b063528..c9f2fb09760e 100644
--- a/graphics/gd1/pkg-plist
+++ b/graphics/gd1/pkg-plist
@@ -15,4 +15,8 @@ include/gd/gdfontmb.h
 include/gd/gdfonts.h
 include/gd/gdfontt.h
 lib/libgd.a
+lib/libgd.so
+lib/libgd.so.0
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm include/gd