--- deliantra/Deliantra-Client/Makefile.PL	2006/07/23 16:11:12	1.54
+++ deliantra/Deliantra-Client/Makefile.PL	2007/01/26 13:09:05	1.70
@@ -1,5 +1,10 @@
 use ExtUtils::MakeMaker;
 
+sub manifest_resources {
+   open my $manifest, "MANIFEST" or die "Couldn't open MANIFEST: $!";
+   map { chomp; $_ } grep /^resources\//, <$manifest>
+}
+
 print <<EOF;
 
 *** opengl 1.1 is required to run this client
@@ -14,6 +19,11 @@
 
 *** HINT: BerkeleyDB must be linked against version 4.3 or higher of libdb
 
+*** HINT: Debian/Ubuntu users might have luck with:
+*** apt-get install perl libpango1.0-dev libglib2.0-dev libsdl1.2-dev
+*** apt-get install libevent-perl libsdl-mixer1.2-dev libsdl-image1.2-dev
+*** apt-get install libberkeleydb-perl anyevent-perl
+
 EOF
 
 if ($^O =~ /win32/i or $^O =~ /mswin/) {
@@ -23,7 +33,7 @@
 
 EOF
    $INC  = "-I/gtk/include -I/gtk/include/pango-1.0 -I/gtk/include/glib-2.0 -I/gtk/lib/glib-2.0/include/ -I/gtk/include/freetype2";
-   $LIBS = "-L/gtk/lib -lSDL -lSDL_image -lSDL_mixer -lpango-1.0 -lpangoft2-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lfreetype -lfontconfig -lopengl32",
+   $LIBS = "-L/gtk/lib -lSDL -lSDL_image -lSDL_mixer -lpango-1.0 -lpangoft2-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lfreetype -lfontconfig -lopengl32 -lwininet",
 } else {
    $INC  = join " ", qx<sdl-config --cflags>, qx<pkg-config pangoft2 --cflags>;
    $LIBS = join " ", qx<sdl-config --libs>, "-lSDL_image -lSDL_mixer", qx<pkg-config pangoft2 --libs>, "-lGL";
@@ -33,47 +43,61 @@
 
 WriteMakefile(
     dist	=> {
-	            PREOP	=> 'pod2text CFClient.pm | tee README >$(DISTVNAME)/README; chmod -R u=rwX,go=rX . ;',
+	            PREOP	=> 'pod2text bin/cfplus | tee README >$(DISTVNAME)/README; chmod -R u=rwX,go=rX . ;',
 	            COMPRESS	=> 'gzip -9v',
 	            SUFFIX	=> '.gz',
 	           },
-    NAME => "CFClient",
+    NAME => "CFPlus",
     INC => $INC,
     LIBS => [$LIBS],
     EXE_FILES => [qw(bin/cfplus)],
-    VERSION_FROM => "CFClient.pm",
+    VERSION_FROM => "CFPlus.pm",
     PREREQ_PM => {
        BerkeleyDB    => 0.27,
-       Crossfire     => 0.1,
+       Crossfire     => 0.96,
        Time::HiRes   => 0,
-       Event         => 1.01,
+       Event         => 1.07,
        AnyEvent      => 0,
        Compress::LZF => 1.6,
        Pod::POM      => 0.15,
     },
     depend    => {
-       "CFClient.o" => 'glfunc.h pangoopengl.h pango-font.c pango-fontmap.c pango-render.c texcache.c',
+       "CFPlus.o" => 'glfunc.h pangoopengl.h pango-font.c pango-fontmap.c pango-render.c texcache.c',
     },
+    clean     => { FILES => 'docwiki.pst' },
     PM => {
-       'CFClient.pm'                    => '$(INST_LIBDIR)/CFClient.pm',
-       'CFClient/Protocol.pm'           => '$(INST_LIBDIR)/CFClient/Protocol.pm',
-       'CFClient/OpenGL.pm'             => '$(INST_LIBDIR)/CFClient/OpenGL.pm',
-       'CFClient/Texture.pm'            => '$(INST_LIBDIR)/CFClient/Texture.pm',
-       'CFClient/UI.pm'                 => '$(INST_LIBDIR)/CFClient/UI.pm',
-       'CFClient/Pod.pm'                => '$(INST_LIBDIR)/CFClient/Pod.pm',
-       'CFClient/MapWidget.pm'          => '$(INST_LIBDIR)/CFClient/MapWidget.pm',
-       'CFClient/BindingEditor.pm'      => '$(INST_LIBDIR)/CFClient/BindingEditor.pm',
-       (map +($_ => "\$(INST_LIBDIR)/CFClient/$_"),
-          <resources/*.png>,
-          <resources/fonts/*.ttf>,
-          <resources/sounds/*.wav>,
-          <resources/sounds/*.ogg>,
-          <resources/sounds/config>,
-          <resources/music/*.ogg>,
-          <resources/ui/*.png>,
-          <resources/ui/resist/*.png>,
-          <resources/pod/*.pod>,
-          <resources/pod/*.png>,
-       ),
+       'CFPlus.pm'                    => '$(INST_LIBDIR)/CFPlus.pm',
+       'CFPlus/Protocol.pm'           => '$(INST_LIBDIR)/CFPlus/Protocol.pm',
+       'CFPlus/OpenGL.pm'             => '$(INST_LIBDIR)/CFPlus/OpenGL.pm',
+       'CFPlus/Texture.pm'            => '$(INST_LIBDIR)/CFPlus/Texture.pm',
+       'CFPlus/UI.pm'                 => '$(INST_LIBDIR)/CFPlus/UI.pm',
+       'CFPlus/UI/Inventory.pm'       => '$(INST_LIBDIR)/CFPlus/UI/Inventory.pm',
+       'CFPlus/UI/SpellList.pm'       => '$(INST_LIBDIR)/CFPlus/UI/SpellList.pm',
+       'CFPlus/Item.pm'               => '$(INST_LIBDIR)/CFPlus/Item.pm',
+       'CFPlus/Pod.pm'                => '$(INST_LIBDIR)/CFPlus/Pod.pm',
+       'CFPlus/MapWidget.pm'          => '$(INST_LIBDIR)/CFPlus/MapWidget.pm',
+       'CFPlus/Macro.pm'              => '$(INST_LIBDIR)/CFPlus/Macro.pm',
+       'docwiki.pst'                  => '$(INST_LIBDIR)/CFPlus/resources/docwiki.pst',
+       (map +($_ => "\$(INST_LIBDIR)/CFPlus/$_"), manifest_resources),
     }
 );
+
+sub MY::postamble {
+   my $self = shift;
+
+   # try to add MANIFEST to CONFIGDEP
+   s/^CONFIGDEP = /CONFIGDEP = MANIFEST /m
+      for @{ $self->{RESULT} };
+
+   my $pods = join " ", <pod/*.pod>;
+
+   <<EOF
+
+all :: docwiki.pst
+
+docwiki.pst: bin/pod2wiki $pods
+	\$(PERL) -Mlib=. bin/pod2wiki $pods
+
+EOF
+}
+