diff options
| -rw-r--r-- | GNUmakefile | 17 | ||||
| -rwxr-xr-x | buildtools/installnetpbm.pl | 230 | ||||
| -rw-r--r-- | common.mk | 36 | ||||
| -rw-r--r-- | converter/other/tifftopnm.c | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 17 |
5 files changed, 20 insertions, 282 deletions
diff --git a/GNUmakefile b/GNUmakefile index 4e10e12c..e5789c00 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -276,11 +276,9 @@ install-run: install-nonmerge endif .PHONY: install-merge install-nonmerge -install-merge: install.merge install.lib install.data \ - install.manwebmain install.manweb install.man +install-merge: install.merge install.lib install.data -install-nonmerge: install.bin install.lib install.data \ - install.manwebmain install.manweb install.man +install-nonmerge: install.bin install.lib install.data .PHONY: merge merge: lib/all netpbm @@ -393,17 +391,6 @@ else install.lib: endif -.PHONY: install.manwebmain -install.manwebmain: $(PKGDIR)/$(PKGMANDIR)/web/netpbm.url $(PKGDIR)/bin/doc.url - -$(PKGDIR)/$(PKGMANDIR)/web/netpbm.url: $(PKGDIR)/$(PKGMANDIR)/web - echo "$(NETPBM_DOCURL)" > $@ - chmod $(INSTALL_PERM_MAN) $@ - -$(PKGDIR)/bin/doc.url: $(PKGDIR)/bin - echo "$(NETPBM_DOCURL)" > $@ - chmod $(INSTALL_PERM_MAN) $@ - .PHONY: install-dev # Note that you might install the development package and NOT the runtime # package. If you have a special system for building stuff, maybe for diff --git a/buildtools/installnetpbm.pl b/buildtools/installnetpbm.pl index 61900335..c4a30d17 100755 --- a/buildtools/installnetpbm.pl +++ b/buildtools/installnetpbm.pl @@ -752,228 +752,6 @@ sub installHeader($$$) { -sub getManDir($) { -#----------------------------------------------------------------------------- -# Find out from the user where he wants the pointer man pages -# installed and return that. -#----------------------------------------------------------------------------- - my ($prefix) = @_; - - print("Where do you want the man pages installed?\n"); - - print("\n"); - - my $manDir; - - while (!$manDir) { - my $default = "$prefix/man"; - - my $response = prompt("man page directory", $default); - - if (-d($response)) { - $manDir = $response; - } else { - my $succeeded = mkdir($response, 0777); - - if (!$succeeded) { - print("Unable to create directory '$response'. " . - "Error=$ERRNO\n"); - } else { - $manDir = $response; - } - } - } - print("\n"); - - return $manDir; -} - - - -sub removeObsoleteManPage($) { - - my ($mandir) = @_; - - unlink("$mandir/man1/pgmoil"); - unlink("$mandir/man1/pgmnorm"); - unlink("$mandir/man1/ppmtojpeg"); - unlink("$mandir/man1/bmptoppm"); - unlink("$mandir/man1/ppmtonorm"); - unlink("$mandir/man1/ppmtouil"); - unlink("$mandir/man1/pnmnoraw"); - unlink("$mandir/man1/gemtopbm"); - unlink("$mandir/man1/pnminterp"); -} - - - -sub tryToCreateManwebConf($) { - - my ($manweb_conf_filename) = $@; - - print("You don't have a /etc/manweb.conf, which is the " . - "configuration\n"); - print("file for the 'manweb' program, which is a quick way to " . - "get to Netpbm\n"); - print("documentation. Would you like to create one now?\n"); - - my $done; - - while (!$done) { - my $response = prompt("create /etc/manweb.conf", "Y"); - - if (uc($response) eq "Y") { - my $successful = open(MANWEB_CONF, ">/etc/manweb.conf"); - if (!$successful) { - print("Unable to create file /etc/manweb.conf. " . - "error = $ERRNO\n"); - } else { - print(MANWEB_CONF "#Configuration file for Manweb\n"); - print(MANWEB_CONF "webdir=/usr/man/web\n"); - close(MANWEB_CONF); - $done = $TRUE; - } - } else { - $done = $TRUE; - } - } -} - - - -sub getWebdir($) { - my ($manweb_conf_filename) = @_; -#----------------------------------------------------------------------------- -# Return the value of the Manweb "web directory," as indicated by the -# Manweb configuration file $manweb_conf_filename. -# -# If that file doesn't exist, or doesn't have a 'webdir' value, or -# the 'webdir' value is a chain of directories instead of just one, -# we return an undefined value. -#----------------------------------------------------------------------------- - my $webdir; - - my $success = open(MANWEB_CONF, "<$manweb_conf_filename"); - if (!$success) { - print("Unable to open file '$manweb_conf_filename' for reading. " . - "error is $ERRNO\n"); - } else { - while (<MANWEB_CONF>) { - chomp(); - if (/^\s*#/) { - #It's comment - ignore - } elsif (/^\s*$/) { - #It's a blank line - ignore - } elsif (/\s*(\S+)\s*=\s*(\S+)/) { - #It looks like "keyword=value" - my ($keyword, $value) = ($1, $2); - if ($keyword eq "webdir") { - # We can't handle a multi-directory path; we're looking - # only for a webdir statement naming a sole directory. - if ($value !~ m{:}) { - $webdir = $value; - } - } - } - } - close(MANWEB_CONF); - } - - return $webdir -} - - - -sub userWantsManwebSymlink($$) { - - my ($webdir, $netpbmWebdir) = @_; - - print("Your manweb.conf file says top level documentation " . - "is in $webdir, \n"); - print("but you installed netpbm.url in $netpbmWebdir.\n"); - print("Do you want to create a symlink in $webdir now?\n"); - - my $wants; - my $done; - - while (!$done) { - my $response = prompt("create symlink (Y/N)", "Y"); - - if (uc($response) eq "Y") { - $wants = $TRUE; - $done = $TRUE; - } elsif (uc($response) eq "N") { - $wants = $FALSE; - $done = $TRUE; - } - } - return $wants; -} - - - -sub makeInManwebPath($) { - - my ($netpbmWebdir) = @_; - - # Now we need /etc/manweb.conf to point to the directory in which we - # just installed netpbm.url. - - if (!-f("/etc/manweb.conf")) { - tryToCreateManwebConf("/etc/manweb.conf"); - } - if (-f("/etc/manweb.conf")) { - my $webdir = getWebdir("/etc/manweb.conf"); - if (defined($webdir)) { - if ($webdir ne $netpbmWebdir) { - if (userWantsManwebSymlink($webdir, $netpbmWebdir)) { - my $old = "$netpbmWebdir/netpbm.url"; - my $new = "$webdir/netpbm.url"; - mkdir($webdir, 0777); - my $success = symlink($old, $new); - if (!$success) { - print("Failed to create symbolic link from $new to " . - "$old. Error is $ERRNO\n"); - } - } - } - } - } -} - - - -sub installManPage($$$) { - - -# Note: This installs the pointer man pages and the netpbm.url file for Manweb. - - my ($pkgdir, $prefix, $mandirR) = @_; - - my $manDir = getManDir($prefix); - - print("Installing man pages...\n"); - - my $rc = system("$cpCommand $pkgdir/man/* $manDir/"); - - if ($rc != 0) { - print("copy of man pages from $pkgdir/man to $manDir failed.\n"); - print("cp exit code is $rc\n"); - } else { - print("done.\n"); - } - - print("\n"); - - removeObsoleteManPage($manDir); - - makeInManwebPath("$manDir/web"); - - $$mandirR = $manDir; -} - - - sub netpbmVersion($) { my ($pkgdir) = @_; @@ -1030,9 +808,6 @@ processTemplate($$$) { if (defined($infoR->{INCLUDEDIR})) { s/\@INCLUDEDIR@/$infoR->{INCLUDEDIR}/; } - if (defined($infoR->{MANDIR})) { - s/\@MANDIR@/$infoR->{MANDIR}/; - } push(@output, $_); } } @@ -1203,9 +978,6 @@ print("\n"); installHeader($pkgdir, $prefix, \my $includedir); print("\n"); -installManPage($pkgdir, $prefix, \my $mandir); -print("\n"); - my $templateSubsR = {VERSION => netpbmVersion($pkgdir), BINDIR => $bindir, @@ -1213,7 +985,7 @@ my $templateSubsR = LINKDIR => $linkdir, DATADIR => $datadir, INCLUDEDIR => $includedir, - MANDIR => $mandir}; + }; installConfig($bindir, $templateSubsR); diff --git a/common.mk b/common.mk index dd7f4ed3..82f2adc6 100644 --- a/common.mk +++ b/common.mk @@ -509,36 +509,6 @@ $(DATAFILES:%=%_installdata): $(PKGDIR)/misc $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $< -.PHONY: install.man install.man1 install.man3 install.man5 -install.man: install.man1 install.man3 install.man5 \ - $(SUBDIRS:%=%/install.man) - -MANUALS1 = $(BINARIES) $(SCRIPTS) - -install.man1: $(MANUALS1:%=%_installman1) - -install.man3: $(MANUALS3:%=%_installman3) - -install.man5: $(MANUALS5:%=%_installman5) - -install.manweb: $(MANUALS1:%=%_installmanweb) $(SUBDIRS:%=%/install.manweb) - -%_installman1: $(PKGDIR)/$(PKGMANDIR)/man1 - perl -w $(SRCDIR)/buildtools/makepointerman $(@:%_installman1=%) \ - $(NETPBM_DOCURL) $< 1 $(MANPAGE_FORMAT) $(INSTALL_PERM_MAN) - -%_installman3: $(PKGDIR)/$(PKGMANDIR)/man3 - perl -w $(SRCDIR)/buildtools/makepointerman $(@:%_installman3=%) \ - $(NETPBM_DOCURL) $< 3 $(MANPAGE_FORMAT) $(INSTALL_PERM_MAN) - -%_installman5: $(PKGDIR)/$(PKGMANDIR)/man5 - perl -w $(SRCDIR)/buildtools/makepointerman $(@:%_installman5=%) \ - $(NETPBM_DOCURL) $< 5 $(MANPAGE_FORMAT) $(INSTALL_PERM_MAN) - -%_installmanweb: $(PKGDIR)/$(PKGMANDIR)/web - echo $(NETPBM_DOCURL)$(@:%_installmanweb=%).html \ - >$</$(@:%_installmanweb=%).url - .PHONY: clean ifneq ($(EXE)x,x) @@ -581,12 +551,6 @@ endif %/install.lib: $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) -%/install.man: - $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \ - SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) -%/install.manweb: - $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \ - SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) %/install.data: $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) diff --git a/converter/other/tifftopnm.c b/converter/other/tifftopnm.c index d3d5552a..5c512000 100644 --- a/converter/other/tifftopnm.c +++ b/converter/other/tifftopnm.c @@ -291,7 +291,7 @@ readDirectory(TIFF * const tiffP, Read various values of TIFF tags from the TIFF directory, and default them if not in there and make guesses where values are invalid. Exit program with error message if required tags aren't - there or values are inconsistent or beyond our capabilities. if + there or values are inconsistent or beyond our capabilities. If 'headerdump' is true, issue informational messages about what we find. diff --git a/doc/HISTORY b/doc/HISTORY index ce13f1db..9ec0d648 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -7,13 +7,28 @@ CHANGE HISTORY not yet BJH Release 10.78.00 tifftopnm: Fix memory corruption when image is more pixels - than can be represented as a C unsigned integer. + than can be represented as a C unsigned integer. Broken in + Netpbm 10.11 (October 2002). svgtopam: Fix crash when out of memory. Always broken (svgtopam was new in Netpbm 10.33 (March 2006)). pnmcrop: Add -closeness + Build: don't create pointer man pages anymore. These were + classic man pages, created by 'make package', one for each + program, that just told the user to get the manual from the web + and that other options for manuals are available at install + time. Getting documentation online is commonplace enough now + that the user doesn't need to be told to do it or that there are + other options. The existence of pointer man pages was, + meanwhile, misleading, since it looked from the outside like + they actually contained documentation. + + Build: Don't package or install Manweb setup (for accessing + manuals on the web with Manweb). Probably 100% unused and + distracting. + 16.12.25 BJH Release 10.77.00 pnmpad: Fix bug: incorrect output width. Introduced in |