diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2000-05-21 08:41:19 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2000-05-21 08:41:19 +0000 |
| commit | 1d2f1407863bb537a8b903809686de515972a863 (patch) | |
| tree | a1809169e30ff7f7f117f8a91e93dde34d83891f /graphics/netpbm/files/patch-bd | |
| parent | e8d67e876a04c7f54dcfe46534699c614d5c8a6d (diff) | |
Update to version 9.2.
PR: ports/18676
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to 'graphics/netpbm/files/patch-bd')
| -rw-r--r-- | graphics/netpbm/files/patch-bd | 70 |
1 files changed, 39 insertions, 31 deletions
diff --git a/graphics/netpbm/files/patch-bd b/graphics/netpbm/files/patch-bd index 01f3242bb105..cf765b65d9ec 100644 --- a/graphics/netpbm/files/patch-bd +++ b/graphics/netpbm/files/patch-bd @@ -1,20 +1,22 @@ ---- pbm/Makefile.orig Sat May 6 16:16:53 2000 -+++ pbm/Makefile Mon May 8 00:00:00 2000 -@@ -9,11 +9,12 @@ +--- pbm/Makefile.orig Tue May 16 10:01:33 2000 ++++ pbm/Makefile Sat May 20 00:00:00 2000 +@@ -4,13 +4,12 @@ + include $(SRCDIR)/Makefile.config + + +-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/shhopt ++INCLUDE = -I$(SRCDIR) + # Shared library naming LIBROOT = pbm LIBPBM = lib$(LIBROOT).$(NETPBMLIBSUFFIX) -MAJ = 9 -+MAJ = 1 - MIN = 1 +-MIN = 2 ++SOVER = 1 LIBLIBS = NETPBMLIBS = $(LIBPBM) -+NETPBMLD = -L. -lpbm - - PORTBINARIES = atktopbm brushtopbm cmuwmtopbm g3topbm \ - icontopbm macptopbm mdatopbm mgrtopbm \ -@@ -36,8 +37,7 @@ +@@ -37,8 +36,7 @@ # Library objects to be built and linked by Makefile.common: LIBOBJECTS = libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o @@ -24,38 +26,44 @@ MANUALS1 = $(BINARIES) MANUALS3 = libpbm -@@ -45,7 +45,7 @@ - - MERGENAME = pbmmerge - --INTERFACE_HEADERS = pbm.h -+INTERFACE_HEADERS = pbm.h $(SRCDIR)/pbmplus.h +@@ -50,26 +48,21 @@ .PHONY: all all: $(BINARIES) -@@ -55,11 +55,11 @@ - - # Rules for plain programs. - $(PORTBINARIES): %: %.o $(NETPBMLIBS) -- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG) -+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG) +- $(MAKE) -C pbmtoppa all - # Rule for math-dependent programs. - $(MATHBINARIES): %: %.o $(NETPBMLIBS) -- $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG) -+ $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG) + .PHONY: merge + merge: $(MERGENAME) +- $(MAKE) -C pbmtoppa all .PHONY: install.bin install.bin: install.bin.common -@@ -72,11 +72,6 @@ - # Don't use $(SRCDIR) in the target below because Makefile.dep doesn't ! +- $(MAKE) -C pbmtoppa install.bin + + .PHONY: install.merge + install.merge: install.merge.common +- $(MAKE) -C pbmtoppa install.bin + + .PHONY: install.lib + install.lib: install.lib.common + + .PHONY: install.man + install.man: install.man.common +- $(MAKE) -C pbmtoppa install.man + + include $(SRCDIR)/Makefile.common + +@@ -77,13 +70,7 @@ ../compile.h: $(MAKE) -C $(SRCDIR) compile.h -- + -$(SRCDIR)/shhopt/shhopt.o: - cd ../shhopt; $(MAKE) shhopt.o -$(SRCDIR)/shhopt/libshhopt.a: - cd ../shhopt; $(MAKE) libshhopt.a - +- .PHONY: clean - clean: + clean: clean.common +- $(MAKE) -C pbmtoppa clean + + FORCE: |