OSSP CVS Repository

ossp - Check-in [692]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 692
Date: 2001-Aug-20 12:33:22 (local)
2001-Aug-20 10:33:22 (UTC)
User:rse
Branch:
Comment: Autoconf phase 2
Tickets:
Inspections:
Files:
ossp-pkg/lmtp2nntp/.cvsignore      1.3 -> 1.4     2 inserted, 1 deleted
ossp-pkg/lmtp2nntp/Makefile.in      1.1 -> 1.2     40 inserted, 3 deleted
ossp-pkg/lmtp2nntp/autogen.sh      1.1 -> 1.2     2 inserted, 2 deleted
ossp-pkg/lmtp2nntp/configure.ac      1.1 -> 1.2     5 inserted, 0 deleted
ossp-pkg/lmtp2nntp/lmtp2nntp.c      1.18 -> 1.19     8 inserted, 1 deleted
ossp-pkg/lmtp2nntp/test/run.sh      1.6 -> 1.7     2 inserted, 2 deleted
ossp-pkg/lmtp2nntp/version.c      added-> 1.1

ossp-pkg/lmtp2nntp/.cvsignore 1.3 -> 1.4

--- .cvsignore   2001/08/20 10:02:44     1.3
+++ .cvsignore   2001/08/20 10:33:22     1.4
@@ -1,6 +1,7 @@
-lmtp2nntp
 research
 Makefile
 configure
 config.status
 config.log
+lmtp2nntp
+lmtp2nntp.1


ossp-pkg/lmtp2nntp/Makefile.in 1.1 -> 1.2

--- Makefile.in  2001/08/20 10:02:44     1.1
+++ Makefile.in  2001/08/20 10:33:22     1.2
@@ -3,17 +3,28 @@
 
 ROOT    = /cw
 
+DESTDIR     =
+prefix      = @prefix@
+exec_prefix = @exec_prefix@
+bindir      = @bindir@
+libdir      = @libdir@
+includedir  = @includedir@
+mandir      = @mandir@
+
 CC      = @CC@
 CFLAGS  = @CFLAGS@ $(WFLAGS) `$(ROOT)/bin/str-config --cflags`
 WFLAGS  = -pedantic-errors -Wall -Wshadow -Wpointer-arith -Wcast-align -Winline -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wno-long-long
 LDFLAGS = @LDFLAGS@ `$(ROOT)/bin/str-config --ldflags`
 LIBS    = @LIBS@ `$(ROOT)/bin/str-config --libs`
 
+SHTOOL  = ./shtool
+POD2MAN = pod2man
+
 PROG = lmtp2nntp
 HDRS = lmtp.h nntp.h sa.h argz.h shpat_match.h msg.h trace.h
-OBJS = lmtp2nntp.o lmtp.o nntp.o sa.o argz.o shpat_match.o msg.o trace.o
+OBJS = lmtp2nntp.o lmtp.o nntp.o sa.o argz.o shpat_match.o msg.o trace.o version.o
 
-all: lmtp2nntp
+all: lmtp2nntp lmtp2nntp.1
 
 .c.o:
         $(CC) $(CFLAGS) -c $<
@@ -21,13 +32,39 @@
 $(PROG): Makefile $(OBJS) $(HDRS)
         $(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
 
+lmtp2nntp.1: lmtp2nntp.pod
+        VS=`$(SHTOOL) version -lc -dshort version.c`; \
+        VL=`$(SHTOOL) version -lc -dlong version.c`; \
+        $(POD2MAN) --section=1 --center="Mail to News Gateway" \
+               --release="$$VS" --date="$$VL" \
+               lmtp2nntp.pod >lmtp2nntp.1 
+
+install: all
+        $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+        $(SHTOOL) install -c -s -m 755 lmtp2nntp $(DESTDIR)$(bindir)/
+        $(SHTOOL) install -c -m 644 lmtp2nntp.1 $(DESTDIR)$(mandir)/man1/
+
 clean:
         -rm -f *.core
         -rm -f $(PROG)
         -rm -f $(OBJS)
+        -rm -f lmtp2nntp.1
 
 distclean: clean
-        -rm -f configure Makefile
+        -rm -f Makefile
+
+realclean: distclean
+        -rm -f configure
+        -rm -f shtool
+
+new-version:
+        $(SHTOOL) version -lc -n lmtp2nntp -p lmtp2nntp_ -e version.c
+
+dist: distclean
+        @$(SHTOOL) fixperm -v .; \
+        V=`$(SHTOOL) version -lc -dshort version.c`; \
+        $(SHTOOL) tarball -o lmtp2nntp-$${V}.tar.gz -d lmtp2nntp-$${V} -u ossp -g ossp \
+                          -e 'CVS,\.cvsignore,\.[ao],^\.,autogen.sh' -c 'gzip --best' .
 
 test: lmtp2nntp
         ./run.sh


ossp-pkg/lmtp2nntp/autogen.sh 1.1 -> 1.2

--- autogen.sh   2001/08/20 10:02:44     1.1
+++ autogen.sh   2001/08/20 10:33:22     1.2
@@ -38,6 +38,6 @@
 #autoheader
 
 #   GNU Shtool generation
-# echo "GNU Shtool $shtoolize_version -> shtool"
-# shtoolize -q all
+echo "GNU Shtool $shtoolize_version -> shtool"
+shtoolize -q all
 


ossp-pkg/lmtp2nntp/configure.ac 1.1 -> 1.2

--- configure.ac 2001/08/20 10:02:44     1.1
+++ configure.ac 2001/08/20 10:33:22     1.2
@@ -7,6 +7,11 @@
 AC_REVISION(1.0)
 AC_INIT(lmtp2nntp.c)
 
+AC_DIVERT_PUSH(NOTICE)
+V=`./shtool version -lc -dlong version.c`
+./shtool echo -e "Configuring %BOSSP lmtp2nntp%b, Version %B${V}%b"
+AC_DIVERT_POP()
+
 dnl #   feature tests
 AC_SET_MAKE
 AC_PROG_CC


ossp-pkg/lmtp2nntp/lmtp2nntp.c 1.18 -> 1.19

--- lmtp2nntp.c  2001/08/16 15:00:50     1.18
+++ lmtp2nntp.c  2001/08/20 10:33:22     1.19
@@ -26,6 +26,9 @@
 #include "sa.h"
 #include "msg.h"
 #include "trace.h"
+#define _VERSION_C_AS_HEADER_
+#include "version.c"
+#undef  _VERSION_C_AS_HEADER_
 
 #ifndef FALSE
 #define FALSE (1 != 1)
@@ -169,7 +172,7 @@
 #endif
 
     /* read in the arguments */
-    while ((i = getopt(argc, argv, "d:g:h:t:v")) != -1) {
+    while ((i = getopt(argc, argv, "d:g:h:t:vV")) != -1) {
         switch (i) {
             case 'd': /* -d deliverymode */
                 if      (strcasecmp(optarg, "post") == 0)
@@ -272,6 +275,10 @@
             case 'v': // -v (verbose)
                 ctx->option_verbose = TRUE;
                 break;
+            case 'V': // -V (version)
+                fprintf(stdout, "%s\n", lmtp2nntp_version.v_gnu);
+                exit(0);
+                break;
             case '?':
             default:
                 usage(progname);


ossp-pkg/lmtp2nntp/test/run.sh 1.6 -> 1.7

--- run.sh       2001/08/16 15:00:50     1.6
+++ run.sh       2001/08/20 10:33:22     1.7
@@ -88,10 +88,10 @@
 
 #ok newmsg sendmail; ls -l /tmp/testmessage && cat /tmp/testmessage
 #ok lmtp feed arg
-#ok lmtp post arg
+lmtp post arg
 #ok lmtp feed envelope
 #ok lmtp post envelope
-sendmaildup
+#sendmaildup
 #post1000
 
 after


ossp-pkg/lmtp2nntp/version.c -> 1.1

*** /dev/null    Sat Nov 23 01:09:03 2024
--- -    Sat Nov 23 01:09:04 2024
***************
*** 0 ****
--- 1,46 ----
+ /*
+ **  version.c -- Version Information for lmtp2nntp (syntax: C/C++)
+ **  [automatically generated and maintained by GNU shtool]
+ */
+ 
+ #ifdef _VERSION_C_AS_HEADER_
+ 
+ #ifndef _VERSION_C_
+ #define _VERSION_C_
+ 
+ #define LMTP2NNTP_VERSION 0x009200
+ 
+ typedef struct {
+     const int   v_hex;
+     const char *v_short;
+     const char *v_long;
+     const char *v_tex;
+     const char *v_gnu;
+     const char *v_web;
+     const char *v_sccs;
+     const char *v_rcs;
+ } lmtp2nntp_version_t;
+ 
+ extern lmtp2nntp_version_t lmtp2nntp_version;
+ 
+ #endif /* _VERSION_C_ */
+ 
+ #else /* _VERSION_C_AS_HEADER_ */
+ 
+ #define _VERSION_C_AS_HEADER_
+ #include "version.c"
+ #undef  _VERSION_C_AS_HEADER_
+ 
+ lmtp2nntp_version_t lmtp2nntp_version = {
+     0x009200,
+     "0.9.0",
+     "0.9.0 (20-Aug-2001)",
+     "This is lmtp2nntp, Version 0.9.0 (20-Aug-2001)",
+     "lmtp2nntp 0.9.0 (20-Aug-2001)",
+     "lmtp2nntp/0.9.0",
+     "@(#)lmtp2nntp 0.9.0 (20-Aug-2001)",
+     "$Id: lmtp2nntp 0.9.0 (20-Aug-2001) $"
+ };
+ 
+ #endif /* _VERSION_C_AS_HEADER_ */
+ 

CVSTrac 2.0.1