source@mandoc.bsd.lv
 help / color / mirror / Atom feed
* mdocml: Add INSTALL, and remove WWW gunk from the Makefile, we are not
@ 2014-08-14 20:43 schwarze
  0 siblings, 0 replies; only message in thread
From: schwarze @ 2014-08-14 20:43 UTC (permalink / raw)
  To: source

Log Message:
-----------
Add INSTALL, and remove WWW gunk from the Makefile, we are not
going to rebuild the website from this version.

Tags:
----
VERSION_1_12

Modified Files:
--------------
    mdocml:
        INSTALL
        Makefile

Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.395.2.28
retrieving revision 1.395.2.29
diff -LMakefile -LMakefile -u -p -r1.395.2.28 -r1.395.2.29
--- Makefile
+++ Makefile
@@ -73,9 +73,6 @@ BUILD_TARGETS	+= db-build
 #
 #CFLAGS		+= -DUSE_MANPATH
 
-WWWPREFIX	 = /var/www
-HTDOCDIR	 = $(WWWPREFIX)/htdocs
-
 # === END OF USER SETTINGS =============================================
 
 INSTALL_TARGETS	 = $(BUILD_TARGETS:-build=-install)
@@ -150,7 +147,8 @@ SRCS		 = apropos.c \
 		   vol.c \
 		   $(TESTSRCS)
 
-DISTFILES	 = LICENSE \
+DISTFILES	 = INSTALL \
+		   LICENSE \
 		   Makefile \
 		   Makefile.depend \
 		   NEWS \
@@ -275,30 +273,6 @@ APROPOS_OBJS	 = apropos.o apropos_db.o m
 
 DEMANDOC_OBJS	 = demandoc.o
 
-WWW_MANS	 = apropos.1.html \
-		   demandoc.1.html \
-		   mandoc.1.html \
-		   preconv.1.html \
-		   whatis.1.html \
-		   mandoc.3.html \
-		   mandoc_escape.3.html \
-		   mandoc_html.3.html \
-		   mandoc_malloc.3.html \
-		   mchars_alloc.3.html \
-		   tbl.3.html \
-		   eqn.7.html \
-		   man.7.html \
-		   mandoc_char.7.html \
-		   mdoc.7.html \
-		   roff.7.html \
-		   tbl.7.html \
-		   mandocdb.8.html \
-		   man.h.html \
-		   mandoc.h.html \
-		   mandoc_aux.h.html \
-		   manpath.h.html \
-		   mdoc.h.html
-
 WWW_OBJS	 = mdocml.tar.gz \
 		   mdocml.sha256
 
@@ -312,7 +286,7 @@ db-build: $(DBBIN)
 
 install: base-install $(INSTALL_TARGETS)
 
-www: $(WWW_OBJS) $(WWW_MANS)
+www: $(WWW_OBJS)
 
 include Makefile.depend
 
@@ -326,7 +300,7 @@ clean:
 	rm -f demandoc $(DEMANDOC_OBJS)
 	rm -f mandoc $(MANDOC_OBJS)
 	rm -f config.h config.log $(COMPAT_OBJS)
-	rm -f $(WWW_MANS) $(WWW_OBJS)
+	rm -f $(WWW_OBJS)
 	rm -rf *.dSYM
 
 base-install: base-build
@@ -357,15 +331,6 @@ db-install: db-build
 	$(INSTALL_MAN) apropos.1 whatis.1 $(DESTDIR)$(MANDIR)/man1
 	$(INSTALL_MAN) mandocdb.8 $(DESTDIR)$(MANDIR)/man8
 
-www-install: www
-	mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
-	$(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
-	$(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
-	$(INSTALL_DATA) mdocml.tar.gz \
-		$(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
-	$(INSTALL_DATA) mdocml.sha256 \
-		$(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
-
 depend: config.h
 	mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
 	perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
@@ -404,14 +369,5 @@ config.h: configure config.h.pre config.
 	rm -f config.log
 	CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
 
-.PHONY: 	 base-install db-install install www-install
+.PHONY: 	 base-install db-install install
 .PHONY: 	 clean depend
-.SUFFIXES:	 .1       .3       .5       .7       .8       .h
-.SUFFIXES:	 .1.html  .3.html  .5.html  .7.html  .8.html  .h.html
-
-.h.h.html:
-	highlight -I $< > $@
-
-.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
-	./mandoc -Thtml -Wall,stop \
-		-Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@
Index: INSTALL
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/INSTALL,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -LINSTALL -LINSTALL -u -p -r1.3 -r1.3.2.1
--- INSTALL
+++ INSTALL
@@ -34,8 +34,17 @@ latest bundled and ported versions of ma
 systems is maintained at <http://mdocml.bsd.lv/ports.html>.
 
 If mandoc is installed, you can check the version by running "mandoc -V".
-The version contained in this distribution tarball is listed near
-the beginning of the file "Makefile".
+
+The version contained in this distribution tarball is 1.12.4.
+This is not the newest version available, you can also get 1.13.1.
+Installing 1.12.4 only makes sense if all of the following conditions
+hold for you:
+
+ - You need apropos(1) and makewhatis(8) functionality.
+ - You do not need the man.cgi(8) web frontend.
+ - You do have the Berkeley database library, version 1.85.
+ - You lack at least one of the following: the SQLite3 database
+   library and/or the fts(3) file hierarchy traversal functions.
 
 Regarding how packages and ports are maintained for your operating
 system, please consult your operating system documentation.
@@ -44,56 +53,32 @@ To install mandoc manually, the followin
 1. Decide whether you want to build the base tools mandoc(1),
 preconv(1) and demandoc(1) only or whether you also want to build the
 database tools apropos(1) and makewhatis(8).  For the latter,
-the following dependencies are required:
-
-1.1. The SQLite database system, see <http://sqlite.org/>.
-The recommended version of SQLite is 3.8.4.3 or newer.  The mandoc
-toolset is known to work with version 3.7.5 or newer.  Versions
-older than 3.8.3 may not achieve full performance due to the
-missing SQLITE_DETERMINISTIC optimization flag.  Versions older
-than 3.8.0 may not show full error information if opening a database
-fails due to the missing sqlite3_errstr() API.  Both are very minor
-problems, apropos(1) is fully usable with SQLite 3.7.5.  Versions
-older than 3.7.5 may or may not work, they have not been tested.
-
-1.2. The fts(3) directory traversion functions.
-If your system does not have them, the bundled compatibility version
-will be used, so you need not worry in that case.  But be careful: the
-glibc version of fts(3) is known to be broken on 32bit platforms,
-see <https://sourceware.org/bugzilla/show_bug.cgi?id=15838>.
-
-1.3. Marc Espie's ohash(3) library.
-If your system does not have it, the bundled compatibility version
-will be used, so you probably need not worry about it.
+the Berkeley database system, version 1.85, is required.
+It is installed by default on BSD systems and available as an
+optional software package on other systems.
 
-2. If you choose to build the database tools, too, decide whether
-you also want to build the CGI program, man.cgi(8).
-
-3. Read the beginning of the file "Makefile" from "USER SETTINGS"
+2. Read the beginning of the file "Makefile" from "USER SETTINGS"
 to "END OF USER SETTINGS" and edit it as required.  In particular,
 disable "BUILD_TARGETS += db-build" if you do not want database
-support or enable "BUILD_TARGETS += cgi-build" if you do want
-the CGI program.
+support.
 
-4. Run "make".  No separate "./configure" or "make depend" steps
+3. Run "make".  No separate "./configure" or "make depend" steps
 are needed.  The former is run automatically by "make".  The latter
 is a maintainer target.  If you merely want to build the released
 version as opposed to doing active development, there is no need
 to regenerate the dependency specifications.  Any POSIX-compatible
 make, in particular both BSD make and GNU make, should work.
 
-5. Run "make -n install" and check whether everything will be
+4. Run "make -n install" and check whether everything will be
 installed to the intended places.  Otherwise, edit the *DIR variables
 in the Makefile until it is.
 
-6. Run "sudo make install".  If you intend to build a binary
+5. Run "sudo make install".  If you intend to build a binary
 package using some kind of fake root mechanism, you may need a
 command like "make DESTDIR=... install".  Read the *-install targets
 in the "Makefile" to understand how DESTDIR is used.
 
-7. To set up a man.cgi(8) server, read its manual page.
-
-8. To use mandoc(1) as your man(1) formatter, read the "Deployment"
+6. To use mandoc(1) as your man(1) formatter, read the "Deployment"
 section below.
 
 
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-08-14 20:43 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-14 20:43 mdocml: Add INSTALL, and remove WWW gunk from the Makefile, we are not schwarze

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).