2 files changed, 40 insertions, 77 deletions

diff --git a/graphics/cenon/Makefile b/graphics/cenon/Makefile
index 5de818ce6291..525f22ed318d 100644
--- a/graphics/cenon/Makefile
+++ b/graphics/cenon/Makefile
@@ -50,7 +50,6 @@ post-install:
 		-C ${GNUSTEP_LOCAL_ROOT}/Library/ --exclude COPYING
 	@${CHOWN} -R root:wheel ${CENON_LIB_DIR}
 	@${CHMOD} -R u=rwX,go=rX ${CENON_LIB_DIR}
-	@${CHMOD} 444 ${CENON_LIB_DIR}/INSTALL
 	${INSTALL_DATA} ${WRKSRC}/Library/Cenon/README ${CENON_LIB_DIR}/
 .else
 	${CP} -R ${WRKSRC}/Library/Cenon ${GNUSTEP_LOCAL_ROOT}/Library/
diff --git a/graphics/cenon/pkg-plist b/graphics/cenon/pkg-plist
index 8557fffe2a56..76e31b4e42d2 100644
--- a/graphics/cenon/pkg-plist
+++ b/graphics/cenon/pkg-plist
@@ -469,7 +469,6 @@ GNUstep/Local/Applications/Cenon.app/Resources/typeHPGL_128x128.tiff
 GNUstep/Local/Applications/Cenon.app/Resources/typeHPGL_48x48.tiff
 GNUstep/Local/Applications/Cenon.app/Resources/typePS.tiff
 GNUstep/Local/Applications/Cenon.app/stamp.make
-GNUstep/Local/Library/Cenon/._README
 GNUstep/Local/Library/Cenon/.dir.tiff
 GNUstep/Local/Library/Cenon/COPYRIGHT
 GNUstep/Local/Library/Cenon/Devices/.dir.tiff
@@ -482,90 +481,61 @@ GNUstep/Local/Library/Cenon/Devices/gerber/.dir.tiff
 GNUstep/Local/Library/Cenon/Devices/gerber/emma.dev
 GNUstep/Local/Library/Cenon/Devices/gerber/emma.tab
 GNUstep/Local/Library/Cenon/Devices/gerber/gerber.dev
+%%FULL%%GNUstep/Local/Library/Cenon/Devices/gerber/gerber.doc
 GNUstep/Local/Library/Cenon/Devices/gerber/gerber.tab
 GNUstep/Local/Library/Cenon/Devices/gerber/mill_01.dev
 GNUstep/Local/Library/Cenon/Devices/gerber/mm_0001.dev
 GNUstep/Local/Library/Cenon/Devices/hpgl/.dir.tiff
 GNUstep/Local/Library/Cenon/Devices/hpgl/hpgl_8Pen.dev
+%%FULL%%GNUstep/Local/Library/Cenon/Devices/hpgl/hpgl_8Pen.strings
 %%FULL%%GNUstep/Local/Library/Cenon/Documentation/.dir.tiff
 %%FULL%%GNUstep/Local/Library/Cenon/Documentation/SinkingMetrics.cenon/document
-%%FULL%%GNUstep/Local/Library/Cenon/Documentation/SinkingMetrics.cenon/output
 %%FULL%%GNUstep/Local/Library/Cenon/Examples/.dir.tiff
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/.dir.tiff
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/Apple.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/Bat.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/Ducks_30x20.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/Heart.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/HighTension.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/Monimaus.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/Mosquito_3mm.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/PickOut/Eagle.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/PickOut/Stempel.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/PickOut/Times24pt.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/Rose.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/logopilot.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/AI-3/vhf_Logo.ai
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/DXF/.dir.tiff
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/DXF/bleistift.dxf
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/DXF/columbia.dxf
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/DXF/pleuel.dxf
 %%FULL%%GNUstep/Local/Library/Cenon/Examples/Gerber/.dir.tiff
 %%FULL%%GNUstep/Local/Library/Cenon/Examples/Gerber/cpu.ger
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/HPGL/.dir.tiff
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/HPGL/zztop.hgl
 %%FULL%%GNUstep/Local/Library/Cenon/Examples/Images/Medicine.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/Images/Relief/Shading.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/Images/Relief/Sphere.tiff
 %%FULL%%GNUstep/Local/Library/Cenon/Examples/Images/Vamp.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/.dir.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo/contour.eps
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo/demo.eps
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo/nutzen/contour.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo/nutzen/layout.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo/nutzen/nutzen.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo/nutzen/rubout.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo/nutzen/text.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo/rubout.eps
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo/text.eps
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo1/1.eps
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo1/2.eps
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo1/2.ger
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo1/contour.eps
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/PCB/Demo1/sm3000.drl
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/.dir.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/Ausspitzen/Eagle.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/Ausspitzen/Stempel.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/Ausspitzen/Times24pt.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/Ducks_30x20.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/HighTension.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/Hochspannung.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/Monimaus.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/Mosquito_3mm.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/NeXT_Logo.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/apple.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/bat.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/chinese.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/heart.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/logopilot.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/rose.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ai/vhf_Logo.ai
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/dxf/.dir.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/dxf/bleistift.dxf
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/dxf/columbia.dxf
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/dxf/pleuel.dxf
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/hpgl/.dir.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/hpgl/zztop.hgl
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/pdf/Cenon.pdf
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ps/.dir.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ps/Teddy.eps
-%%FULL%%GNUstep/Local/Library/Cenon/Examples/ps/skala.eps
-%%FULL%%GNUstep/Local/Library/Cenon/INSTALL
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/PDF/Cenon.pdf
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/PS/.dir.tiff
+%%FULL%%GNUstep/Local/Library/Cenon/Examples/PS/skala.eps
 GNUstep/Local/Library/Cenon/Projects/.dir.tiff
 GNUstep/Local/Library/Cenon/Projects/Cenon.cenon/document
 GNUstep/Local/Library/Cenon/Projects/Cenon.cenon/output
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/.dir.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/CAM2000.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/CAM2000_.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Catalogue1.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Catalogue1_.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Catalogue2.tiff
+%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/CAM1525.jpg
+%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Catalogue1.jpg
+%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Catalogue2.jpg
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Catalogue2_.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Magazine.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Magazine_.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Remote.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Remote_.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Spindle.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Spindle_.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Thread.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Thread_.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Vacuum.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Vacuum_.tiff
+%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Magazine.jpg
+%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Remote.jpg
+%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Spindle.jpg
+%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Thread.jpg
+%%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/Vacuum.jpg
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon/document
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/vhf-interservice.cenon/document
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/DTP/vhf-interservice.cenon/output
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/Ducks.cenon/document
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/Ducks.cenon/output
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/FloorPlan.cenon/document
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/Models/.dir.tiff
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/Models/Ant.cenon/document
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/Models/Ant.cenon/output
@@ -587,7 +557,7 @@ GNUstep/Local/Library/Cenon/Projects/Cenon.cenon/output
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/MultiPage.cenon/Inspector_t.tiff
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/MultiPage.cenon/LayerDetails.tiff
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/MultiPage.cenon/LayerDetails_t.tiff
-%%FULL%%GNUstep/Local/Library/Cenon/Projects/MultiPage.cenon/Textbox.tiff
+%%FULL%%GNUstep/Local/Library/Cenon/Projects/MultiPage.cenon/TemplateString.tiff
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/MultiPage.cenon/document
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/NoSmoking/.dir.tiff
 %%FULL%%GNUstep/Local/Library/Cenon/Projects/NoSmoking/NoSmoking.cenon/document
@@ -652,24 +622,18 @@ GNUstep/Local/Tools/Cenon
 %%FULL%%@dirrm GNUstep/Local/Library/Cenon/Projects/Models/Butterfly.cenon
 %%FULL%%@dirrm GNUstep/Local/Library/Cenon/Projects/Models/Ant.cenon
 %%FULL%%@dirrm GNUstep/Local/Library/Cenon/Projects/Models
-%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Projects/FloorPlan.cenon
 %%FULL%%@dirrm GNUstep/Local/Library/Cenon/Projects/Ducks.cenon
 %%FULL%%@dirrm GNUstep/Local/Library/Cenon/Projects/DTP/vhf-interservice.cenon
 %%FULL%%@dirrm GNUstep/Local/Library/Cenon/Projects/DTP/Advertising.cenon
 %%FULL%%@dirrm GNUstep/Local/Library/Cenon/Projects/DTP
-%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/ps
-%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/pdf
-%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/hpgl
-%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/dxf
-%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/ai/Ausspitzen
-%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/ai
-%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/PCB/Demo1
-%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/PCB/Demo/nutzen
-%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/PCB/Demo
-%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/PCB
-%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/Images/Relief
+%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/PS
+%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/PDF
 %%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/Images
+%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/HPGL
 %%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/Gerber
+%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/DXF
+%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/AI-3/PickOut
+%%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples/AI-3
 %%FULL%%@dirrm GNUstep/Local/Library/Cenon/Examples
 %%FULL%%@dirrm GNUstep/Local/Library/Cenon/Documentation/SinkingMetrics.cenon
 %%FULL%%@dirrm GNUstep/Local/Library/Cenon/Documentation