Joined NPB from ong2

diff --cc makefile
index 0b92ea76a2b9df41eeaf85b14fae9b4d2ef21769,d195a6102273801d80d2bd3f8fcd5009aba257e6..86aeda690189da6d783f656cd1eee68e67eb8495
--- 1/makefile
--- 2/makefile
+++ b/makefile
@@@ -1,27 -1,71 +1,27 @@@
 -CC=gcc\r
 -CC2=g++\r
 -CF=-g -Wall\r
 -LF=-lIL\r
 -LF2=-lcgi\r
 -\r
 -all: bot4 deliver remove view mpview viewpage relink ong pleaseong update spoiler click generator post posted force enable npb npbd exec\r
 -\r
 -npb: npb.cpp makefile\r
 -      $(CC2) $(CF) $(LF) -o npb npb.cpp\r
 -\r
 -npbd: npbd.cpp makefile\r
 -      $(CC2) $(CF) -o npbd npbd.cpp $(LF2)\r
 -\r
 -bot4: bot4.c findlatest.awk related.awk post.awk mpost.awk mome.pl mome.awk makefile\r
 -      $(CC) $(CF) -o bot4 bot4.c\r
 -\r
 -deliver: deliver.c\r
 -      $(CC) $(CF) -o deliver deliver.c\r
 -\r
 -remove: remove.c\r
 -      $(CC) $(CF) -o remove remove.c $(LF2)\r
 -\r
 -pleaseong: pleaseong.c\r
 -      $(CC) $(CF) -o pleaseong pleaseong.c $(LF2)\r
 -\r
 -view: view.c makefile\r
 -      $(CC) $(CF) -o view view.c $(LF2)\r
 -\r
 -mpview: mpview.c mview.awk view.awk makefile\r
 -      $(CC) $(CF) -o mpview mpview.c $(LF2)\r
 -\r
 -viewpage: viewpage.c makefile\r
 -      $(CC) $(CF) -o viewpage viewpage.c $(LF2)\r
 -\r
 -relink: relink.c makefile\r
 -      $(CC) $(CF) -o relink relink.c $(LF2)\r
 -\r
 -ong: ong.c makefile\r
 -      $(CC) $(CF) -o ong ong.c\r
 -\r
 -update: update.c makefile\r
 -      $(CC) $(CF) -o update update.c\r
 -\r
 -spoiler: spoiler.c makefile\r
 -      $(CC) $(CF) -o spoiler spoiler.c $(LF2)\r
 -\r
 -click: click.c makefile\r
 -      $(CC) $(CF) -o click click.c $(LF2)\r
 -\r
 -generator: generator.c ogdfparse.awk makefile\r
 -      $(CC) $(CF) -o generator generator.c $(LF2)\r
 -\r
 -posted: posted.c posted.awk makefile\r
 -      $(CC) $(CF) -o posted posted.c $(LF2)\r
 -\r
 -post: post.cpp preview.awk bb2html.awk makefile\r
 -      $(CC2) $(CF) -o post post.cpp $(LF2)\r
 -\r
 -ongtext: ongtext.c ongtext.awk makefile\r
 -      $(CC) $(CF) -o ongtext ongtext.c $(LF2)\r
 -\r
 -force: force.c\r
 -      $(CC) $(CF) -o force force.c $(LF2)\r
 -\r
 -\r
 -enable: relink view click generator posted post remove ongtext pleaseong force\r
 -      chmod u+s relink view click generator posted post remove ongtext pleaseong force\r
 -\r
 -exec: spoiler.pl\r
 -      chmod +x spoiler.pl\r
 +CC=g++
 +CF=-g -Wall
 +LF=-lIL
 +LF2=-lcgi
 +
- all: 403 npb npbd bluenh bluenhd
++all: 403 npb npbd npb-ong1 npbd-ong1 bluenh bluenhd
++
++npb: npb-ong1.cpp makefile
++      $(CC) $(CF) $(LF) -o npb-ong1 npb-ong1.cpp
 +
 +npb: npb.cpp makefile
 +      $(CC) $(CF) $(LF) -o npb npb.cpp
 +
 +403: 403.cpp makefile
 +      $(CC) $(CF) $(LF) -o 403 403.cpp
 +
++npbd-ong1: npb npbd-ong1.cpp makefile
++      $(CC) $(CF) -o npbd-ong1 npbd-ong1.cpp $(LF2)
++
 +npbd: npb npbd.cpp makefile
 +      $(CC) $(CF) -o npbd npbd.cpp $(LF2)
 +
 +bluenh: bluenh.cpp makefile
 +      $(CC) $(CF) $(LF) -o bluenh bluenh.cpp
 +
 +bluenhd: bluenhd.cpp makefile
 +      $(CC) $(CF) -o bluenhd bluenhd.cpp $(LF2)
- 
- bluenh: bluenh.cpp makefile
-       $(CC) $(CF) $(LF) -o bluenh bluenh.cpp
- 
- bluenhd: bluenhd.cpp makefile
-       $(CC) $(CF) -o bluenhd bluenhd.cpp $(LF2)