From 0968e6bccd086664ce17606f78282b01f9493f55 Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Tue, 6 Jun 2000 17:39:06 +0000 Subject: [PATCH] Change library number to gd.1 per porter's handbook. PR: 19060 Submitted by: Mario Sergio Fujikawa Ferreira --- graphics/gd/files/patch-ac | 12 ++++++------ graphics/gd/pkg-plist | 6 +++--- graphics/gd1/files/patch-ac | 12 ++++++------ graphics/gd1/pkg-plist | 6 +++--- graphics/gd2/files/patch-ac | 12 ++++++------ graphics/gd2/pkg-plist | 6 +++--- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/graphics/gd/files/patch-ac b/graphics/gd/files/patch-ac index 824f82b59254..4dc61441a545 100644 --- a/graphics/gd/files/patch-ac +++ b/graphics/gd/files/patch-ac @@ -81,7 +81,7 @@ +.c.so: + ${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + -+all: libgd.a libgd.so.0 $(PROGRAMS) ++all: libgd.a libgd.so.1 $(PROGRAMS) install: libgd.a $(BIN_PROGRAMS) - sh ./install-item 644 libgd.a $(INSTALL_LIB)/libgd.a @@ -103,8 +103,8 @@ - sh ./install-item 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h + $(INSTALL) -c -m 644 libgd.a $(INSTALL_LIB)/libgd.a + $(INSTALL) -c -m 755 pngtogd $(INSTALL_BIN)/pngtogd -+ $(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 libgd.so.1 $(INSTALL_LIB)/libgd.so.1 ++ ln -sf libgd.so.1 $(INSTALL_LIB)/libgd.so + $(INSTALL) -c -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 + $(INSTALL) -c -m 755 gdtopng $(INSTALL_BIN)/gdtopng + $(INSTALL) -c -m 755 gd2topng $(INSTALL_BIN)/gd2topng @@ -140,7 +140,7 @@ + $(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 ++libgd.so.1: $(INCS) $(OBJS:.o=.so) ++ $(CC) -shared -Wl,-x -Wl,-assert -Wl,pure-text -Wl,-soname,$@ -o $@ $(OBJS:.o=.so) $(LIBDIRS) $(LIBS) ++ ln -sf libgd.so.1 libgd.so diff --git a/graphics/gd/pkg-plist b/graphics/gd/pkg-plist index c9f2fb09760e..2f698a654f5f 100644 --- a/graphics/gd/pkg-plist +++ b/graphics/gd/pkg-plist @@ -16,7 +16,7 @@ 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 +lib/libgd.so.1 @dirrm include/gd +@exec /sbin/ldconfig -m %B +@unexec /sbin/ldconfig -R diff --git a/graphics/gd1/files/patch-ac b/graphics/gd1/files/patch-ac index 824f82b59254..4dc61441a545 100644 --- a/graphics/gd1/files/patch-ac +++ b/graphics/gd1/files/patch-ac @@ -81,7 +81,7 @@ +.c.so: + ${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + -+all: libgd.a libgd.so.0 $(PROGRAMS) ++all: libgd.a libgd.so.1 $(PROGRAMS) install: libgd.a $(BIN_PROGRAMS) - sh ./install-item 644 libgd.a $(INSTALL_LIB)/libgd.a @@ -103,8 +103,8 @@ - sh ./install-item 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h + $(INSTALL) -c -m 644 libgd.a $(INSTALL_LIB)/libgd.a + $(INSTALL) -c -m 755 pngtogd $(INSTALL_BIN)/pngtogd -+ $(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 libgd.so.1 $(INSTALL_LIB)/libgd.so.1 ++ ln -sf libgd.so.1 $(INSTALL_LIB)/libgd.so + $(INSTALL) -c -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 + $(INSTALL) -c -m 755 gdtopng $(INSTALL_BIN)/gdtopng + $(INSTALL) -c -m 755 gd2topng $(INSTALL_BIN)/gd2topng @@ -140,7 +140,7 @@ + $(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 ++libgd.so.1: $(INCS) $(OBJS:.o=.so) ++ $(CC) -shared -Wl,-x -Wl,-assert -Wl,pure-text -Wl,-soname,$@ -o $@ $(OBJS:.o=.so) $(LIBDIRS) $(LIBS) ++ ln -sf libgd.so.1 libgd.so diff --git a/graphics/gd1/pkg-plist b/graphics/gd1/pkg-plist index c9f2fb09760e..2f698a654f5f 100644 --- a/graphics/gd1/pkg-plist +++ b/graphics/gd1/pkg-plist @@ -16,7 +16,7 @@ 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 +lib/libgd.so.1 @dirrm include/gd +@exec /sbin/ldconfig -m %B +@unexec /sbin/ldconfig -R diff --git a/graphics/gd2/files/patch-ac b/graphics/gd2/files/patch-ac index 824f82b59254..4dc61441a545 100644 --- a/graphics/gd2/files/patch-ac +++ b/graphics/gd2/files/patch-ac @@ -81,7 +81,7 @@ +.c.so: + ${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + -+all: libgd.a libgd.so.0 $(PROGRAMS) ++all: libgd.a libgd.so.1 $(PROGRAMS) install: libgd.a $(BIN_PROGRAMS) - sh ./install-item 644 libgd.a $(INSTALL_LIB)/libgd.a @@ -103,8 +103,8 @@ - sh ./install-item 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h + $(INSTALL) -c -m 644 libgd.a $(INSTALL_LIB)/libgd.a + $(INSTALL) -c -m 755 pngtogd $(INSTALL_BIN)/pngtogd -+ $(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 libgd.so.1 $(INSTALL_LIB)/libgd.so.1 ++ ln -sf libgd.so.1 $(INSTALL_LIB)/libgd.so + $(INSTALL) -c -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 + $(INSTALL) -c -m 755 gdtopng $(INSTALL_BIN)/gdtopng + $(INSTALL) -c -m 755 gd2topng $(INSTALL_BIN)/gd2topng @@ -140,7 +140,7 @@ + $(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 ++libgd.so.1: $(INCS) $(OBJS:.o=.so) ++ $(CC) -shared -Wl,-x -Wl,-assert -Wl,pure-text -Wl,-soname,$@ -o $@ $(OBJS:.o=.so) $(LIBDIRS) $(LIBS) ++ ln -sf libgd.so.1 libgd.so diff --git a/graphics/gd2/pkg-plist b/graphics/gd2/pkg-plist index c9f2fb09760e..2f698a654f5f 100644 --- a/graphics/gd2/pkg-plist +++ b/graphics/gd2/pkg-plist @@ -16,7 +16,7 @@ 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 +lib/libgd.so.1 @dirrm include/gd +@exec /sbin/ldconfig -m %B +@unexec /sbin/ldconfig -R