Unbreak and fix the bogus plist.

Noticed by:	kris

4 files changed, 62 insertions, 78 deletions

diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index 630efd5..572569b 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR=	alleg
 
 MAINTAINER=	olgeni@FreeBSD.org
 
-BROKEN=		"plist is incorrect"
-
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 MAKEFILE=	makefile
diff --git a/devel/allegro-devel/pkg-plist b/devel/allegro-devel/pkg-plist
index 3520e8a..f100c1a 100644
--- a/devel/allegro-devel/pkg-plist
+++ b/devel/allegro-devel/pkg-plist
@@ -8,12 +8,27 @@ bin/allegro-config
 %%FULL%%bin/pat2dat
 %%FULL%%bin/rgbmap
 %%FULL%%bin/textconv
-
 include/allegro.h
-include/xalleg.h
-include/linalleg.h
+include/allegro/3d.h
+include/allegro/3dmaths.h
+include/allegro/alcompat.h
 include/allegro/alinline.h
 include/allegro/alunixac.h
+include/allegro/base.h
+include/allegro/color.h
+include/allegro/compiled.h
+include/allegro/config.h
+include/allegro/datafile.h
+include/allegro/debug.h
+include/allegro/digi.h
+include/allegro/draw.h
+include/allegro/file.h
+include/allegro/fix.h
+include/allegro/fixed.h
+include/allegro/fli.h
+include/allegro/fmaths.h
+include/allegro/gfx.h
+include/allegro/gui.h
 include/allegro/inline/3dmaths.inl
 include/allegro/inline/asm.inl
 include/allegro/inline/color.inl
@@ -29,6 +44,12 @@ include/allegro/inline/system.inl
 include/allegro/internal/aintern.h
 include/allegro/internal/aintvga.h
 include/allegro/internal/alconfig.h
+include/allegro/joystick.h
+include/allegro/keyboard.h
+include/allegro/matrix.h
+include/allegro/midi.h
+include/allegro/mouse.h
+include/allegro/palette.h
 include/allegro/platform/aintbeos.h
 include/allegro/platform/aintdos.h
 include/allegro/platform/aintlnx.h
@@ -57,30 +78,6 @@ include/allegro/platform/alunixac.h
 include/allegro/platform/alwatcom.h
 include/allegro/platform/alwin.h
 include/allegro/platform/macdef.h
-include/allegro/3d.h
-include/allegro/3dmaths.h
-include/allegro/alcompat.h
-include/allegro/base.h
-include/allegro/color.h
-include/allegro/compiled.h
-include/allegro/config.h
-include/allegro/datafile.h
-include/allegro/debug.h
-include/allegro/digi.h
-include/allegro/draw.h
-include/allegro/file.h
-include/allegro/fix.h
-include/allegro/fixed.h
-include/allegro/fli.h
-include/allegro/fmaths.h
-include/allegro/gfx.h
-include/allegro/gui.h
-include/allegro/joystick.h
-include/allegro/keyboard.h
-include/allegro/matrix.h
-include/allegro/midi.h
-include/allegro/mouse.h
-include/allegro/palette.h
 include/allegro/quat.h
 include/allegro/rle.h
 include/allegro/sound.h
@@ -89,17 +86,10 @@ include/allegro/system.h
 include/allegro/text.h
 include/allegro/timer.h
 include/allegro/unicode.h
-@dirrm include/allegro/inline
-@dirrm include/allegro/internal
-@dirrm include/allegro/platform
-@dirrm include/allegro
-
+include/linalleg.h
+include/xalleg.h
 lib/liballeg-4.0.0.so
-lib/allegro/4.0/alleg-dga2.so
-lib/allegro/4.0/modules.lst
-@dirrm lib/allegro/4.0
-@dirrm lib/allegro
-
+lib/liballeg_unsharable.a
 %%PORTDOCS%%share/doc/allegro/abi.html
 %%PORTDOCS%%share/doc/allegro/ahack.html
 %%PORTDOCS%%share/doc/allegro/alleg000.html
@@ -153,3 +143,7 @@ lib/allegro/4.0/modules.lst
 %%PORTDOCS%%share/doc/allegro/thanks.html
 %%PORTDOCS%%share/doc/allegro/tmpfile.txt
 %%PORTDOCS%%@dirrm share/doc/allegro
+@dirrm include/allegro/platform
+@dirrm include/allegro/internal
+@dirrm include/allegro/inline
+@dirrm include/allegro
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 630efd5..572569b 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR=	alleg
 
 MAINTAINER=	olgeni@FreeBSD.org
 
-BROKEN=		"plist is incorrect"
-
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 MAKEFILE=	makefile
diff --git a/devel/allegro/pkg-plist b/devel/allegro/pkg-plist
index 3520e8a..f100c1a 100644
--- a/devel/allegro/pkg-plist
+++ b/devel/allegro/pkg-plist
@@ -8,12 +8,27 @@ bin/allegro-config
 %%FULL%%bin/pat2dat
 %%FULL%%bin/rgbmap
 %%FULL%%bin/textconv
-
 include/allegro.h
-include/xalleg.h
-include/linalleg.h
+include/allegro/3d.h
+include/allegro/3dmaths.h
+include/allegro/alcompat.h
 include/allegro/alinline.h
 include/allegro/alunixac.h
+include/allegro/base.h
+include/allegro/color.h
+include/allegro/compiled.h
+include/allegro/config.h
+include/allegro/datafile.h
+include/allegro/debug.h
+include/allegro/digi.h
+include/allegro/draw.h
+include/allegro/file.h
+include/allegro/fix.h
+include/allegro/fixed.h
+include/allegro/fli.h
+include/allegro/fmaths.h
+include/allegro/gfx.h
+include/allegro/gui.h
 include/allegro/inline/3dmaths.inl
 include/allegro/inline/asm.inl
 include/allegro/inline/color.inl
@@ -29,6 +44,12 @@ include/allegro/inline/system.inl
 include/allegro/internal/aintern.h
 include/allegro/internal/aintvga.h
 include/allegro/internal/alconfig.h
+include/allegro/joystick.h
+include/allegro/keyboard.h
+include/allegro/matrix.h
+include/allegro/midi.h
+include/allegro/mouse.h
+include/allegro/palette.h
 include/allegro/platform/aintbeos.h
 include/allegro/platform/aintdos.h
 include/allegro/platform/aintlnx.h
@@ -57,30 +78,6 @@ include/allegro/platform/alunixac.h
 include/allegro/platform/alwatcom.h
 include/allegro/platform/alwin.h
 include/allegro/platform/macdef.h
-include/allegro/3d.h
-include/allegro/3dmaths.h
-include/allegro/alcompat.h
-include/allegro/base.h
-include/allegro/color.h
-include/allegro/compiled.h
-include/allegro/config.h
-include/allegro/datafile.h
-include/allegro/debug.h
-include/allegro/digi.h
-include/allegro/draw.h
-include/allegro/file.h
-include/allegro/fix.h
-include/allegro/fixed.h
-include/allegro/fli.h
-include/allegro/fmaths.h
-include/allegro/gfx.h
-include/allegro/gui.h
-include/allegro/joystick.h
-include/allegro/keyboard.h
-include/allegro/matrix.h
-include/allegro/midi.h
-include/allegro/mouse.h
-include/allegro/palette.h
 include/allegro/quat.h
 include/allegro/rle.h
 include/allegro/sound.h
@@ -89,17 +86,10 @@ include/allegro/system.h
 include/allegro/text.h
 include/allegro/timer.h
 include/allegro/unicode.h
-@dirrm include/allegro/inline
-@dirrm include/allegro/internal
-@dirrm include/allegro/platform
-@dirrm include/allegro
-
+include/linalleg.h
+include/xalleg.h
 lib/liballeg-4.0.0.so
-lib/allegro/4.0/alleg-dga2.so
-lib/allegro/4.0/modules.lst
-@dirrm lib/allegro/4.0
-@dirrm lib/allegro
-
+lib/liballeg_unsharable.a
 %%PORTDOCS%%share/doc/allegro/abi.html
 %%PORTDOCS%%share/doc/allegro/ahack.html
 %%PORTDOCS%%share/doc/allegro/alleg000.html
@@ -153,3 +143,7 @@ lib/allegro/4.0/modules.lst
 %%PORTDOCS%%share/doc/allegro/thanks.html
 %%PORTDOCS%%share/doc/allegro/tmpfile.txt
 %%PORTDOCS%%@dirrm share/doc/allegro
+@dirrm include/allegro/platform
+@dirrm include/allegro/internal
+@dirrm include/allegro/inline
+@dirrm include/allegro