gcc3 fixes and fluff trimming

2 files changed, 76 insertions, 34 deletions

diff --git a/dev-lang/pm3/files/PACKAGES b/dev-lang/pm3/files/PACKAGES
new file mode 100644
index 000000000000..ee0a1045ad43
--- /dev/null
+++ b/dev-lang/pm3/files/PACKAGES
@@ -0,0 +1,76 @@
+tLib = 1
+tProg = 2
+tOther = 3
+
+PkgInfo("m3cc","language/modula3/m3compiler","","m3-base",tProg,"",1,[],
+    ["ALL"],
+    [],"Modula-3 code generation backend based on gcc, called by the compiler")
+
+PkgInfo("m3doc","text/sgmltools","","m3doc",tOther,"T",2,[],["ALL"],[],
+    "m3doc produces both html and latex/postscript from the same source")
+
+PkgInfo("m3core","libs","","m3-base",tLib,"",2,[],["ALL"],[],
+    "Minimal modula-3 base library")
+
+PkgInfo("libm3","libs","","m3-base",tLib,"",2,[],["ALL"],[],
+    "Modula-3 base library")
+
+PkgInfo("m3bundle","language/modula3/m3tools","","m3-base",tProg,"",2,[],
+    ["ALL"],[],"Program that captures binary data from files as Modula-3 " &
+    " source")
+
+PkgInfo("m3coco","language/parsing","","m3coco",tProg,"T",2,[],["ALL"],[],
+    "Modula-3 LL(1) parser generator")
+
+PkgInfo("tempfiles","libs","","tempfiles",tLib,"T",2,[],["ALL"],[],
+    "Library to build tempfiles")
+
+PkgInfo("m3config",".","","m3-base",tLib,"",2,[],["ALL"],[],
+    "Quake templates and default bin, lib, pkg... locations for m3build")
+
+PkgInfo("sgml","text/sgmltools","","sgml",tLib,"T",2,[],["ALL"],[],
+    "SGML/XML parsing library")
+
+PkgInfo("m3tosgml","text/sgmltools","","m3tosgml",tProg,"T",2,[],["ALL"],[],
+    "Translate commented Modula-3 units into html files")
+
+PkgInfo("sgmlconv","text/sgmltools","","sgmlconv",tProg,"T",2,[],["ALL"],[],
+    "filter HTML files and convert HTML files to LaTeX")
+
+PkgInfo("sgmllinear","text/sgmltools","","sgmllinear",tProg,"T",2,[],["ALL"],
+    [],"Group several HTML files into a linear document")
+
+PkgInfo("m3middle","language/modula3/m3compiler","","m3middle",tLib,"T",3,[],
+    ["ALL"],[],"Modula-3 compiler's IL definition")
+
+PkgInfo("m3front","language/modula3/m3compiler","","m3front",tLib,"T",3,[],
+    ["ALL"],[],"Modula-3 compiler front-end")
+
+PkgInfo("m3linker","language/modula3/m3compiler","","m3linker",tLib,"T",3,[],
+    ["ALL"],[],"Modula-3 prelinker")
+
+PkgInfo("m3objfile","language/modula3/m3compiler","","m3objfile",tLib,"T",3,
+    [],["LINUXLIBC6", "LINUXELF", "NT386"],[],"Modula-3 object file writers")
+
+PkgInfo("m3back","language/modula3/m3compiler","","m3back",tLib,"T",3,[],
+    ["LINUXLIBC6", "LINUXELF", "NT386"],[],
+    "Linux ELF and Windows/NT x86 back-ends")
+
+PkgInfo("m3driver","language/modula3/m3compiler","","m3driver",tLib,"T",3,[],
+    ["ALL"],[],"Modula-3 compiler driver")
+
+PkgInfo("m3staloneback","language/modula3/m3compiler","","m3staloneback",tLib,
+    "T",3,[],["ALL"],["M3STALONEBACK"],
+    "Standalone back-end program like m3cc that uses m3back, used for testing")
+
+PkgInfo("m3quake","language","","m3quake",tLib,"T",3,[],["ALL"],[],
+    "The quake interpreter used by m3build")
+
+PkgInfo("m3templates","language/modula3/m3compiler","","m3templates",tLib,"T",
+    3,[],["ALL"],[],"Quake builtin functions for m3build")
+
+PkgInfo("m3build","language/modula3/m3compiler","","m3-base",tLib,"T",3,[],
+    ["ALL"],[],"The Modula-3 compiler")
+
+PkgInfo("m3ship","language/modula3/m3compiler","","m3-base",tLib,"",3,[],
+    ["ALL"],[],"Installs Modula-3 packages")
diff --git a/dev-lang/pm3/files/pm3-1.1.15.patch b/dev-lang/pm3/files/pm3-1.1.15.patch
index 357828d89516..f128810659f7 100644
--- a/dev-lang/pm3/files/pm3-1.1.15.patch
+++ b/dev-lang/pm3/files/pm3-1.1.15.patch
@@ -101,40 +101,6 @@
  
  if defined(UseOblets)
    include_dir("oblet")
---- pm3-1.1.15.orig/src/PACKAGES
-+++ pm3-1.1.15/src/PACKAGES
-@@ -147,8 +147,8 @@
- PkgInfo("coverage","language/modula3/m3tools","","coverage",tProg,"T",3,[],
-     ["ALL"],["POSIX"],"A line-based coverage analyzer/profiler")
- 
--PkgInfo("m3gdb","language/modula3/m3tools","","m3gdb",tProg,"T",3,[],["ALL"],
--    ["M3GDB"],"Modula-3 aware debugger based on gdb")
-+%PkgInfo("m3gdb","language/modula3/m3tools","","m3gdb",tProg,"T",3,[],["ALL"],
-+%    ["M3GDB"],"Modula-3 aware debugger based on gdb")
- 
- PkgInfo("pp","language/modula3/m3tools","","pp",tProg,"T",3,[],["ALL"],
-     ["POSIX"],"Modula-3 pretty-printer")
-@@ -460,14 +460,14 @@
- PkgInfo("webvbt","network/www","","webvbt",tLib,"T",3,[],["ALL"],[],
-     "A library for displaying HTML pages inside a VBT")
- 
--PkgInfo("webscape","network/www","","webscape",tProg,"T",3,[],["ALL"],[],
--    "A web browser with support for interactive content")
-+%PkgInfo("webscape","network/www","","webscape",tProg,"T",3,[],["ALL"],[],
-+%    "A web browser with support for interactive content")
- 
--PkgInfo("deckscape","network/www","","deckscape",tProg,"T",3,[],["ALL"],[],
--    "A web browser that uses a new metaphor: decks of web pages")
-+%PkgInfo("deckscape","network/www","","deckscape",tProg,"T",3,[],["ALL"],[],
-+%    "A web browser that uses a new metaphor: decks of web pages")
- 
--PkgInfo("webcard","network/www","","webcard",tProg,"T",3,[],["ALL"],
--    ["POSIX","ST_SPARE"],"An integrated mail/news/web client")
-+%PkgInfo("webcard","network/www","","webcard",tProg,"T",3,[],["ALL"],
-+%    ["POSIX","ST_SPARE"],"An integrated mail/news/web client")
- 
- PkgInfo("ocr","graphics/lecternpkg","","ocr",tLib,"T",3,[],["ALL"],[],
-     "Interface to optical character recognition library (DECstation only)")
 --- pm3-1.1.15.orig/debian/libpm3-static.dirs
 +++ pm3-1.1.15/debian/libpm3-static.dirs
 @@ -0,0 +1 @@