[Groff-commit] groff/contrib/chem ChangeLog Makefile.sub chem....

[Bernd Warken]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Bernd Warken <bwarken>  06/11/07 23:53:28

Modified files:
        contrib/chem   : ChangeLog Makefile.sub chem.man chem.pl 
Removed files:
        contrib/chem   : pic.tmac 

Log message:
        Update chem-0.2.0

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/chem/ChangeLog?cvsroot=groff&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/chem/Makefile.sub?cvsroot=groff&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/chem/chem.man?cvsroot=groff&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/chem/chem.pl?cvsroot=groff&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/chem/pic.tmac?cvsroot=groff&r1=1.1&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/chem/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ChangeLog   6 Nov 2006 23:33:38 -0000       1.4
+++ ChangeLog   7 Nov 2006 23:53:28 -0000       1.5
@@ -1,8 +1,18 @@
+2006-11-08  Bernd Warken
+       ________________________________________________________________
+        * release of chem 0.2.0
+
+       * pic.tmac: Remove this file.  Use instead the installed pic.tmac
+       in $(tmacdir).
+
+       * Makefile.sub, chem.pl:
+       - Install macros.pic to $(tmacdir)/pic/chem.pic.
+       - Remove parts with `libdir'.
+
 2006-11-07  Werner LEMBERG  <address@hidden>
 
-       * Makefile: Add and fix $(srcdir) where necessary to make
-       it compile with srcdir != builddir.
-       Other minor fixes improvements.
+       * Makefile.sub: Add and fix $(srcdir) where necessary to make it
+       compile with srcdir != builddir.  Other minor fixes improvements.
 
 2006-11-07  Bernd Warken
        ________________________________________________________________

Index: Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/chem/Makefile.sub,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Makefile.sub        6 Nov 2006 23:35:42 -0000       1.3
+++ Makefile.sub        7 Nov 2006 23:53:28 -0000       1.4
@@ -5,7 +5,7 @@
 # Copyright (C) 2006 Free Software Foundation, Inc.
 # Written by Bernd Warken.
 
-# Last update: 26 Oct 2006
+# Last update: 8 Nov 2006
 
 # This file is part of `chem' which is part of `groff'.
 
@@ -32,8 +32,6 @@
 # not all make programs have $(RM) predefined.
 RM=rm -f
 
-chem_libdir=$(libdir)/groff/chem
-
 all: README examples/README chem $(MAN1)
 
 README: $(srcdir)/README.txt
@@ -47,7 +45,8 @@
        sed -f "$(SH_DEPS_SED_SCRIPT)" \
          -e "s|@g@|$(g)|g" \
          -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
-         -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
+         -e "s|@tmacdir@|$(DESTDIR)$(tmacdir)|g" \
+         -e "s|@picdir@|$(DESTDIR)$(datasubdir)/pic|g" \
          -e "s|@VERSION@|$(version)$(revision)|g" \
          -e "$(SH_SCRIPT_SED_CMD)" \
          $(srcdir)/chem.pl >$@
@@ -55,19 +54,16 @@
 
 install_data: chem \
               README examples/README \
-              $(srcdir)/macros.pic $(srcdir)/pic.tmac \
+              $(srcdir)/macros.pic \
               $(srcdir)/examples/*.chem $(srcdir)/examples/122/*
        -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
        $(RM) $(DESTDIR)$(bindir)/$(g)chem
        $(INSTALL_SCRIPT) chem $(DESTDIR)$(bindir)/$(g)chem
-       -test -d $(DESTDIR)$(chem_libdir) \
-          || $(mkinstalldirs) $(DESTDIR)$(chem_libdir)
-       $(RM) $(DESTDIR)$(chem_libdir)/macros.pic
+       -test -d $(DESTDIR)$(datasubdir)/pic \
+          || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/pic
+       $(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic
        $(INSTALL_DATA) $(srcdir)/macros.pic \
-          $(DESTDIR)$(chem_libdir)/macros.pic
-       $(RM) $(DESTDIR)$(chem_libdir)/pic.tmac
-       $(INSTALL_DATA) $(srcdir)/pic.tmac \
-          $(DESTDIR)$(chem_libdir)/pic.tmac
+          $(DESTDIR)$(datasubdir)/pic/chem.pic
        -test -d $(DESTDIR)$(exampledir)/chem \
           || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
        -test -d $(DESTDIR)$(exampledir)/chem/122 \
@@ -87,8 +83,8 @@
 
 uninstall_sub:
        $(RM) $(DESTDIR)$(bindir)/chem
-       $(RM) $(DESTDIR)$(libdir)/groff/chem/macros.pic
-       -rmdir $(DESTDIR)$(libdir)/groff/chem
+       $(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic
+       -rmdir $(DESTDIR)$(datasubdir)/pic
        $(RM) $(DESTDIR)$(exampledir)/chem/122/*
        -rmdir $(DESTDIR)$(exampledir)/chem/122
        $(RM) $(DESTDIR)$(exampledir)/chem/*

Index: chem.man
===================================================================
RCS file: /cvsroot/groff/groff/contrib/chem/chem.man,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- chem.man    6 Nov 2006 23:17:25 -0000       1.2
+++ chem.man    7 Nov 2006 23:53:28 -0000       1.3
@@ -17,7 +17,7 @@
 Source file position:  <groff_source_top>/contrib/chem/chem.man
 Installed position:    $prefix/share/man/man1/@address@hidden
 
-Last update: 2 Nov 2006
+Last update: 7 Nov 2006
 ..
 .de author
 This file was written by
@@ -200,13 +200,17 @@
 .  nop \)\\$*\)
 .  hy
 ..
+.
+.\" End of macro definitions
+.
+.
 .\" --------------------------------------------------------------------
 .\" SH "SYNOPSIS"
 .\" --------------------------------------------------------------------
 .
 .ad l
 .Synopsis @address@hidden
-.RI [ option... ]
+.RI [ option\*[Ellipsis]] ]
 [\f[CB]\-\-\fP]
 .RI [ "\%filespec" "\*[Ellipsis]]"
 ./Synopsis

Index: chem.pl
===================================================================
RCS file: /cvsroot/groff/groff/contrib/chem/chem.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- chem.pl     6 Nov 2006 23:17:25 -0000       1.3
+++ chem.pl     7 Nov 2006 23:53:28 -0000       1.4
@@ -30,8 +30,8 @@
 # settings
 ########################################################################
 
-my $Program_Version = '0.1.2';
-my $Last_Update = '7 Nov 2006';
+my $Program_Version = '0.2.0';
+my $Last_Update = '8 Nov 2006';
 
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it.
@@ -69,27 +69,24 @@
     }
 
     my %at_at;
-    my $chem_libdir;
 
     if ($before_make) {
       my $chem_dir = $FindBin::Bin;
       $at_at{'BINDIR'} = $chem_dir;
       $at_at{'G'} = '';
-      $at_at{'LIBDIR'} = '';
-      $chem_libdir = $chem_dir;
       $File_macros_pic = File::Spec->catfile($chem_dir, 'macros.pic');
-      $File_pic_tmac = File::Spec->catfile($chem_dir, 'pic.tmac');
+      $File_pic_tmac = File::Spec->catfile($chem_dir, '..', 'pic.tmac');
       $Groff_Version = '';
       $Chem_Name = 'chem';
     } else {
       $Groff_Version = '@VERSION@';
       $at_at{'BINDIR'} = '@BINDIR@';
       $at_at{'G'} = '@g@';
-      $at_at{'LIBDIR'} = '@libdir@';
-      $chem_libdir =
-       File::Spec->catdir($at_at{'LIBDIR'}, 'groff', 'chem');
-      $File_macros_pic = File::Spec->catfile($chem_libdir, 'macros.pic');
-      $File_pic_tmac = File::Spec->catfile($chem_libdir, 'pic.tmac');
+      $at_at{'PICDIR'} = '@picdir@';
+      $at_at{'TMACDIR'} = '@tmacdir@';
+      $File_macros_pic =
+       File::Spec->catfile($at_at{'PICDIR'}, 'chem.pic');
+      $File_pic_tmac = File::Spec->catfile($at_at{'TMACDIR'}, 'pic.tmac');
       $Chem_Name = $at_at{'G'} . 'chem';
     }
   }

Index: pic.tmac
===================================================================
RCS file: pic.tmac
diff -N pic.tmac
--- pic.tmac    26 Oct 2006 22:13:49 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-.\" pic.tmac
-.\"
-.de PS
-.br
-.sp .3v
-.ne 0\\$1+1v+\n(.Vu
-.in \\n(.lu-\\n(.iu-0\\$2/2u>?0
-..
-.de PE
-.in
-.sp .3v+.5m
-..