Index: trunk/src_plugins/cam/cam.conf
===================================================================
--- trunk/src_plugins/cam/cam.conf	(revision 24298)
+++ trunk/src_plugins/cam/cam.conf	(revision 24299)
@@ -19,8 +19,6 @@
 						write %base%.pls=bottom-silk
 						write %base%.stc=top-mask
 						write %base%.sts=bottom-mask
-						write %base%.drd=virtual(purpose=pdrill)
-						write %base%.dru=virtual(purpose=udrill)
 						write %base%.crc=top-paste
 						write %base%.crs=bottom-paste
 						write %base%.oln=boundary
@@ -27,7 +25,9 @@
 						write %base%.ast=top-virtual(purpose=assy)
 						write %base%.asb=bottom-virtual(purpose=assy)
 						write %base%.fab=virtual(purpose=fab)
-						
+						plugin excellon
+						write %base%.drd=virtual(purpose=pdrill)
+						write %base%.dru=virtual(purpose=udrill)
 					}
 					{gerber:fixed_topbottom} {
 						desc gerber export almost compatible with old 'fixed' naming style, with special casing top and bottom copper
@@ -39,8 +39,6 @@
 						write %base%.bottomsilk.gbr=bottom-silk
 						write %base%.topmask.gbr=top-mask
 						write %base%.bottommask.gbr=bottom-mask
-						write %base%.plated-drill.cnc=virtual(purpose=pdrill)
-						write %base%.unplated-drill.cnc=virtual(purpose=udrill)
 						write %base%.toppaste.gbr=top-paste
 						write %base%.bottompaste.gbr=bottom-paste
 						write %base%.outline.gbr=boundary
@@ -47,6 +45,9 @@
 						write %base%.topassy.gbr=top-virtual(purpose=assy)
 						write %base%.bottomassy.gbr=bottom-virtual(purpose=assy)
 						write %base%.fab.gbr=virtual(purpose=fab)
+						plugin excellon
+						write %base%.plated-drill.cnc=virtual(purpose=pdrill)
+						write %base%.unplated-drill.cnc=virtual(purpose=udrill)
 					}
 					{gerber:fixed} {
 						desc gerber export almost compatible with old 'fixed' - top and bottom copper are not special cased but numbered from group0 (top)
@@ -58,8 +59,6 @@
 						write %base%.bottomsilk.gbr=bottom-silk
 						write %base%.topmask.gbr=top-mask
 						write %base%.bottommask.gbr=bottom-mask
-						write %base%.plated-drill.cnc=virtual(purpose=pdrill)
-						write %base%.unplated-drill.cnc=virtual(purpose=udrill)
 						write %base%.toppaste.gbr=top-paste
 						write %base%.bottompaste.gbr=bottom-paste
 						write %base%.outline.gbr=boundary
@@ -66,6 +65,9 @@
 						write %base%.topassy.gbr=top-virtual(purpose=assy)
 						write %base%.bottomassy.gbr=bottom-virtual(purpose=assy)
 						write %base%.fab.gbr=virtual(purpose=fab)
+						plugin excellon
+						write %base%.plated-drill.cnc=virtual(purpose=pdrill)
+						write %base%.unplated-drill.cnc=virtual(purpose=udrill)
 					}
 					{gerber:universal} {
 						desc gerber export compatible with old 'univeral' include group name and suffix with eagle-like extensions
@@ -77,12 +79,13 @@
 						write %base%.%name%.gbo=bottom-silk
 						write %base%.%name%.gts=top-mask
 						write %base%.%name%.gbs=bottom-mask
-						write %base%.drl=virtual(purpose=pdrill)
-						write %base%_NPTH.drl=virtual(purpose=udrill)
 						write %base%.%name%.gtp=top-paste
 						write %base%.%name%.gbp=bottom-paste
 						write %base%.%name%.gko=boundary
 						write %base%.fab=virtual(purpose=fab)
+						plugin excellon
+						write %base%.drl=virtual(purpose=pdrill)
+						write %base%_NPTH.drl=virtual(purpose=udrill)
 					}
 					{gerber:OSH_Park} {
 						desc gerber export compatible with OSH Park's recommendations
@@ -94,7 +97,6 @@
 						write %base%.gbo=bottom-silk
 						write %base%.gts=top-mask
 						write %base%.gbs=bottom-mask
-						write %base%.xln=virtual(purpose=pdrill),virtual(purpose=udrill)
 						write %base%.gtp=top-paste
 						write %base%.gbp=bottom-paste
 						write %base%.gki=boundary
@@ -101,6 +103,8 @@
 						write %base%.ast=top-virtual(purpose=assy)
 						write %base%.asb=bottom-virtual(purpose=assy)
 						write %base%.fab=virtual(purpose=fab)
+						plugin excellon
+						write %base%.xln=virtual(purpose=pdrill),virtual(purpose=udrill)
 					}
 					{gerber:orcad} {
 						desc gerber export compatible with Orcad's gerber file names
@@ -112,8 +116,6 @@
 						write %base%.ssb=bottom-silk
 						write %base%.smt=top-mask
 						write %base%.smb=bottom-mask
-						write %base%.thruhole.tap=virtual(purpose=pdrill)
-						write %base%.thruhole-unplated.tap=virtual(purpose=udrill)
 #						write %base%.spt=top-paste
 #						write %base%.spb=bottom-paste
 						write %base%.fab=boundary
@@ -120,6 +122,9 @@
 #						write %base%.ast=top-virtual(purpose=assy)
 #						write %base%.asb=bottom-virtual(purpose=assy)
 #						write %base%.fab.gbr=virtual(purpose=fab)
+						plugin excellon
+						write %base%.thruhole.tap=virtual(purpose=pdrill)
+						write %base%.thruhole-unplated.tap=virtual(purpose=udrill)
 					}
 				}
 			}