--- a/components/cups/cups.p5m	Thu Aug 18 21:38:10 2011 -0700
+++ b/components/cups/cups.p5m	Fri Aug 19 10:20:58 2011 +0530
@@ -153,7 +153,7 @@
 dir path=usr/share/locale/zh_CN
 dir path=usr/share/locale/zh_TW
 dir path=usr/share/man
-dir path=usr/share/man/man1cups
+dir path=usr/share/man/man1
 dir path=usr/share/man/man5
 dir path=usr/share/man/man7
 dir path=usr/share/man/man8
@@ -174,11 +174,6 @@
 
 # edited file-objects
 file group=lp mode=0640 path=etc/cups/cupsd.conf preserve=true
-file Solaris/print-service-selector mode=0555 \
-     path=lib/svc/method/print-service-selector
-file Solaris/service-selector.xml mode=0444 \
-     path=lib/svc/manifest/application/print/service-selector.xml \
-     restart_fmri=svc:/system/manifest-import:default
 file path=lib/svc/manifest/application/cups.xml mode=0444 \
      restart_fmri=svc:/system/manifest-import:default
 
@@ -186,28 +181,23 @@
 file Solaris/ManageCUPS.html mode=0444 \
      path=usr/lib/help/auths/locale/C/ManageCUPS.html
 
-# move: cancel lp lpr lpstat lpq lprm
-# from usr/bin to usr/lib/cups/bin
-file usr/bin/cancel path=usr/lib/cups/bin/cancel
-file usr/bin/lp path=usr/lib/cups/bin/lp
-file usr/bin/lpr path=usr/lib/cups/bin/lpr
-file usr/bin/lpstat path=usr/lib/cups/bin/lpstat
-file usr/bin/lpq path=usr/lib/cups/bin/lpq
-file usr/bin/lprm path=usr/lib/cups/bin/lprm
-
-# move: cupsaccept lpc lpmove lpadmin lpinfo
-# from usr/sbin to usr/lib/cups/bin
-file usr/sbin/cupsaccept path=usr/lib/cups/bin/cupsaccept
-file usr/sbin/lpc path=usr/lib/cups/bin/lpc
-file usr/sbin/lpmove path=usr/lib/cups/bin/lpmove
-file usr/sbin/lpadmin path=usr/lib/cups/bin/lpadmin
-file usr/sbin/lpinfo path=usr/lib/cups/bin/lpinfo
+file path=usr/bin/cancel
+file path=usr/bin/lp
+file path=usr/bin/lpr
+file path=usr/bin/lpstat
+file path=usr/bin/lpq
+file path=usr/bin/lprm
+file path=usr/sbin/cupsaccept
+file path=usr/sbin/lpc
+file path=usr/sbin/lpmove
+file path=usr/sbin/lpadmin
+file path=usr/sbin/lpinfo
 
 # install the desktop menu related bits
 file Solaris/desktop-print-management mode=0555 \
-     path=usr/lib/cups/bin/desktop-print-management
+     path=usr/bin/desktop-print-management
 file Solaris/desktop-print-management-applet mode=0555 \
-     path=usr/lib/cups/bin/desktop-print-management-applet
+     path=usr/bin/desktop-print-management-applet
 file Solaris/smb mode=0555 \
      path=usr/lib/cups/backend/smb
 
@@ -299,7 +289,6 @@
 file path=usr/sbin/cupsctl
 file path=usr/sbin/cupsd
 file path=usr/sbin/cupsfilter
-file path=usr/sbin/lpinfo
 file path=usr/share/cups/banners/classified
 file path=usr/share/cups/banners/confidential
 file path=usr/share/cups/banners/labeled
@@ -1135,38 +1124,37 @@
 file path=usr/share/locale/ru/cups_ru.po
 file path=usr/share/locale/sv/cups_sv.po
 file path=usr/share/locale/zh_TW/cups_zh_TW.po
-# Pages from "1" and "1m" sections should be moved to "1cups" section.
-file usr/share/man/man1/cancel.1 path=usr/share/man/man1cups/cancel.1cups
-file usr/share/man/man1/cups-config.1 path=usr/share/man/man1cups/cups-config.1cups
-file usr/share/man/man1/cupstestdsc.1 path=usr/share/man/man1cups/cupstestdsc.1cups
-file usr/share/man/man1/cupstestppd.1 path=usr/share/man/man1cups/cupstestppd.1cups
-file usr/share/man/man1/lp.1 path=usr/share/man/man1cups/lp.1cups
-file usr/share/man/man1/lpoptions.1 path=usr/share/man/man1cups/lpoptions.1cups
-file usr/share/man/man1/lppasswd.1 path=usr/share/man/man1cups/lppasswd.1cups
-file usr/share/man/man1/lpq.1 path=usr/share/man/man1cups/lpq.1cups
-file usr/share/man/man1/lpr.1 path=usr/share/man/man1cups/lpr.1cups
-file usr/share/man/man1/lprm.1 path=usr/share/man/man1cups/lprm.1cups
-file usr/share/man/man1/lpstat.1 path=usr/share/man/man1cups/lpstat.1cups
-file usr/share/man/man1/ppdc.1 path=usr/share/man/man1cups/ppdc.1cups
-file usr/share/man/man1/ppdhtml.1 path=usr/share/man/man1cups/ppdhtml.1cups
-file usr/share/man/man1/ppdi.1 path=usr/share/man/man1cups/ppdi.1cups
-file usr/share/man/man1/ppdmerge.1 path=usr/share/man/man1cups/ppdmerge.1cups
-file usr/share/man/man1/ppdpo.1 path=usr/share/man/man1cups/ppdpo.1cups
-file usr/share/man/man1m/cups-deviced.1m path=usr/share/man/man1cups/cups-deviced.1cups
-file usr/share/man/man1m/cups-driverd.1m path=usr/share/man/man1cups/cups-driverd.1cups
-file usr/share/man/man1m/cups-lpd.1m path=usr/share/man/man1cups/cups-lpd.1cups
-file usr/share/man/man1m/cups-polld.1m path=usr/share/man/man1cups/cups-polld.1cups
-file usr/share/man/man1m/cupsaccept.1m path=usr/share/man/man1cups/cupsaccept.1cups
-file usr/share/man/man1m/cupsaddsmb.1m path=usr/share/man/man1cups/cupsaddsmb.1cups
-file usr/share/man/man1m/cupsctl.1m path=usr/share/man/man1cups/cupsctl.1cups
-file usr/share/man/man1m/cupsd.1m path=usr/share/man/man1cups/cupsd.1cups
-file usr/share/man/man1m/cupsenable.1m path=usr/share/man/man1cups/cupsenable.1cups
-file usr/share/man/man1m/cupsfilter.1m path=usr/share/man/man1cups/cupsfilter.1cups
-file usr/share/man/man1m/lpadmin.1m path=usr/share/man/man1cups/lpadmin.1cups
-file usr/share/man/man1m/lpc.1m path=usr/share/man/man1cups/lpc.1cups
-file usr/share/man/man1m/lpinfo.1m path=usr/share/man/man1cups/lpinfo.1cups
-file usr/share/man/man1m/lpmove.1m path=usr/share/man/man1cups/lpmove.1cups
-# Pages for cups from "1m" sections should also be moved to "8" section.
+file path=usr/share/man/man1/cancel.1
+file path=usr/share/man/man1/cups-config.1
+file path=usr/share/man/man1/cupstestdsc.1
+file path=usr/share/man/man1/cupstestppd.1
+file path=usr/share/man/man1/lp.1
+file path=usr/share/man/man1/lpoptions.1
+file path=usr/share/man/man1/lppasswd.1
+file path=usr/share/man/man1/lpq.1
+file path=usr/share/man/man1/lpr.1
+file path=usr/share/man/man1/lprm.1
+file path=usr/share/man/man1/lpstat.1
+file path=usr/share/man/man1/ppdc.1
+file path=usr/share/man/man1/ppdhtml.1
+file path=usr/share/man/man1/ppdi.1
+file path=usr/share/man/man1/ppdmerge.1
+file path=usr/share/man/man1/ppdpo.1
+file path=usr/share/man/man1m/cups-deviced.1m
+file path=usr/share/man/man1m/cups-driverd.1m
+file path=usr/share/man/man1m/cups-lpd.1m
+file path=usr/share/man/man1m/cups-polld.1m 
+file path=usr/share/man/man1m/cupsaccept.1m
+file path=usr/share/man/man1m/cupsaddsmb.1m
+file path=usr/share/man/man1m/cupsctl.1m
+file path=usr/share/man/man1m/cupsd.1m
+file path=usr/share/man/man1m/cupsenable.1m
+file path=usr/share/man/man1m/cupsfilter.1m
+file path=usr/share/man/man1m/lpadmin.1m
+file path=usr/share/man/man1m/lpc.1m
+file path=usr/share/man/man1m/lpinfo.1m
+file path=usr/share/man/man1m/lpmove.1m
+# Pages for cups from "1m" sections should also be copied to "8" section.
 file usr/share/man/man1m/cups-deviced.1m path=usr/share/man/man8/cups-deviced.8
 file usr/share/man/man1m/cups-driverd.1m path=usr/share/man/man8/cups-driverd.8
 file usr/share/man/man1m/cups-lpd.1m path=usr/share/man/man8/cups-lpd.8
@@ -1205,16 +1193,18 @@
 link path=usr/lib/libcupsmime.so target=libcupsmime.so.1
 link path=usr/lib/libcupsppdc.so target=libcupsppdc.so.1
 
-link path=usr/lib/cups/bin/accept target=cupsaccept
-link path=usr/lib/cups/bin/cupsdisable target=cupsaccept
-link path=usr/lib/cups/bin/cupsenable target=cupsaccept
-link path=usr/lib/cups/bin/cupsreject target=cupsaccept
-link path=usr/lib/cups/bin/reject target=cupsaccept
+link path=usr/sbin/accept target=cupsaccept
+link path=usr/sbin/cupsdisable target=cupsaccept
+link path=usr/bin/disable target=../sbin/cupsaccept
+link path=usr/sbin/cupsenable target=cupsaccept
+link path=usr/bin/enable target=../sbin/cupsaccept
+link path=usr/sbin/cupsreject target=cupsaccept
+link path=usr/sbin/reject target=cupsaccept
 
-link path=usr/share/man/man1cups/accept.1cups target=cupsaccept.1cups
-link path=usr/share/man/man1cups/cupsdisable.1cups target=cupsenable.1cups
-link path=usr/share/man/man1cups/cupsreject.1cups target=cupsaccept.1cups
-link path=usr/share/man/man1cups/reject.1cups target=cupsaccept.1cups
+link path=usr/share/man/man1/accept.1 target=../man1m/cupsaccept.1m
+link path=usr/share/man/man1/cupsdisable.1 target=../man1m/cupsenable.1m
+link path=usr/share/man/man1/cupsreject.1 target=../man1m/cupsaccept.1m
+link path=usr/share/man/man1/reject.1 target=../man1m/cupsaccept.1m
 
 legacy pkg=SUNWcupsr \
        desc="Common Unix Print System v1.4 (root)" \