2 files changed, 274 insertions, 2 deletions

diff --git a/lang/pugs/Makefile b/lang/pugs/Makefile
index 12fb5b9a0edb..97d87e974101 100644
--- a/lang/pugs/Makefile
+++ b/lang/pugs/Makefile
@@ -15,8 +15,6 @@ DISTNAME=	Perl6-Pugs-${PORTVERSION}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A Perl6 Implementation
 
-BROKEN=		fails to deinstall cleanly
-
 RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		${SITE_PERL}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu
 BUILD_DEPENDS=	${RUN_DEPENDS}
@@ -24,6 +22,8 @@ BUILD_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 
 PERL_CONFIGURE=	yes
 
+SITE_PERL6_REL=	lib/perl6
+
 MAN3=		Perl6::Pugs.3 \
 		Inline::Pugs.3 \
 		Pugs::Doc::Run.3 Pugs::Doc::Hack.3
diff --git a/lang/pugs/pkg-plist b/lang/pugs/pkg-plist
index a0ef16d5000c..b5338fbbb352 100644
--- a/lang/pugs/pkg-plist
+++ b/lang/pugs/pkg-plist
@@ -12,3 +12,275 @@ bin/pugscc
 @dirrmtry %%SITE_PERL%%/Pugs
 @dirrmtry %%SITE_PERL%%/Perl6
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6
+lib/perl6/site_perl/Algorithm/TokenBucket.pm
+lib/perl6/site_perl/Benchmark.pm
+lib/perl6/site_perl/CGI.pm
+lib/perl6/site_perl/CGI/Remote.pm
+lib/perl6/site_perl/CGI/Server.pm
+lib/perl6/site_perl/CGI/Util.pm
+lib/perl6/site_perl/Cipher.pm
+lib/perl6/site_perl/Cipher/Arcfour.pm
+lib/perl6/site_perl/Cipher/Block.pm
+lib/perl6/site_perl/Cipher/Caesar.pm
+lib/perl6/site_perl/Cipher/Stream.pm
+lib/perl6/site_perl/Cipher/TEA.pm
+lib/perl6/site_perl/Cipher/TestGuts.pm
+lib/perl6/site_perl/Config/Tiny.pm
+lib/perl6/site_perl/Date.pm
+lib/perl6/site_perl/Date/Span.pm
+lib/perl6/site_perl/DateTime/Recurrence.pm
+lib/perl6/site_perl/DateTime/Span.pm
+lib/perl6/site_perl/FA/DFA.pm
+lib/perl6/site_perl/File/Find.pm
+lib/perl6/site_perl/File/Spec.pm
+lib/perl6/site_perl/File/Spec/Unix.pm
+lib/perl6/site_perl/File/Spec/Win32.pm
+lib/perl6/site_perl/FindBin.pm
+lib/perl6/site_perl/Getopt/Std.pm
+lib/perl6/site_perl/HTML/Entities.pm
+lib/perl6/site_perl/HTTP/Cookies.pm
+lib/perl6/site_perl/HTTP/Date.pm
+lib/perl6/site_perl/HTTP/Headers.pm
+lib/perl6/site_perl/HTTP/Headers/Util.pm
+lib/perl6/site_perl/HTTP/Message.pm
+lib/perl6/site_perl/HTTP/Query.pm
+lib/perl6/site_perl/HTTP/Request.pm
+lib/perl6/site_perl/HTTP/Request/CGI.pm
+lib/perl6/site_perl/HTTP/Response.pm
+lib/perl6/site_perl/HTTP/Server/Simple.pm
+lib/perl6/site_perl/HTTP/Status.pm
+lib/perl6/site_perl/Kwid/Event/Parser.pm
+lib/perl6/site_perl/LWP/Simple.pm
+lib/perl6/site_perl/Locale/KeyedText.pm
+lib/perl6/site_perl/Locale/KeyedText/L/en.pm
+lib/perl6/site_perl/Log/Selective.pm
+lib/perl6/site_perl/MIME/Base64.pm
+lib/perl6/site_perl/Module/Pluggable/Fast.pm
+lib/perl6/site_perl/Net/IRC.pm
+lib/perl6/site_perl/Net/IRC/JoinOnInvite.pm
+lib/perl6/site_perl/Net/IRC/OO.pm
+lib/perl6/site_perl/Net/IRC/SeenExt.pm
+lib/perl6/site_perl/Parse/Architecture.pod
+lib/perl6/site_perl/Parse/Rule/Core.pm
+lib/perl6/site_perl/Parse/Rule/Media/Text.pm
+lib/perl6/site_perl/Parse/Rule/Medium.pm
+lib/perl6/site_perl/Parse/Rule/Strategies/CPS.pm
+lib/perl6/site_perl/Parse/Rule/Strategies/CPS/Text.pm
+lib/perl6/site_perl/Parse/Rule/Strategy.pm
+lib/perl6/site_perl/Perl/Compiler/CodeGen.pm
+lib/perl6/site_perl/Perl/Compiler/CodeGen/NameGen.pm
+lib/perl6/site_perl/Perl/Compiler/CodeGen/Perl5_Str.pm
+lib/perl6/site_perl/Perl/Compiler/PIL.pm
+lib/perl6/site_perl/Perl/Compiler/PIL/Node_pm_gen.pl
+lib/perl6/site_perl/Perl/Compiler/PIL/Util.pm
+lib/perl6/site_perl/Perl6/Container/Array.pm
+lib/perl6/site_perl/Perl6/Grammar.pm
+lib/perl6/site_perl/Perl6/Value/List.pm
+lib/perl6/site_perl/Perldoc/DOM.pm
+lib/perl6/site_perl/Perldoc/DOM/Element.pm
+lib/perl6/site_perl/Perldoc/DOM/Node.pm
+lib/perl6/site_perl/Perldoc/DOM/PI.pm
+lib/perl6/site_perl/Perldoc/DOM/Text.pm
+lib/perl6/site_perl/Perldoc/DOM/WS.pm
+lib/perl6/site_perl/Pod/Event/Handler/HTML.pm
+lib/perl6/site_perl/Pod/Event/Handler/POD.pm
+lib/perl6/site_perl/Pod/Event/Parser.pm
+lib/perl6/site_perl/Prelude.pm.yml
+lib/perl6/site_perl/Recurrence.pm
+lib/perl6/site_perl/Relation.pm
+lib/perl6/site_perl/Rosetta.pm
+lib/perl6/site_perl/Rosetta/Copying.pod
+lib/perl6/site_perl/Rosetta/Engine/Example.pm
+lib/perl6/site_perl/Rosetta/Engine/Example/L/en.pm
+lib/perl6/site_perl/Rosetta/FAQ.pod
+lib/perl6/site_perl/Rosetta/L/en.pm
+lib/perl6/site_perl/Rosetta/Language.pod
+lib/perl6/site_perl/Rosetta/Migration.pod
+lib/perl6/site_perl/Rosetta/Model.pm
+lib/perl6/site_perl/Rosetta/Model/L/en.pm
+lib/perl6/site_perl/Rosetta/Overview.pod
+lib/perl6/site_perl/Rosetta/SeeAlso.pod
+lib/perl6/site_perl/Rosetta/Shell.pm
+lib/perl6/site_perl/Rosetta/Shell/L/en.pm
+lib/perl6/site_perl/Rosetta/TODO.pod
+lib/perl6/site_perl/Rosetta/Validator.pm
+lib/perl6/site_perl/Rosetta/Validator/L/en.pm
+lib/perl6/site_perl/Set.pm
+lib/perl6/site_perl/Set/Hash.pm
+lib/perl6/site_perl/Set/Infinite.pm
+lib/perl6/site_perl/Set/Infinite/Functional.pm
+lib/perl6/site_perl/Set/Symbols.pm
+lib/perl6/site_perl/Span.pm
+lib/perl6/site_perl/Span/Code.pm
+lib/perl6/site_perl/Span/Int.pm
+lib/perl6/site_perl/Span/Num.pm
+lib/perl6/site_perl/Test.pm
+lib/perl6/site_perl/Test.pm.yml
+lib/perl6/site_perl/Test/Builder.pm
+lib/perl6/site_perl/Test/Builder/Output.pm
+lib/perl6/site_perl/Test/Builder/Test.pm
+lib/perl6/site_perl/Test/Builder/TestPlan.pm
+lib/perl6/site_perl/Test/Builder/Tester.pm
+lib/perl6/site_perl/Test/PIL/Bootstrap.pm
+lib/perl6/site_perl/Test/Pil.pm
+lib/perl6/site_perl/Text/Glob.pm
+lib/perl6/site_perl/Tree.pm
+lib/perl6/site_perl/Tree/Visitor.pm
+lib/perl6/site_perl/Tree/Visitor/FindByPath.pm
+lib/perl6/site_perl/URI/Escape.pm
+lib/perl6/site_perl/WTemplate.pm
+lib/perl6/site_perl/auto/pugs/js/lib/PIL2JS.js
+lib/perl6/site_perl/auto/pugs/js/lib/Perl6/Attribute.js
+lib/perl6/site_perl/auto/pugs/js/lib/Perl6/Class.js
+lib/perl6/site_perl/auto/pugs/js/lib/Perl6/Instance.js
+lib/perl6/site_perl/auto/pugs/js/lib/Perl6/MetaClass.js
+lib/perl6/site_perl/auto/pugs/js/lib/Perl6/MetaClass/Dispatcher.js
+lib/perl6/site_perl/auto/pugs/js/lib/Perl6/MetaModel.js
+lib/perl6/site_perl/auto/pugs/js/lib/Perl6/Method.js
+lib/perl6/site_perl/auto/pugs/js/lib/Perl6/MultiMethod.js
+lib/perl6/site_perl/auto/pugs/js/lib/Perl6/Object.js
+lib/perl6/site_perl/auto/pugs/perl5/lib/Class/Rebless.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/Cont.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/P5Macro.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PApp.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PAssign.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PBind.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PExp.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PLit.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PNil.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PNoop.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PPad.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PPos.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PStmt.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PStmts.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PVal.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/PVar.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/Params.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/Parser.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/RawJS.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/Subs.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL/Types.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL2JS.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/PIL2JS/JSPM.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/Perl6/Run/JS.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/Prelude.js
+lib/perl6/site_perl/auto/pugs/perl5/lib/Prelude/JS.pm
+lib/perl6/site_perl/auto/pugs/perl5/lib/Test.js
+lib/perl6/site_perl/auto/pugs/perl5/lib/jspugs.pl
+lib/perl6/site_perl/auto/pugs/perl5/lib/pil2js.pl
+lib/perl6/site_perl/auto/pugs/perl5/lib/pugs-smokejs.pl
+lib/perl6/site_perl/auto/pugs/perl5/lib/runjs.pl
+lib/perl6/site_perl/auto/pugs/perl5/man3/Class::Rebless.3
+lib/perl6/site_perl/auto/pugs/perl5/man3/PIL2JS::JSPM.3
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Array.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Bool.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Code.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Context.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Continuations.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/ControlFlow.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Hash.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/IO.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/JSAN.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Junc.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Keyed.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Math.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/OO.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Operators.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Pair.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Perl5.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Proxy.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Ref.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Rules.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Smartmatch.pm
+lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS/Str.pm
+lib/perl6/site_perl/fp.pm
+lib/perl6/site_perl/lib.pm
+@dirrm lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude/JS
+@dirrm lib/perl6/site_perl/auto/pugs/perl6/lib/Prelude
+@dirrm lib/perl6/site_perl/auto/pugs/perl6/lib
+@dirrm lib/perl6/site_perl/auto/pugs/perl6
+@dirrm lib/perl6/site_perl/auto/pugs/perl5/man3
+@dirrm lib/perl6/site_perl/auto/pugs/perl5/lib/Prelude
+@dirrm lib/perl6/site_perl/auto/pugs/perl5/lib/Perl6/Run
+@dirrm lib/perl6/site_perl/auto/pugs/perl5/lib/Perl6
+@dirrm lib/perl6/site_perl/auto/pugs/perl5/lib/PIL2JS
+@dirrm lib/perl6/site_perl/auto/pugs/perl5/lib/PIL
+@dirrm lib/perl6/site_perl/auto/pugs/perl5/lib/Class
+@dirrm lib/perl6/site_perl/auto/pugs/perl5/lib
+@dirrm lib/perl6/site_perl/auto/pugs/perl5
+@dirrm lib/perl6/site_perl/auto/pugs/js/lib/Perl6/MetaClass
+@dirrm lib/perl6/site_perl/auto/pugs/js/lib/Perl6
+@dirrm lib/perl6/site_perl/auto/pugs/js/lib
+@dirrm lib/perl6/site_perl/auto/pugs/js
+@dirrm lib/perl6/site_perl/auto/pugs
+@dirrmtry lib/perl6/site_perl/URI
+@dirrmtry lib/perl6/site_perl/Tree/Visitor
+@dirrmtry lib/perl6/site_perl/Tree
+@dirrmtry lib/perl6/site_perl/Text
+@dirrmtry lib/perl6/site_perl/Test/PIL
+@dirrmtry lib/perl6/site_perl/Test/Builder
+@dirrmtry lib/perl6/site_perl/Test
+@dirrmtry lib/perl6/site_perl/Span
+@dirrmtry lib/perl6/site_perl/Set/Infinite
+@dirrmtry lib/perl6/site_perl/Set
+@dirrmtry lib/perl6/site_perl/Rosetta/Validator/L
+@dirrmtry lib/perl6/site_perl/Rosetta/Validator
+@dirrmtry lib/perl6/site_perl/Rosetta/Shell/L
+@dirrmtry lib/perl6/site_perl/Rosetta/Shell
+@dirrmtry lib/perl6/site_perl/Rosetta/Model/L
+@dirrmtry lib/perl6/site_perl/Rosetta/Model
+@dirrmtry lib/perl6/site_perl/Rosetta/L
+@dirrmtry lib/perl6/site_perl/Rosetta/Engine/Example/L
+@dirrmtry lib/perl6/site_perl/Rosetta/Engine/Example
+@dirrmtry lib/perl6/site_perl/Rosetta/Engine
+@dirrmtry lib/perl6/site_perl/Rosetta
+@dirrmtry lib/perl6/site_perl/Pod/Event/Handler
+@dirrmtry lib/perl6/site_perl/Pod/Event
+@dirrmtry lib/perl6/site_perl/Pod
+@dirrmtry lib/perl6/site_perl/Perldoc/DOM
+@dirrmtry lib/perl6/site_perl/Perldoc
+@dirrmtry lib/perl6/site_perl/Perl6/Value
+@dirrmtry lib/perl6/site_perl/Perl6/Container
+@dirrmtry lib/perl6/site_perl/Perl6
+@dirrmtry lib/perl6/site_perl/Perl/Compiler/PIL
+@dirrmtry lib/perl6/site_perl/Perl/Compiler/CodeGen
+@dirrmtry lib/perl6/site_perl/Perl/Compiler
+@dirrmtry lib/perl6/site_perl/Perl
+@dirrmtry lib/perl6/site_perl/Parse/Rule/Strategies/CPS
+@dirrmtry lib/perl6/site_perl/Parse/Rule/Strategies
+@dirrmtry lib/perl6/site_perl/Parse/Rule/Media
+@dirrmtry lib/perl6/site_perl/Parse/Rule
+@dirrmtry lib/perl6/site_perl/Parse
+@dirrmtry lib/perl6/site_perl/Net/IRC
+@dirrmtry lib/perl6/site_perl/Net
+@dirrmtry lib/perl6/site_perl/Module/Pluggable
+@dirrmtry lib/perl6/site_perl/Module
+@dirrmtry lib/perl6/site_perl/MIME
+@dirrmtry lib/perl6/site_perl/Log
+@dirrmtry lib/perl6/site_perl/Locale/KeyedText/L
+@dirrmtry lib/perl6/site_perl/Locale/KeyedText
+@dirrmtry lib/perl6/site_perl/Locale
+@dirrmtry lib/perl6/site_perl/LWP
+@dirrmtry lib/perl6/site_perl/Kwid/Event
+@dirrmtry lib/perl6/site_perl/Kwid
+@dirrmtry lib/perl6/site_perl/HTTP/Server
+@dirrmtry lib/perl6/site_perl/HTTP/Request
+@dirrmtry lib/perl6/site_perl/HTTP/Headers
+@dirrmtry lib/perl6/site_perl/HTTP
+@dirrmtry lib/perl6/site_perl/HTML
+@dirrmtry lib/perl6/site_perl/Getopt
+@dirrmtry lib/perl6/site_perl/File/Spec
+@dirrmtry lib/perl6/site_perl/File
+@dirrmtry lib/perl6/site_perl/FA
+@dirrmtry lib/perl6/site_perl/DateTime
+@dirrmtry lib/perl6/site_perl/Date
+@dirrmtry lib/perl6/site_perl/Config
+@dirrmtry lib/perl6/site_perl/Cipher
+@dirrmtry lib/perl6/site_perl/CGI
+@dirrmtry lib/perl6/site_perl/Algorithm
+@dirrmtry lib/perl6/site_perl/mach
+@dirrmtry lib/perl6/site_perl/auto
+@dirrmtry lib/perl6/site_perl
+@dirrmtry lib/perl6