freebsd-ports/graphics/netpbm/files/patch-bb

--- Makefile.common.orig	Tue May 16 10:14:14 2000
+++ Makefile.common	Sat May 20 00:00:00 2000
@@ -97,24 +97,20 @@
 # BUILDING NETPBM LIBRARIES
 
 $(LIBOBJECTS): %.o: %.c
+	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
+
+$(LIBSOBJECTS): %.so: %.c
 	$(CC) -c $(CFLAGS) $(CFLAGS_SHLIB) $(INCLUDE) -o $@ $<
 
-SONAME = lib$(LIBROOT).so.$(MAJ)
+SONAME = lib$(LIBROOT).so.$(SOVER)
 
 # The libxxx.so link is needed to link the executables.
-lib$(LIBROOT).so: $(SONAME)
-	rm -f $@
-	ln -s $< $@
-# The $(SONAME) link is only needed to test the programs without
-# installing the libraries (in that case, you also need to direct the 
-# dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
-$(SONAME): lib$(LIBROOT).so.$(MAJ).$(MIN)
+lib$(LIBROOT).so: $(SONAME) lib$(LIBROOT).a
 	rm -f $@
-	ln -s $< $@
-lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) \
-                                $(LIBOPT)
-	$(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
-          `$(LIBOPT) $(LIBLIBS)` -lc
+	ln -sf $< $@
+$(SONAME): $(LIBSOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT)
+	$(LD) $(LDSHLIB) -o $@ $(LIBSOBJECTS) $(LIBOBJECTS_X) \
+          `$(LIBOPT) $(LIBLIBS)`
 
 # Static library.  Unused by default, but with a small change to make files...
 lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)
@@ -129,15 +125,14 @@
 install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
 	cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
 ifneq ($(MERGENAME)x,x)
-	$(INSTALL) -s -m$(INSTALL_PERM_BIN) $(MERGENAME) $(INSTALLBINARIES)
+	${BSD_INSTALL_PROGRAM} $(MERGENAME) $(INSTALLBINARIES)
 	cd $(INSTALLBINARIES) ; \
 	   for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
-             do ln -s $(MERGENAME)$(EXE) $$i ; \
+             do ln -sf $(MERGENAME)$(EXE) $$i ; \
              done
 endif
 ifneq ($(NOMERGEBINARIES)x,x)
-	$(INSTALL) -s -m$(INSTALL_PERM_BIN) \
-	  $(NOMERGEBINARIES) $(INSTALLBINARIES)
+	${BSD_INSTALL_PROGRAM} $(NOMERGEBINARIES) $(INSTALLBINARIES)
 endif
 
 # INSTALLING
@@ -146,12 +141,12 @@
 install.bin.common: $(BINARIES) install.script
 # Note that on Cygwin, the executables are actually pbmmake.exe, etc.
 # Make and Install know that pbmmake.exe counts as pbmmake.
-	$(INSTALL) -s -m$(INSTALL_PERM_BIN) $(BINARIES) $(INSTALLBINARIES)
+	${BSD_INSTALL_PROGRAM} $(BINARIES) $(INSTALLBINARIES)
 
 .PHONY: install.script
 install.script: $(SCRIPTS)
 ifneq ($(SCRIPTS)x,x)
-	$(INSTALL) -m$(INSTALL_PERM_BIN) $(SCRIPTS) $(INSTALLSCRIPTS)
+	${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(INSTALLSCRIPTS)
 endif
 
 .PHONY: install.man.common
@@ -181,8 +176,7 @@
 # compile programs that use the Netpbm libraries.  Alternatively, you may
 # prefer not to "install" them, but just to access the Netpbm source
 # directory when you compile your programs.
-	$(INSTALL) -m$(INSTALL_PERM_HDR) \
-	  $(INTERFACE_HEADERS) $(INSTALLHDRS)
+	${BSD_INSTALL_DATA} $(INTERFACE_HEADERS) $(INSTALLHDRS)
 
 # Install a static library 
 #
@@ -192,16 +186,15 @@
 # library, the dependency here will do that.
 .PHONY: install.staticlib
 install.staticlib: lib$(LIBROOT).a
-	$(INSTALL) -m$(INSTALL_PERM_LIBS) $< $(INSTALLLIBS)/$<
+	${BSD_INSTALL_DATA} $< $(INSTALLLIBS)
 
 .PHONY: install.lib.common
 ifeq ($(NETPBMLIBSUFFIX),so)
 # install a shared library
-install.lib.common: lib$(LIBROOT).so.$(MAJ).$(MIN) 
-	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.$(MAJ).*
-	$(INSTALL) -m$(INSTALL_PERM_LIBD) $< $(INSTALLLIBS)
-	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so; ln -s $< lib$(LIBROOT).so
-	cd $(INSTALLLIBS) ; rm -f $(SONAME); ln -s $< $(SONAME)
+install.lib.common: $(SONAME)
+	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.*
+	${BSD_INSTALL_DATA} $< $(INSTALLLIBS)
+	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so; ln -sf $< lib$(LIBROOT).so
 endif
 
 .PHONY: clean.common