diff options
author | Daniel Sabogal <dsabogalcc@gmail.com> | 2017-02-21 18:08:16 -0500 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2017-02-23 07:25:44 +0000 |
commit | 431936ce663de7637512c1eeeb5be35a12a270a8 (patch) | |
tree | 13fe62fe1cb542c8eed184c672e1217e1e5c39be /main/mdocml/shared-libmandoc.patch | |
parent | 5dd02fb3d9b20ca4399bf01ec0f403618dac1756 (diff) | |
download | aports-431936ce663de7637512c1eeeb5be35a12a270a8.tar.bz2 aports-431936ce663de7637512c1eeeb5be35a12a270a8.tar.xz |
main/mdocml: upgrade to 1.14.1
Diffstat (limited to 'main/mdocml/shared-libmandoc.patch')
-rw-r--r-- | main/mdocml/shared-libmandoc.patch | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/main/mdocml/shared-libmandoc.patch b/main/mdocml/shared-libmandoc.patch index 9f1029f4a2..f01954fc94 100644 --- a/main/mdocml/shared-libmandoc.patch +++ b/main/mdocml/shared-libmandoc.patch @@ -1,6 +1,6 @@ ---- mdocml-1.13.4/Makefile.orig -+++ mdocml-1.13.4/Makefile -@@ -311,9 +311,13 @@ +--- mdocml-1.14.1/Makefile.orig ++++ mdocml-1.14.1/Makefile +@@ -344,9 +344,13 @@ WWW_OBJS = mdocml.tar.gz \ mdocml.sha256 @@ -14,25 +14,30 @@ # === DEPENDENCY HANDLING ============================================== -@@ -340,7 +344,7 @@ +@@ -369,7 +373,7 @@ rm -f Makefile.local config.h config.h.old config.log config.log.old clean: - rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS) + rm -f $(LIBMANDOC) $(LIBMANDOC_OBJS) $(COMPAT_OBJS) - rm -f mandoc $(BASE_OBJS) $(DB_OBJS) + rm -f mandoc $(MAIN_OBJS) rm -f man.cgi $(CGI_OBJS) - rm -f manpage $(MANPAGE_OBJS) -@@ -360,7 +364,7 @@ - $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR) - $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM) - ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN) + rm -f mandocd catman $(MANDOCD_OBJS) +@@ -410,11 +414,11 @@ + $(INSTALL_MAN) makewhatis.8 \ + $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8 + +-lib-install: libmandoc.a ++lib-install: $(LIBMANDOC) + mkdir -p $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(INCLUDEDIR) + mkdir -p $(DESTDIR)$(MANDIR)/man3 - $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) + $(INSTALL_LIB) $(LIBMANDOC) $(DESTDIR)$(LIBDIR) $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \ $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1 -@@ -405,20 +409,20 @@ + $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \ +@@ -487,26 +491,26 @@ @echo "$@ is out of date; please run ./configure" @exit 1 @@ -56,6 +61,16 @@ +man.cgi: $(CGI_OBJS) $(LIBMANDOC) + $(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) $(MANDOCLIB) $(LDADD) +-mandocd: $(MANDOCD_OBJS) libmandoc.a +- $(CC) -o $@ $(LDFLAGS) $(MANDOCD_OBJS) libmandoc.a $(LDADD) ++mandocd: $(MANDOCD_OBJS) $(LIBMANDOC) ++ $(CC) -o $@ $(LDFLAGS) $(MANDOCD_OBJS) $(MANDOCLIB) $(LDADD) + +-catman: catman.o libmandoc.a +- $(CC) -o $@ $(LDFLAGS) catman.o libmandoc.a $(LDADD) ++catman: catman.o $(LIBMANDOC) ++ $(CC) -o $@ $(LDFLAGS) catman.o $(MANDOCLIB) $(LDADD) + -demandoc: $(DEMANDOC_OBJS) libmandoc.a - $(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) libmandoc.a $(LDADD) +demandoc: $(DEMANDOC_OBJS) $(LIBMANDOC) |