summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Makefile.autotools.in33
-rw-r--r--package/x11r7/libxcb/libxcb.mk2
-rw-r--r--package/x11r7/openchrome/openchrome.mk2
-rw-r--r--package/x11r7/pthread-stubs/pthread-stubs.mk2
-rw-r--r--package/x11r7/xapp_appres/xapp_appres.mk2
-rw-r--r--package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk2
-rw-r--r--package/x11r7/xapp_beforelight/xapp_beforelight.mk2
-rw-r--r--package/x11r7/xapp_bitmap/xapp_bitmap.mk2
-rw-r--r--package/x11r7/xapp_editres/xapp_editres.mk2
-rw-r--r--package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk2
-rw-r--r--package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk2
-rw-r--r--package/x11r7/xapp_fstobdf/xapp_fstobdf.mk2
-rw-r--r--package/x11r7/xapp_iceauth/xapp_iceauth.mk2
-rw-r--r--package/x11r7/xapp_ico/xapp_ico.mk2
-rw-r--r--package/x11r7/xapp_lbxproxy/xapp_lbxproxy.mk2
-rw-r--r--package/x11r7/xapp_listres/xapp_listres.mk2
-rw-r--r--package/x11r7/xapp_luit/xapp_luit.mk2
-rw-r--r--package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk2
-rw-r--r--package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk2
-rw-r--r--package/x11r7/xapp_oclock/xapp_oclock.mk2
-rw-r--r--package/x11r7/xapp_proxymngr/xapp_proxymngr.mk2
-rw-r--r--package/x11r7/xapp_rgb/xapp_rgb.mk2
-rw-r--r--package/x11r7/xapp_rstart/xapp_rstart.mk2
-rw-r--r--package/x11r7/xapp_scripts/xapp_scripts.mk2
-rw-r--r--package/x11r7/xapp_sessreg/xapp_sessreg.mk2
-rw-r--r--package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk2
-rw-r--r--package/x11r7/xapp_showfont/xapp_showfont.mk2
-rw-r--r--package/x11r7/xapp_smproxy/xapp_smproxy.mk2
-rw-r--r--package/x11r7/xapp_twm/xapp_twm.mk2
-rw-r--r--package/x11r7/xapp_viewres/xapp_viewres.mk2
-rw-r--r--package/x11r7/xapp_x11perf/xapp_x11perf.mk2
-rw-r--r--package/x11r7/xapp_xauth/xapp_xauth.mk2
-rw-r--r--package/x11r7/xapp_xbiff/xapp_xbiff.mk2
-rw-r--r--package/x11r7/xapp_xcalc/xapp_xcalc.mk2
-rw-r--r--package/x11r7/xapp_xclipboard/xapp_xclipboard.mk2
-rw-r--r--package/x11r7/xapp_xclock/xapp_xclock.mk2
-rw-r--r--package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk2
-rw-r--r--package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk2
-rw-r--r--package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk2
-rw-r--r--package/x11r7/xapp_xditview/xapp_xditview.mk2
-rw-r--r--package/x11r7/xapp_xdm/xapp_xdm.mk2
-rw-r--r--package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk2
-rw-r--r--package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk2
-rw-r--r--package/x11r7/xapp_xedit/xapp_xedit.mk2
-rw-r--r--package/x11r7/xapp_xev/xapp_xev.mk2
-rw-r--r--package/x11r7/xapp_xeyes/xapp_xeyes.mk2
-rw-r--r--package/x11r7/xapp_xf86dga/xapp_xf86dga.mk2
-rw-r--r--package/x11r7/xapp_xfd/xapp_xfd.mk2
-rw-r--r--package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk2
-rw-r--r--package/x11r7/xapp_xfontsel/xapp_xfontsel.mk2
-rw-r--r--package/x11r7/xapp_xfs/xapp_xfs.mk2
-rw-r--r--package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk2
-rw-r--r--package/x11r7/xapp_xfwp/xapp_xfwp.mk2
-rw-r--r--package/x11r7/xapp_xgamma/xapp_xgamma.mk2
-rw-r--r--package/x11r7/xapp_xgc/xapp_xgc.mk2
-rw-r--r--package/x11r7/xapp_xhost/xapp_xhost.mk2
-rw-r--r--package/x11r7/xapp_xinit/xapp_xinit.mk2
-rw-r--r--package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk2
-rw-r--r--package/x11r7/xapp_xkbevd/xapp_xkbevd.mk2
-rw-r--r--package/x11r7/xapp_xkbprint/xapp_xkbprint.mk2
-rw-r--r--package/x11r7/xapp_xkbutils/xapp_xkbutils.mk2
-rw-r--r--package/x11r7/xapp_xkill/xapp_xkill.mk2
-rw-r--r--package/x11r7/xapp_xload/xapp_xload.mk2
-rw-r--r--package/x11r7/xapp_xlogo/xapp_xlogo.mk2
-rw-r--r--package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk2
-rw-r--r--package/x11r7/xapp_xlsclients/xapp_xlsclients.mk2
-rw-r--r--package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk2
-rw-r--r--package/x11r7/xapp_xmag/xapp_xmag.mk2
-rw-r--r--package/x11r7/xapp_xmessage/xapp_xmessage.mk2
-rw-r--r--package/x11r7/xapp_xmh/xapp_xmh.mk2
-rw-r--r--package/x11r7/xapp_xmodmap/xapp_xmodmap.mk2
-rw-r--r--package/x11r7/xapp_xmore/xapp_xmore.mk2
-rw-r--r--package/x11r7/xapp_xphelloworld/xapp_xphelloworld.mk2
-rw-r--r--package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk2
-rw-r--r--package/x11r7/xapp_xpr/xapp_xpr.mk2
-rw-r--r--package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk2
-rw-r--r--package/x11r7/xapp_xprop/xapp_xprop.mk2
-rw-r--r--package/x11r7/xapp_xrandr/xapp_xrandr.mk2
-rw-r--r--package/x11r7/xapp_xrdb/xapp_xrdb.mk2
-rw-r--r--package/x11r7/xapp_xrefresh/xapp_xrefresh.mk2
-rw-r--r--package/x11r7/xapp_xrx/xapp_xrx.mk2
-rw-r--r--package/x11r7/xapp_xset/xapp_xset.mk2
-rw-r--r--package/x11r7/xapp_xsetmode/xapp_xsetmode.mk2
-rw-r--r--package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk2
-rw-r--r--package/x11r7/xapp_xsetroot/xapp_xsetroot.mk2
-rw-r--r--package/x11r7/xapp_xsm/xapp_xsm.mk2
-rw-r--r--package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk2
-rw-r--r--package/x11r7/xapp_xtrap/xapp_xtrap.mk2
-rw-r--r--package/x11r7/xapp_xvidtune/xapp_xvidtune.mk2
-rw-r--r--package/x11r7/xapp_xvinfo/xapp_xvinfo.mk2
-rw-r--r--package/x11r7/xapp_xwd/xapp_xwd.mk2
-rw-r--r--package/x11r7/xapp_xwininfo/xapp_xwininfo.mk2
-rw-r--r--package/x11r7/xapp_xwud/xapp_xwud.mk2
-rw-r--r--package/x11r7/xcb-proto/xcb-proto.mk2
-rw-r--r--package/x11r7/xcb-util/xcb-util.mk2
-rw-r--r--package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk2
-rw-r--r--package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-sunbw2/xdriver_xf86-video-sunbw2.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk2
-rw-r--r--package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk2
-rw-r--r--package/x11r7/xfont_encodings/xfont_encodings.mk2
-rw-r--r--package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk2
-rw-r--r--package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk2
-rw-r--r--package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk2
-rw-r--r--package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk2
-rw-r--r--package/x11r7/xlib_libFS/xlib_libFS.mk2
-rw-r--r--package/x11r7/xlib_libICE/xlib_libICE.mk2
-rw-r--r--package/x11r7/xlib_libSM/xlib_libSM.mk2
-rw-r--r--package/x11r7/xlib_libX11/xlib_libX11.mk2
-rw-r--r--package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk2
-rw-r--r--package/x11r7/xlib_libXTrap/xlib_libXTrap.mk2
-rw-r--r--package/x11r7/xlib_libXau/xlib_libXau.mk2
-rw-r--r--package/x11r7/xlib_libXaw/xlib_libXaw.mk2
-rw-r--r--package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk2
-rw-r--r--package/x11r7/xlib_libXcursor/xlib_libXcursor.mk2
-rw-r--r--package/x11r7/xlib_libXdamage/xlib_libXdamage.mk2
-rw-r--r--package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk2
-rw-r--r--package/x11r7/xlib_libXevie/xlib_libXevie.mk2
-rw-r--r--package/x11r7/xlib_libXext/xlib_libXext.mk2
-rw-r--r--package/x11r7/xlib_libXfixes/xlib_libXfixes.mk2
-rw-r--r--package/x11r7/xlib_libXfont/xlib_libXfont.mk2
-rw-r--r--package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk2
-rw-r--r--package/x11r7/xlib_libXft/xlib_libXft.mk2
-rw-r--r--package/x11r7/xlib_libXi/xlib_libXi.mk2
-rw-r--r--package/x11r7/xlib_libXinerama/xlib_libXinerama.mk2
-rw-r--r--package/x11r7/xlib_libXmu/xlib_libXmu.mk2
-rw-r--r--package/x11r7/xlib_libXp/xlib_libXp.mk2
-rw-r--r--package/x11r7/xlib_libXpm/xlib_libXpm.mk2
-rw-r--r--package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk2
-rw-r--r--package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk2
-rw-r--r--package/x11r7/xlib_libXrandr/xlib_libXrandr.mk2
-rw-r--r--package/x11r7/xlib_libXrender/xlib_libXrender.mk2
-rw-r--r--package/x11r7/xlib_libXres/xlib_libXres.mk2
-rw-r--r--package/x11r7/xlib_libXt/xlib_libXt.mk2
-rw-r--r--package/x11r7/xlib_libXtst/xlib_libXtst.mk2
-rw-r--r--package/x11r7/xlib_libXv/xlib_libXv.mk2
-rw-r--r--package/x11r7/xlib_libXvMC/xlib_libXvMC.mk2
-rw-r--r--package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk2
-rw-r--r--package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk2
-rw-r--r--package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk2
-rw-r--r--package/x11r7/xlib_libdmx/xlib_libdmx.mk2
-rw-r--r--package/x11r7/xlib_libfontenc/xlib_libfontenc.mk2
-rw-r--r--package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk2
-rw-r--r--package/x11r7/xlib_liboldX/xlib_liboldX.mk2
-rw-r--r--package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk2
-rw-r--r--package/x11r7/xlib_libxkbui/xlib_libxkbui.mk2
-rw-r--r--package/x11r7/xlib_xtrans/xlib_xtrans.mk2
-rw-r--r--package/x11r7/xproto_applewmproto/xproto_applewmproto.mk2
-rw-r--r--package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk2
-rw-r--r--package/x11r7/xproto_compositeproto/xproto_compositeproto.mk2
-rw-r--r--package/x11r7/xproto_damageproto/xproto_damageproto.mk2
-rw-r--r--package/x11r7/xproto_dmxproto/xproto_dmxproto.mk2
-rw-r--r--package/x11r7/xproto_evieext/xproto_evieext.mk2
-rw-r--r--package/x11r7/xproto_fixesproto/xproto_fixesproto.mk2
-rw-r--r--package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk2
-rw-r--r--package/x11r7/xproto_fontsproto/xproto_fontsproto.mk2
-rw-r--r--package/x11r7/xproto_glproto/xproto_glproto.mk2
-rw-r--r--package/x11r7/xproto_inputproto/xproto_inputproto.mk2
-rw-r--r--package/x11r7/xproto_kbproto/xproto_kbproto.mk2
-rw-r--r--package/x11r7/xproto_printproto/xproto_printproto.mk2
-rw-r--r--package/x11r7/xproto_randrproto/xproto_randrproto.mk2
-rw-r--r--package/x11r7/xproto_recordproto/xproto_recordproto.mk2
-rw-r--r--package/x11r7/xproto_renderproto/xproto_renderproto.mk2
-rw-r--r--package/x11r7/xproto_resourceproto/xproto_resourceproto.mk2
-rw-r--r--package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk2
-rw-r--r--package/x11r7/xproto_trapproto/xproto_trapproto.mk2
-rw-r--r--package/x11r7/xproto_videoproto/xproto_videoproto.mk2
-rw-r--r--package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk2
-rw-r--r--package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk2
-rw-r--r--package/x11r7/xproto_xextproto/xproto_xextproto.mk2
-rw-r--r--package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk2
-rw-r--r--package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk2
-rw-r--r--package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk2
-rw-r--r--package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk2
-rw-r--r--package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk2
-rw-r--r--package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk2
-rw-r--r--package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk2
-rw-r--r--package/x11r7/xproto_xproto/xproto_xproto.mk2
-rw-r--r--package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk2
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk2
-rw-r--r--package/x11r7/xutil_makedepend/xutil_makedepend.mk2
-rw-r--r--package/x11r7/xutil_util-macros/xutil_util-macros.mk2
249 files changed, 262 insertions, 267 deletions
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 944a5824d..4205b2dfe 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -58,6 +58,8 @@
# FOO_SUBDIR [default empty]
# relative path in the package source from which to run configure and
# make
+# FOO_DIR_PREFIX [default empty]
+# toplevel relative path to package *.mk file and corresponding patches
#
## The following variables contain hook target names
## by default they do nothing, they can be overriden in package makefiles
@@ -151,23 +153,13 @@ $(BUILD_DIR)/%/.stamp_patched:
$(call MESSAGE,"Patching")
$(if $($(PKG)_PATCH),toolchain/patch-kernel.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
$(Q)(\
- if test -d package/$($(PKG)_NAME) ; then \
- if test "$(wildcard package/$($(PKG)_NAME)/$(NAMEVER)*.patch)" ; then \
- toolchain/patch-kernel.sh $(@D) package/$($(PKG)_NAME) $(NAMEVER)\*.patch || exit 1 ; \
+ if test -d $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) ; then \
+ if test "$(wildcard $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER)*.patch)" ; then \
+ toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch || exit 1 ; \
else \
- toolchain/patch-kernel.sh $(@D) package/$($(PKG)_NAME) $($(PKG)_NAME)\*.patch || exit 1 ; \
- if test -d package/$($(PKG)_NAME)/$(NAMEVER) ; then \
- toolchain/patch-kernel.sh $(@D) package/$($(PKG)_NAME)/$(NAMEVER) \*.patch || exit 1 ; \
- fi; \
- fi; \
- else \
- echo "This must be wrong. Why do you need to special-case _any_ package here? Skipping until this is resolved properly."; \
- if false && test "$(wildcard package/x11r7/$($(PKG)_NAME)/$(NAMEVER)*.patch)" ; then \
- toolchain/patch-kernel.sh $(@D) package/x11r7/$($(PKG)_NAME) $(NAMEVER)\*.patch || exit 1 ; \
- else \
- toolchain/patch-kernel.sh $(@D) package/x11r7/$($(PKG)_NAME) $($(PKG)_NAME)\*.patch || exit 1 ; \
- if test -d package/x11r7/$($(PKG)_NAME)/$(NAMEVER) ; then \
- toolchain/patch-kernel.sh $(@D) package/x11r7/$($(PKG)_NAME)/$(NAMEVER) \*.patch || exit 1 ; \
+ toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $($(PKG)_NAME)\*.patch || exit 1 ; \
+ if test -d package/$($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER) ; then \
+ toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER) \*.patch || exit 1 ; \
fi; \
fi; \
fi; \
@@ -258,15 +250,17 @@ $(BUILD_DIR)/%/.stamp_dircleaned:
################################################################################
# AUTOTARGETS -- the target generator macro; define a set of human-readable
# make targets, stamps, and default per-package variables.
-# Argument 1 is the (lowercase) package name.
+# Argument 1 is the package directory prefix.
+# Argument 2 is the (lowercase) package name.
################################################################################
define AUTOTARGETS
-$(call AUTOTARGETS_INNER,$(1),$(call UPPERCASE,$(1)))
+$(call AUTOTARGETS_INNER,$(2),$(call UPPERCASE,$(2)),$(1))
endef
# AUTOTARGETS_INNER -- does the job for AUTOTARGETS; argument 1 is the
-# lowercase package name, argument 2 the uppercase package name
+# lowercase package name, argument 2 the uppercase package name,
+# argument 3 the package directory prefix
define AUTOTARGETS_INNER
# define package-specific variables to default values
@@ -290,6 +284,7 @@ $(2)_CLEAN_OPT ?= clean
$(2)_UNINSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) uninstall
$(2)_UNINSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) uninstall
$(2)_SUBDIR ?=
+$(2)_DIR_PREFIX = $(if $(3),$(3),$(TOP_SRCDIR)/package)
# define sub-target stamps
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 79888d95d..a0581625a 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -13,5 +13,5 @@ LIBXCB_AUTORECONF = YES
LIBXCB_DEPENDENCIES = pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau
LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
-$(eval $(call AUTOTARGETS,libxcb))
+$(eval $(call AUTOTARGETS,package/x11r7,libxcb))
diff --git a/package/x11r7/openchrome/openchrome.mk b/package/x11r7/openchrome/openchrome.mk
index e84d13e1e..745defacb 100644
--- a/package/x11r7/openchrome/openchrome.mk
+++ b/package/x11r7/openchrome/openchrome.mk
@@ -12,4 +12,4 @@ OPENCHROME_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xp
OPENCHROME_AUTORECONF = YES
OPENCHROME_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,openchrome))
+$(eval $(call AUTOTARGETS,package/x11r7,openchrome))
diff --git a/package/x11r7/pthread-stubs/pthread-stubs.mk b/package/x11r7/pthread-stubs/pthread-stubs.mk
index 33384b049..aa7b8a868 100644
--- a/package/x11r7/pthread-stubs/pthread-stubs.mk
+++ b/package/x11r7/pthread-stubs/pthread-stubs.mk
@@ -10,5 +10,5 @@ PTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
PTHREAD_STUBS_DEPENDENCIES = uclibc
PTHREAD_STUBS_INSTALL_STAGING = YES
-$(eval $(call AUTOTARGETS,pthread-stubs))
+$(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs))
diff --git a/package/x11r7/xapp_appres/xapp_appres.mk b/package/x11r7/xapp_appres/xapp_appres.mk
index 090f2a704..a079dd990 100644
--- a/package/x11r7/xapp_appres/xapp_appres.mk
+++ b/package/x11r7/xapp_appres/xapp_appres.mk
@@ -10,4 +10,4 @@ XAPP_APPRES_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_APPRES_AUTORECONF = YES
XAPP_APPRES_DEPENDENCIES = xlib_libX11 xlib_libXt
-$(eval $(call AUTOTARGETS,xapp_appres))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_appres))
diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
index fbbf08400..b2ba9241c 100644
--- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
+++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -10,4 +10,4 @@ XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_BDFTOPCF_AUTORECONF = YES
XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont
-$(eval $(call AUTOTARGETS,xapp_bdftopcf))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_bdftopcf))
diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
index a3f557623..e16f64b61 100644
--- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk
+++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
@@ -10,4 +10,4 @@ XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_BEFORELIGHT_AUTORECONF = YES
XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt
-$(eval $(call AUTOTARGETS,xapp_beforelight))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_beforelight))
diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
index 6ee408192..da5527477 100644
--- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk
+++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
@@ -10,4 +10,4 @@ XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_BITMAP_AUTORECONF = YES
XAPP_BITMAP_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps
-$(eval $(call AUTOTARGETS,xapp_bitmap))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_bitmap))
diff --git a/package/x11r7/xapp_editres/xapp_editres.mk b/package/x11r7/xapp_editres/xapp_editres.mk
index c5c5df780..5dfe57f3d 100644
--- a/package/x11r7/xapp_editres/xapp_editres.mk
+++ b/package/x11r7/xapp_editres/xapp_editres.mk
@@ -10,4 +10,4 @@ XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_EDITRES_AUTORECONF = YES
XAPP_EDITRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
-$(eval $(call AUTOTARGETS,xapp_editres))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_editres))
diff --git a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
index 08cd78347..bc5729ce2 100644
--- a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
+++ b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
@@ -10,4 +10,4 @@ XAPP_FONTTOSFNT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_FONTTOSFNT_AUTORECONF = YES
XAPP_FONTTOSFNT_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc
-$(eval $(call AUTOTARGETS,xapp_fonttosfnt))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_fonttosfnt))
diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
index 20a6c4e0e..c3efd27ed 100644
--- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
+++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
@@ -10,4 +10,4 @@ XAPP_FSLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_FSLSFONTS_AUTORECONF = YES
XAPP_FSLSFONTS_DEPENDENCIES = xlib_libFS xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_fslsfonts))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_fslsfonts))
diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
index b7c436972..d570c1b7c 100644
--- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
+++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
@@ -10,4 +10,4 @@ XAPP_FSTOBDF_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_FSTOBDF_AUTORECONF = YES
XAPP_FSTOBDF_DEPENDENCIES = xlib_libFS xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_fstobdf))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_fstobdf))
diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
index 5326a93f2..c57aff912 100644
--- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk
+++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
@@ -10,4 +10,4 @@ XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_ICEAUTH_AUTORECONF = YES
XAPP_ICEAUTH_DEPENDENCIES = xlib_libICE xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_iceauth))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_iceauth))
diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk
index e99d4fac6..341b85a5d 100644
--- a/package/x11r7/xapp_ico/xapp_ico.mk
+++ b/package/x11r7/xapp_ico/xapp_ico.mk
@@ -10,4 +10,4 @@ XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_ICO_AUTORECONF = YES
XAPP_ICO_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_ico))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_ico))
diff --git a/package/x11r7/xapp_lbxproxy/xapp_lbxproxy.mk b/package/x11r7/xapp_lbxproxy/xapp_lbxproxy.mk
index 31da1e090..fe6a072c1 100644
--- a/package/x11r7/xapp_lbxproxy/xapp_lbxproxy.mk
+++ b/package/x11r7/xapp_lbxproxy/xapp_lbxproxy.mk
@@ -10,4 +10,4 @@ XAPP_LBXPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_LBXPROXY_AUTORECONF = YES
XAPP_LBXPROXY_DEPENDENCIES = xlib_libICE xlib_libX11 xlib_libXext xlib_liblbxutil xlib_xtrans xproto_xproxymanagementprotocol
-$(eval $(call AUTOTARGETS,xapp_lbxproxy))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_lbxproxy))
diff --git a/package/x11r7/xapp_listres/xapp_listres.mk b/package/x11r7/xapp_listres/xapp_listres.mk
index e5281cb2b..d85ef04cf 100644
--- a/package/x11r7/xapp_listres/xapp_listres.mk
+++ b/package/x11r7/xapp_listres/xapp_listres.mk
@@ -10,4 +10,4 @@ XAPP_LISTRES_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_LISTRES_AUTORECONF = YES
XAPP_LISTRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
-$(eval $(call AUTOTARGETS,xapp_listres))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_listres))
diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk
index c61aaf8f6..b38995a64 100644
--- a/package/x11r7/xapp_luit/xapp_luit.mk
+++ b/package/x11r7/xapp_luit/xapp_luit.mk
@@ -10,4 +10,4 @@ XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_LUIT_AUTORECONF = YES
XAPP_LUIT_DEPENDENCIES = xlib_libX11 xlib_libfontenc
-$(eval $(call AUTOTARGETS,xapp_luit))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_luit))
diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
index 9c3722250..f114e2eb6 100644
--- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -10,4 +10,4 @@ XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_MKFONTDIR_AUTORECONF = YES
XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale
-$(eval $(call AUTOTARGETS,xapp_mkfontdir))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontdir))
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index b4394dd23..24c6110db 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -10,4 +10,4 @@ XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_MKFONTSCALE_AUTORECONF = YES
XAPP_MKFONTSCALE_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc
-$(eval $(call AUTOTARGETS,xapp_mkfontscale))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontscale))
diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk
index 1c23abbf6..b2dda4b9d 100644
--- a/package/x11r7/xapp_oclock/xapp_oclock.mk
+++ b/package/x11r7/xapp_oclock/xapp_oclock.mk
@@ -10,4 +10,4 @@ XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_OCLOCK_AUTORECONF = YES
XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_oclock))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_oclock))
diff --git a/package/x11r7/xapp_proxymngr/xapp_proxymngr.mk b/package/x11r7/xapp_proxymngr/xapp_proxymngr.mk
index a9a0f8f8d..75710e0db 100644
--- a/package/x11r7/xapp_proxymngr/xapp_proxymngr.mk
+++ b/package/x11r7/xapp_proxymngr/xapp_proxymngr.mk
@@ -10,4 +10,4 @@ XAPP_PROXYMNGR_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_PROXYMNGR_AUTORECONF = YES
XAPP_PROXYMNGR_DEPENDENCIES = xlib_libICE xlib_libX11 xlib_libXt xproto_xproxymanagementprotocol
-$(eval $(call AUTOTARGETS,xapp_proxymngr))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_proxymngr))
diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk
index 588df2aa2..8d321d193 100644
--- a/package/x11r7/xapp_rgb/xapp_rgb.mk
+++ b/package/x11r7/xapp_rgb/xapp_rgb.mk
@@ -10,4 +10,4 @@ XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_RGB_AUTORECONF = YES
XAPP_RGB_DEPENDENCIES = xproto_xproto
-$(eval $(call AUTOTARGETS,xapp_rgb))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_rgb))
diff --git a/package/x11r7/xapp_rstart/xapp_rstart.mk b/package/x11r7/xapp_rstart/xapp_rstart.mk
index 375862321..c62097134 100644
--- a/package/x11r7/xapp_rstart/xapp_rstart.mk
+++ b/package/x11r7/xapp_rstart/xapp_rstart.mk
@@ -10,4 +10,4 @@ XAPP_RSTART_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_RSTART_AUTORECONF = YES
XAPP_RSTART_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_rstart))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_rstart))
diff --git a/package/x11r7/xapp_scripts/xapp_scripts.mk b/package/x11r7/xapp_scripts/xapp_scripts.mk
index 743310a82..4f9407799 100644
--- a/package/x11r7/xapp_scripts/xapp_scripts.mk
+++ b/package/x11r7/xapp_scripts/xapp_scripts.mk
@@ -10,4 +10,4 @@ XAPP_SCRIPTS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SCRIPTS_AUTORECONF = YES
XAPP_SCRIPTS_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_scripts))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_scripts))
diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index dfa8b838d..d2555e1ab 100644
--- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -10,4 +10,4 @@ XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SESSREG_AUTORECONF = YES
XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto
-$(eval $(call AUTOTARGETS,xapp_sessreg))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_sessreg))
diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
index 87911f0f6..65d70e6d6 100644
--- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
+++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
@@ -10,4 +10,4 @@ XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SETXKBMAP_AUTORECONF = YES
XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
-$(eval $(call AUTOTARGETS,xapp_setxkbmap))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_setxkbmap))
diff --git a/package/x11r7/xapp_showfont/xapp_showfont.mk b/package/x11r7/xapp_showfont/xapp_showfont.mk
index f1bb1ad89..dcbf76655 100644
--- a/package/x11r7/xapp_showfont/xapp_showfont.mk
+++ b/package/x11r7/xapp_showfont/xapp_showfont.mk
@@ -10,4 +10,4 @@ XAPP_SHOWFONT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SHOWFONT_AUTORECONF = YES
XAPP_SHOWFONT_DEPENDENCIES = xlib_libFS
-$(eval $(call AUTOTARGETS,xapp_showfont))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_showfont))
diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
index 618da55ff..aaadf35fe 100644
--- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk
+++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
@@ -10,4 +10,4 @@ XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_SMPROXY_AUTORECONF = YES
XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt
-$(eval $(call AUTOTARGETS,xapp_smproxy))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_smproxy))
diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk
index e1fca77e5..5a2cb2401 100644
--- a/package/x11r7/xapp_twm/xapp_twm.mk
+++ b/package/x11r7/xapp_twm/xapp_twm.mk
@@ -9,4 +9,4 @@ XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.bz2
XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_TWM_AUTORECONF = YES
-$(eval $(call AUTOTARGETS,xapp_twm))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_twm))
diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk
index 1cf91a470..791ba41d5 100644
--- a/package/x11r7/xapp_viewres/xapp_viewres.mk
+++ b/package/x11r7/xapp_viewres/xapp_viewres.mk
@@ -10,4 +10,4 @@ XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_VIEWRES_AUTORECONF = YES
XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,xapp_viewres))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_viewres))
diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
index 8a3ca18ca..5442caa4f 100644
--- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk
+++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
@@ -10,4 +10,4 @@ XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_X11PERF_AUTORECONF = YES
XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft
-$(eval $(call AUTOTARGETS,xapp_x11perf))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_x11perf))
diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk
index 4311898d2..7a97e01be 100644
--- a/package/x11r7/xapp_xauth/xapp_xauth.mk
+++ b/package/x11r7/xapp_xauth/xapp_xauth.mk
@@ -10,4 +10,4 @@ XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XAUTH_AUTORECONF = YES
XAPP_XAUTH_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_xauth))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xauth))
diff --git a/package/x11r7/xapp_xbiff/xapp_xbiff.mk b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
index 6ec538e22..537c4a1f7 100644
--- a/package/x11r7/xapp_xbiff/xapp_xbiff.mk
+++ b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
@@ -10,4 +10,4 @@ XAPP_XBIFF_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XBIFF_AUTORECONF = YES
XAPP_XBIFF_DEPENDENCIES = xlib_libXaw xdata_xbitmaps
-$(eval $(call AUTOTARGETS,xapp_xbiff))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xbiff))
diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
index 49962bc21..50cb46f30 100644
--- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk
+++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
@@ -10,4 +10,4 @@ XAPP_XCALC_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCALC_AUTORECONF = YES
XAPP_XCALC_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,xapp_xcalc))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xcalc))
diff --git a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
index 65a08901d..a68ecd47f 100644
--- a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
+++ b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
@@ -10,4 +10,4 @@ XAPP_XCLIPBOARD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCLIPBOARD_AUTORECONF = YES
XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,xapp_xclipboard))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xclipboard))
diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk
index a171382df..7ac798b20 100644
--- a/package/x11r7/xapp_xclock/xapp_xclock.mk
+++ b/package/x11r7/xapp_xclock/xapp_xclock.mk
@@ -10,4 +10,4 @@ XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCLOCK_AUTORECONF = YES
XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile
-$(eval $(call AUTOTARGETS,xapp_xclock))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xclock))
diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
index 66cdcff06..93f28f44f 100644
--- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
+++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
@@ -10,4 +10,4 @@ XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCMSDB_AUTORECONF = YES
XAPP_XCMSDB_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_xcmsdb))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xcmsdb))
diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index fa8b02c9f..fb14f57cb 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -10,4 +10,4 @@ XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCURSORGEN_AUTORECONF = YES
XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor
-$(eval $(call AUTOTARGETS,xapp_xcursorgen))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xcursorgen))
diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
index 98807b1b1..9c1a0d0c9 100644
--- a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
+++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
@@ -10,4 +10,4 @@ XAPP_XDBEDIZZY_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDBEDIZZY_AUTORECONF = YES
XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext xlib_libXp xlib_libXprintUtil
-$(eval $(call AUTOTARGETS,xapp_xdbedizzy))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xdbedizzy))
diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk
index 4a4a6fceb..0124996ff 100644
--- a/package/x11r7/xapp_xditview/xapp_xditview.mk
+++ b/package/x11r7/xapp_xditview/xapp_xditview.mk
@@ -10,4 +10,4 @@ XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDITVIEW_AUTORECONF = YES
XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,xapp_xditview))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xditview))
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index 2bb36490f..c0e2ac826 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -10,4 +10,4 @@ XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDM_AUTORECONF = YES
XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
-$(eval $(call AUTOTARGETS,xapp_xdm))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xdm))
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index ded013d92..b0de33058 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -10,4 +10,4 @@ XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDPYINFO_AUTORECONF = YES
XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86misc xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86miscproto xproto_xf86vidmodeproto
-$(eval $(call AUTOTARGETS,xapp_xdpyinfo))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xdpyinfo))
diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
index edd3c52f6..5a8c5f5ef 100644
--- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
+++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
@@ -10,4 +10,4 @@ XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDRIINFO_AUTORECONF = YES
XAPP_XDRIINFO_DEPENDENCIES = xlib_libX11 xproto_glproto mesa3d
-$(eval $(call AUTOTARGETS,xapp_xdriinfo))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xdriinfo))
diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk
index b959cc5d4..617d778b2 100644
--- a/package/x11r7/xapp_xedit/xapp_xedit.mk
+++ b/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -10,4 +10,4 @@ XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XEDIT_AUTORECONF = YES
XAPP_XEDIT_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil
-$(eval $(call AUTOTARGETS,xapp_xedit))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xedit))
diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
index 16dc8e7ed..d78a127c4 100644
--- a/package/x11r7/xapp_xev/xapp_xev.mk
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -10,4 +10,4 @@ XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XEV_AUTORECONF = YES
XAPP_XEV_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_xev))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xev))
diff --git a/package/x11r7/xapp_xeyes/xapp_xeyes.mk b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
index aecb66189..1ffa74e5a 100644
--- a/package/x11r7/xapp_xeyes/xapp_xeyes.mk
+++ b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
@@ -10,4 +10,4 @@ XAPP_XEYES_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XEYES_AUTORECONF = YES
XAPP_XEYES_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXt
-$(eval $(call AUTOTARGETS,xapp_xeyes))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xeyes))
diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
index 2e00c6e35..1bde4e019 100644
--- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
+++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
@@ -10,4 +10,4 @@ XAPP_XF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XF86DGA_AUTORECONF = YES
XAPP_XF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXxf86dga
-$(eval $(call AUTOTARGETS,xapp_xf86dga))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xf86dga))
diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk
index a2478110b..0e92e667d 100644
--- a/package/x11r7/xapp_xfd/xapp_xfd.mk
+++ b/package/x11r7/xapp_xfd/xapp_xfd.mk
@@ -10,4 +10,4 @@ XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XFD_AUTORECONF = YES
XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft
-$(eval $(call AUTOTARGETS,xapp_xfd))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfd))
diff --git a/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk b/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
index 4eef4297a..f841eb6e8 100644
--- a/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
+++ b/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
@@ -10,4 +10,4 @@ XAPP_XFINDPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XFINDPROXY_AUTORECONF = YES
XAPP_XFINDPROXY_DEPENDENCIES = xlib_libICE xlib_libX11 xlib_libXt
-$(eval $(call AUTOTARGETS,xapp_xfindproxy))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfindproxy))
diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
index ede4df5a4..74f75c1fd 100644
--- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
+++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
@@ -10,4 +10,4 @@ XAPP_XFONTSEL_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XFONTSEL_AUTORECONF = YES
XAPP_XFONTSEL_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,xapp_xfontsel))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfontsel))
diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk
index e22e08b93..ee7abcd06 100644
--- a/package/x11r7/xapp_xfs/xapp_xfs.mk
+++ b/package/x11r7/xapp_xfs/xapp_xfs.mk
@@ -10,4 +10,4 @@ XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XFS_AUTORECONF = YES
XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont xproto_fontsproto
-$(eval $(call AUTOTARGETS,xapp_xfs))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfs))
diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
index 01afa80d5..ad1021421 100644
--- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
+++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
@@ -10,4 +10,4 @@ XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XFSINFO_AUTORECONF = YES
XAPP_XFSINFO_DEPENDENCIES = xlib_libFS xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_xfsinfo))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfsinfo))
diff --git a/package/x11r7/xapp_xfwp/xapp_xfwp.mk b/package/x11r7/xapp_xfwp/xapp_xfwp.mk
index bafa99219..da1f6173c 100644
--- a/package/x11r7/xapp_xfwp/xapp_xfwp.mk
+++ b/package/x11r7/xapp_xfwp/xapp_xfwp.mk
@@ -10,4 +10,4 @@ XAPP_XFWP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XFWP_AUTORECONF = YES
XAPP_XFWP_DEPENDENCIES = xlib_libICE xlib_libX11 xproto_xproxymanagementprotocol
-$(eval $(call AUTOTARGETS,xapp_xfwp))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xfwp))
diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
index b3a8b80ea..b94da5cd3 100644
--- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk
+++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
@@ -10,4 +10,4 @@ XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XGAMMA_AUTORECONF = YES
XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm
-$(eval $(call AUTOTARGETS,xapp_xgamma))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xgamma))
diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk
index 6d250240d..cc6d3bb9c 100644
--- a/package/x11r7/xapp_xgc/xapp_xgc.mk
+++ b/package/x11r7/xapp_xgc/xapp_xgc.mk
@@ -10,4 +10,4 @@ XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XGC_AUTORECONF = YES
XAPP_XGC_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,xapp_xgc))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xgc))
diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk
index 69586f514..20ab43278 100644
--- a/package/x11r7/xapp_xhost/xapp_xhost.mk
+++ b/package/x11r7/xapp_xhost/xapp_xhost.mk
@@ -10,4 +10,4 @@ XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XHOST_AUTORECONF = YES
XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_xhost))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xhost))
diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk
index 2e51f2a54..50e837808 100644
--- a/package/x11r7/xapp_xinit/xapp_xinit.mk
+++ b/package/x11r7/xapp_xinit/xapp_xinit.mk
@@ -10,4 +10,4 @@ XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XINIT_AUTORECONF = YES
XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_xinit))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xinit))
diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index e455a3a16..68bbf3ad6 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -10,4 +10,4 @@ XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKBCOMP_AUTORECONF = YES
XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
-$(eval $(call AUTOTARGETS,xapp_xkbcomp))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbcomp))
diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
index f1c03065d..0886c6035 100644
--- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
+++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
@@ -10,4 +10,4 @@ XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKBEVD_AUTORECONF = YES
XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile
-$(eval $(call AUTOTARGETS,xapp_xkbevd))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbevd))
diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
index 28c5d81c0..6e99703b8 100644
--- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
+++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
@@ -10,4 +10,4 @@ XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKBPRINT_AUTORECONF = YES
XAPP_XKBPRINT_DEPENDENCIES = xlib_libxkbfile
-$(eval $(call AUTOTARGETS,xapp_xkbprint))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbprint))
diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
index ba8e8b327..2a7994c57 100644
--- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
+++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
@@ -10,4 +10,4 @@ XAPP_XKBUTILS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKBUTILS_AUTORECONF = YES
XAPP_XKBUTILS_DEPENDENCIES = xlib_libXaw xlib_libxkbfile
-$(eval $(call AUTOTARGETS,xapp_xkbutils))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkbutils))
diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk
index c939b63e3..fc8e333ec 100644
--- a/package/x11r7/xapp_xkill/xapp_xkill.mk
+++ b/package/x11r7/xapp_xkill/xapp_xkill.mk
@@ -10,4 +10,4 @@ XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XKILL_AUTORECONF = YES
XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_xkill))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xkill))
diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk
index 9e7e805e0..900a88ac1 100644
--- a/package/x11r7/xapp_xload/xapp_xload.mk
+++ b/package/x11r7/xapp_xload/xapp_xload.mk
@@ -10,4 +10,4 @@ XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLOAD_AUTORECONF = YES
XAPP_XLOAD_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,xapp_xload))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xload))
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index 60c6761d5..7253a28e6 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -10,4 +10,4 @@ XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLOGO_AUTORECONF = YES
XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender
-$(eval $(call AUTOTARGETS,xapp_xlogo))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xlogo))
diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
index d87245a70..1a675575c 100644
--- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
+++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
@@ -10,4 +10,4 @@ XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLSATOMS_AUTORECONF = YES
XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_xlsatoms))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xlsatoms))
diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
index c717b7672..113837f41 100644
--- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -10,4 +10,4 @@ XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLSCLIENTS_AUTORECONF = YES
XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_xlsclients))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xlsclients))
diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
index 6b6a03ae0..791a41be2 100644
--- a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
+++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
@@ -10,4 +10,4 @@ XAPP_XLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XLSFONTS_AUTORECONF = YES
XAPP_XLSFONTS_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_xlsfonts))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xlsfonts))
diff --git a/package/x11r7/xapp_xmag/xapp_xmag.mk b/package/x11r7/xapp_xmag/xapp_xmag.mk
index eeeb8a6d5..d0f2cac2e 100644
--- a/package/x11r7/xapp_xmag/xapp_xmag.mk
+++ b/package/x11r7/xapp_xmag/xapp_xmag.mk
@@ -10,4 +10,4 @@ XAPP_XMAG_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMAG_AUTORECONF = YES
XAPP_XMAG_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,xapp_xmag))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmag))
diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
index 31755a9f4..51f6c2120 100644
--- a/package/x11r7/xapp_xmessage/xapp_xmessage.mk
+++ b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
@@ -10,4 +10,4 @@ XAPP_XMESSAGE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMESSAGE_AUTORECONF = YES
XAPP_XMESSAGE_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,xapp_xmessage))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmessage))
diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk
index 80ed97e60..8d1af8844 100644
--- a/package/x11r7/xapp_xmh/xapp_xmh.mk
+++ b/package/x11r7/xapp_xmh/xapp_xmh.mk
@@ -10,4 +10,4 @@ XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMH_AUTORECONF = YES
XAPP_XMH_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,xapp_xmh))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmh))
diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
index 7f0146df0..5f0f8c7d7 100644
--- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
@@ -10,4 +10,4 @@ XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMODMAP_AUTORECONF = YES
XAPP_XMODMAP_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_xmodmap))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmodmap))
diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk
index 32e21cee3..6abcbfe1a 100644
--- a/package/x11r7/xapp_xmore/xapp_xmore.mk
+++ b/package/x11r7/xapp_xmore/xapp_xmore.mk
@@ -10,4 +10,4 @@ XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMORE_AUTORECONF = YES
XAPP_XMORE_DEPENDENCIES = xlib_libXprintUtil xlib_libXprintUtil
-$(eval $(call AUTOTARGETS,xapp_xmore))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmore))
diff --git a/package/x11r7/xapp_xphelloworld/xapp_xphelloworld.mk b/package/x11r7/xapp_xphelloworld/xapp_xphelloworld.mk
index 5c68df6ba..3c284916e 100644
--- a/package/x11r7/xapp_xphelloworld/xapp_xphelloworld.mk
+++ b/package/x11r7/xapp_xphelloworld/xapp_xphelloworld.mk
@@ -10,4 +10,4 @@ XAPP_XPHELLOWORLD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XPHELLOWORLD_AUTORECONF = YES
XAPP_XPHELLOWORLD_DEPENDENCIES = xlib_libXaw xlib_libXprintAppUtil xlib_libXprintUtil xlib_libXt
-$(eval $(call AUTOTARGETS,xapp_xphelloworld))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xphelloworld))
diff --git a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
index 4186f9d73..9ab2495ac 100644
--- a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
+++ b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
@@ -10,4 +10,4 @@ XAPP_XPLSPRINTERS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XPLSPRINTERS_AUTORECONF = YES
XAPP_XPLSPRINTERS_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
-$(eval $(call AUTOTARGETS,xapp_xplsprinters))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xplsprinters))
diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk
index 013845c3a..94d7c612f 100644
--- a/package/x11r7/xapp_xpr/xapp_xpr.mk
+++ b/package/x11r7/xapp_xpr/xapp_xpr.mk
@@ -10,4 +10,4 @@ XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XPR_AUTORECONF = YES
XAPP_XPR_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_xpr))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xpr))
diff --git a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
index 7218f6db6..db8a6ff9a 100644
--- a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
+++ b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
@@ -10,4 +10,4 @@ XAPP_XPREHASHPRINTERLIST_SITE = http://xorg.freedesktop.org/releases/individual/
XAPP_XPREHASHPRINTERLIST_AUTORECONF = YES
XAPP_XPREHASHPRINTERLIST_DEPENDENCIES = xlib_libX11 xlib_libXp
-$(eval $(call AUTOTARGETS,xapp_xprehashprinterlist))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xprehashprinterlist))
diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk
index 300cdd81c..ed46442d2 100644
--- a/package/x11r7/xapp_xprop/xapp_xprop.mk
+++ b/package/x11r7/xapp_xprop/xapp_xprop.mk
@@ -10,4 +10,4 @@ XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XPROP_AUTORECONF = YES
XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_xprop))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xprop))
diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
index 45c72781e..e7ef6f995 100644
--- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -11,4 +11,4 @@ XAPP_XRANDR_AUTORECONF = YES
XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11
XAPP_XRANDR_CONF_OPT = --disable-malloc0returnsnull
-$(eval $(call AUTOTARGETS,xapp_xrandr))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xrandr))
diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
index 50bda60dc..19de59e18 100644
--- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk
+++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
@@ -10,4 +10,4 @@ XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XRDB_AUTORECONF = YES
XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_xrdb))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xrdb))
diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
index 3b9e4b4e6..fd7a2eb6e 100644
--- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
+++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
@@ -10,4 +10,4 @@ XAPP_XREFRESH_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XREFRESH_AUTORECONF = YES
XAPP_XREFRESH_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_xrefresh))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xrefresh))
diff --git a/package/x11r7/xapp_xrx/xapp_xrx.mk b/package/x11r7/xapp_xrx/xapp_xrx.mk
index 8eff71462..92c3f1ed2 100644
--- a/package/x11r7/xapp_xrx/xapp_xrx.mk
+++ b/package/x11r7/xapp_xrx/xapp_xrx.mk
@@ -10,4 +10,4 @@ XAPP_XRX_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XRX_AUTORECONF = YES
XAPP_XRX_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt
-$(eval $(call AUTOTARGETS,xapp_xrx))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xrx))
diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk
index c4e119913..5ee073d43 100644
--- a/package/x11r7/xapp_xset/xapp_xset.mk
+++ b/package/x11r7/xapp_xset/xapp_xset.mk
@@ -10,4 +10,4 @@ XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSET_AUTORECONF = YES
XAPP_XSET_DEPENDENCIES = xlib_libXfontcache xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_xset))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xset))
diff --git a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
index 0172ab24d..9c57254e8 100644
--- a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
+++ b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
@@ -10,4 +10,4 @@ XAPP_XSETMODE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSETMODE_AUTORECONF = YES
XAPP_XSETMODE_DEPENDENCIES = xlib_libX11 xlib_libXi
-$(eval $(call AUTOTARGETS,xapp_xsetmode))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xsetmode))
diff --git a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
index c1987c768..d7678a3e4 100644
--- a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
+++ b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
@@ -10,4 +10,4 @@ XAPP_XSETPOINTER_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSETPOINTER_AUTORECONF = YES
XAPP_XSETPOINTER_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXi
-$(eval $(call AUTOTARGETS,xapp_xsetpointer))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xsetpointer))
diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
index addcf87b1..c306dd763 100644
--- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
+++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
@@ -10,4 +10,4 @@ XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSETROOT_AUTORECONF = YES
XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xdata_xbitmaps
-$(eval $(call AUTOTARGETS,xapp_xsetroot))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xsetroot))
diff --git a/package/x11r7/xapp_xsm/xapp_xsm.mk b/package/x11r7/xapp_xsm/xapp_xsm.mk
index fdcb5b7a2..2f4df14fc 100644
--- a/package/x11r7/xapp_xsm/xapp_xsm.mk
+++ b/package/x11r7/xapp_xsm/xapp_xsm.mk
@@ -10,4 +10,4 @@ XAPP_XSM_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSM_AUTORECONF = YES
XAPP_XSM_DEPENDENCIES = xlib_libXaw
-$(eval $(call AUTOTARGETS,xapp_xsm))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xsm))
diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
index ed4ff649b..bdf4fa977 100644
--- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
+++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
@@ -10,4 +10,4 @@ XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSTDCMAP_AUTORECONF = YES
XAPP_XSTDCMAP_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_xstdcmap))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xstdcmap))
diff --git a/package/x11r7/xapp_xtrap/xapp_xtrap.mk b/package/x11r7/xapp_xtrap/xapp_xtrap.mk
index f55069fb4..a60621886 100644
--- a/package/x11r7/xapp_xtrap/xapp_xtrap.mk
+++ b/package/x11r7/xapp_xtrap/xapp_xtrap.mk
@@ -10,4 +10,4 @@ XAPP_XTRAP_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XTRAP_AUTORECONF = YES
XAPP_XTRAP_DEPENDENCIES = xlib_libX11 xlib_libXTrap
-$(eval $(call AUTOTARGETS,xapp_xtrap))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xtrap))
diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
index 8bb1c4b81..2ba98947c 100644
--- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
+++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
@@ -10,4 +10,4 @@ XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XVIDTUNE_AUTORECONF = YES
XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm
-$(eval $(call AUTOTARGETS,xapp_xvidtune))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xvidtune))
diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
index 308f45734..413aea765 100644
--- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
+++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
@@ -10,4 +10,4 @@ XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XVINFO_AUTORECONF = YES
XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv
-$(eval $(call AUTOTARGETS,xapp_xvinfo))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xvinfo))
diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk
index 9242a8a23..8436cf3ea 100644
--- a/package/x11r7/xapp_xwd/xapp_xwd.mk
+++ b/package/x11r7/xapp_xwd/xapp_xwd.mk
@@ -10,4 +10,4 @@ XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XWD_AUTORECONF = YES
XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_xwd))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xwd))
diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
index a5d7a6360..49b990964 100644
--- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
+++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
@@ -10,4 +10,4 @@ XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XWININFO_AUTORECONF = YES
XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu
-$(eval $(call AUTOTARGETS,xapp_xwininfo))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xwininfo))
diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk
index 7f003d271..a992d1ca7 100644
--- a/package/x11r7/xapp_xwud/xapp_xwud.mk
+++ b/package/x11r7/xapp_xwud/xapp_xwud.mk
@@ -10,4 +10,4 @@ XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XWUD_AUTORECONF = YES
XAPP_XWUD_DEPENDENCIES = xlib_libX11
-$(eval $(call AUTOTARGETS,xapp_xwud))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_xwud))
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
index 3bce18afe..e12d11c09 100644
--- a/package/x11r7/xcb-proto/xcb-proto.mk
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -9,5 +9,5 @@ XCB_PROTO_SITE = http://xcb.freedesktop.org/dist/
XCB_PROTO_INSTALL_STAGING = YES
-$(eval $(call AUTOTARGETS,xcb-proto))
+$(eval $(call AUTOTARGETS,package/x11r7,xcb-proto))
diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk
index 07537847d..883fa60e6 100644
--- a/package/x11r7/xcb-util/xcb-util.mk
+++ b/package/x11r7/xcb-util/xcb-util.mk
@@ -7,5 +7,5 @@ XCB_UTIL_VERSION = 0.2
XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2
XCB_UTIL_SITE = http://xcb.freedesktop.org/dist/
-$(eval $(call AUTOTARGETS,xcb-util))
+$(eval $(call AUTOTARGETS,package/x11r7,xcb-util))
diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
index ba9315418..36bd14732 100644
--- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
+++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
@@ -9,4 +9,4 @@ XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2
XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data
XDATA_XBITMAPS_AUTORECONF = YES
-$(eval $(call AUTOTARGETS,xdata_xbitmaps))
+$(eval $(call AUTOTARGETS,package/x11r7,xdata_xbitmaps))
diff --git a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
index 746da33db..64d89e3e9 100644
--- a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
+++ b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_ACECAD_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_INPUT_ACECAD_AUTORECONF = YES
XDRIVER_XF86_INPUT_ACECAD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-acecad))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-acecad))
diff --git a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
index a22e88ad8..1eb7a2e04 100644
--- a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
+++ b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_AIPTEK_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_INPUT_AIPTEK_AUTORECONF = YES
XDRIVER_XF86_INPUT_AIPTEK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-aiptek))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-aiptek))
diff --git a/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk b/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk
index 4c7ce4d5f..86ca16c52 100644
--- a/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk
+++ b/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_CALCOMP_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_INPUT_CALCOMP_AUTORECONF = YES
XDRIVER_XF86_INPUT_CALCOMP_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-calcomp))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-calcomp))
diff --git a/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk b/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk
index a439fc4b6..3ed5eeede 100644
--- a/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk
+++ b/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_CITRON_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_INPUT_CITRON_AUTORECONF = YES
XDRIVER_XF86_INPUT_CITRON_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-citron))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-citron))
diff --git a/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk b/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk
index 5e995ee50..1e582f82a 100644
--- a/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk
+++ b/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_DIGITALEDGE_SITE = http://xorg.freedesktop.org/releases/indiv
XDRIVER_XF86_INPUT_DIGITALEDGE_AUTORECONF = YES
XDRIVER_XF86_INPUT_DIGITALEDGE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-digitaledge))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-digitaledge))
diff --git a/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk b/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk
index b0b516972..976fd6647 100644
--- a/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk
+++ b/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_DMC_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_INPUT_DMC_AUTORECONF = YES
XDRIVER_XF86_INPUT_DMC_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-dmc))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-dmc))
diff --git a/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk b/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk
index 3cb90e6d6..09331ee4e 100644
--- a/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk
+++ b/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_DYNAPRO_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_INPUT_DYNAPRO_AUTORECONF = YES
XDRIVER_XF86_INPUT_DYNAPRO_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-dynapro))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-dynapro))
diff --git a/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk b/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk
index 316a8a01c..fbfa1d24b 100644
--- a/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk
+++ b/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_ELO2300_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_INPUT_ELO2300_AUTORECONF = YES
XDRIVER_XF86_INPUT_ELO2300_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-elo2300))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-elo2300))
diff --git a/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk b/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk
index 343acb458..7174118ed 100644
--- a/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk
+++ b/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_ELOGRAPHICS_SITE = http://xorg.freedesktop.org/releases/indiv
XDRIVER_XF86_INPUT_ELOGRAPHICS_AUTORECONF = YES
XDRIVER_XF86_INPUT_ELOGRAPHICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-elographics))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-elographics))
diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
index 7072cd175..a04ba75ac 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_INPUT_EVDEV_AUTORECONF = YES
XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-evdev))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-evdev))
diff --git a/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk b/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk
index 424b79f2b..f35daaebc 100644
--- a/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk
+++ b/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_FPIT_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_INPUT_FPIT_AUTORECONF = YES
XDRIVER_XF86_INPUT_FPIT_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-fpit))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-fpit))
diff --git a/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk b/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk
index 2a06ed86c..da808fe05 100644
--- a/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk
+++ b/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_HYPERPEN_SITE = http://xorg.freedesktop.org/releases/individu
XDRIVER_XF86_INPUT_HYPERPEN_AUTORECONF = YES
XDRIVER_XF86_INPUT_HYPERPEN_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-hyperpen))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-hyperpen))
diff --git a/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk b/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk
index 4d8a381f9..6d7462cc6 100644
--- a/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk
+++ b/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_JAMSTUDIO_SITE = http://xorg.freedesktop.org/releases/individ
XDRIVER_XF86_INPUT_JAMSTUDIO_AUTORECONF = YES
XDRIVER_XF86_INPUT_JAMSTUDIO_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-jamstudio))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-jamstudio))
diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index 7f4bbb15b..37bc184aa 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individu
XDRIVER_XF86_INPUT_JOYSTICK_AUTORECONF = YES
XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-joystick))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-joystick))
diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
index fa473552d..f3e1b31f9 100644
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individu
XDRIVER_XF86_INPUT_KEYBOARD_AUTORECONF = YES
XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-keyboard))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-keyboard))
diff --git a/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk b/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk
index 1aa17c644..5b7e4842e 100644
--- a/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk
+++ b/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_MAGELLAN_SITE = http://xorg.freedesktop.org/releases/individu
XDRIVER_XF86_INPUT_MAGELLAN_AUTORECONF = YES
XDRIVER_XF86_INPUT_MAGELLAN_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-magellan))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-magellan))
diff --git a/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk b/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk
index 11f373e15..6bc4a5f19 100644
--- a/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk
+++ b/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_MAGICTOUCH_SITE = http://xorg.freedesktop.org/releases/indivi
XDRIVER_XF86_INPUT_MAGICTOUCH_AUTORECONF = YES
XDRIVER_XF86_INPUT_MAGICTOUCH_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-magictouch))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-magictouch))
diff --git a/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk b/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk
index 75a9d3cb2..26d00e6f9 100644
--- a/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk
+++ b/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_MICROTOUCH_SITE = http://xorg.freedesktop.org/releases/indivi
XDRIVER_XF86_INPUT_MICROTOUCH_AUTORECONF = YES
XDRIVER_XF86_INPUT_MICROTOUCH_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-microtouch))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-microtouch))
diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
index b1f71534f..bba261be1 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = YES
XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-mouse))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-mouse))
diff --git a/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk b/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk
index cefd0da95..10fb9e7f9 100644
--- a/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk
+++ b/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_MUTOUCH_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_INPUT_MUTOUCH_AUTORECONF = YES
XDRIVER_XF86_INPUT_MUTOUCH_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-mutouch))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-mutouch))
diff --git a/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk b/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk
index aa5563572..a95f9bdd7 100644
--- a/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk
+++ b/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_PALMAX_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_INPUT_PALMAX_AUTORECONF = YES
XDRIVER_XF86_INPUT_PALMAX_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-palmax))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-palmax))
diff --git a/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk b/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk
index cf5a66a3e..5fee01546 100644
--- a/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk
+++ b/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_PENMOUNT_SITE = http://xorg.freedesktop.org/releases/individu
XDRIVER_XF86_INPUT_PENMOUNT_AUTORECONF = YES
XDRIVER_XF86_INPUT_PENMOUNT_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-penmount))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-penmount))
diff --git a/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk b/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk
index 7e756bca3..3a9a1e606 100644
--- a/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk
+++ b/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_SPACEORB_SITE = http://xorg.freedesktop.org/releases/individu
XDRIVER_XF86_INPUT_SPACEORB_AUTORECONF = YES
XDRIVER_XF86_INPUT_SPACEORB_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-spaceorb))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-spaceorb))
diff --git a/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk b/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk
index 9ffed199e..ef93b7738 100644
--- a/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk
+++ b/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_SUMMA_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_INPUT_SUMMA_AUTORECONF = YES
XDRIVER_XF86_INPUT_SUMMA_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-summa))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-summa))
diff --git a/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk b/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk
index 1716c559b..ec6d25ffe 100644
--- a/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk
+++ b/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_TEK4957_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_INPUT_TEK4957_AUTORECONF = YES
XDRIVER_XF86_INPUT_TEK4957_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-tek4957))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-tek4957))
diff --git a/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk b/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk
index 58689e988..bac82e86c 100644
--- a/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk
+++ b/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_UR98_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_INPUT_UR98_AUTORECONF = YES
XDRIVER_XF86_INPUT_UR98_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-ur98))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-ur98))
diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
index 74a6cb526..34a032c9b 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_INPUT_VMMOUSE_AUTORECONF = YES
XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-vmmouse))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-vmmouse))
diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
index 40a006c54..f94c86372 100644
--- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_INPUT_VOID_AUTORECONF = YES
XDRIVER_XF86_INPUT_VOID_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-input-void))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-input-void))
diff --git a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
index a315d374e..3bb80d2d5 100644
--- a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
+++ b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_APM_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_APM_AUTORECONF = YES
XDRIVER_XF86_VIDEO_APM_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86rushproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-apm))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-apm))
diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
index 51aa49898..b24f73f9f 100644
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_ARK_AUTORECONF = YES
XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-ark))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ark))
diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
index 5b828eba0..8f026afbf 100644
--- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
+++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
@@ -9,4 +9,4 @@ XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION)
XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_AST_AUTORECONF = YES
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-ast))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ast))
diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
index 8fbd1864a..a3c9fea7f 100644
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES
XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-ati))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-ati))
diff --git a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
index 68cce674b..3760cda29 100644
--- a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
+++ b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_CHIPS_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_CHIPS_AUTORECONF = YES
XDRIVER_XF86_VIDEO_CHIPS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-chips))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-chips))
diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
index 2266f2121..147cd9d7e 100644
--- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_CIRRUS_AUTORECONF = YES
XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-cirrus))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-cirrus))
diff --git a/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk
index 1fbadf11f..1f7a877ac 100644
--- a/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk
+++ b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_CYRIX_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_CYRIX_AUTORECONF = YES
XDRIVER_XF86_VIDEO_CYRIX_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-cyrix))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-cyrix))
diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
index 3aec6a8cf..b9ebf8173 100644
--- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_DUMMY_AUTORECONF = YES
XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-dummy))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-dummy))
diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
index 8a963b517..22b07f909 100644
--- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
+++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_FBDEV_AUTORECONF = YES
XDRIVER_XF86_VIDEO_FBDEV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-fbdev))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-fbdev))
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
index 0b42adf4f..c611b75a6 100644
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES
XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-glint))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-glint))
diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index 676133ee3..a65695be0 100644
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_VIDEO_I128_AUTORECONF = YES
XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-i128))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-i128))
diff --git a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
index 113f4a205..5e7c43f99 100644
--- a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
+++ b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_I740_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_VIDEO_I740_AUTORECONF = YES
XDRIVER_XF86_VIDEO_I740_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-i740))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-i740))
diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
index 3af3fe6a3..a614da449 100644
--- a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
+++ b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_I810_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_VIDEO_I810_AUTORECONF = YES
XDRIVER_XF86_VIDEO_I810_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-i810))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-i810))
diff --git a/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk b/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk
index e4c146702..4bf912723 100644
--- a/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk
+++ b/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_IMSTT_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_IMSTT_AUTORECONF = YES
XDRIVER_XF86_VIDEO_IMSTT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-imstt))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-imstt))
diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index eaf0001b1..f1b7b194a 100644
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-mga))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-mga))
diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index 01554544a..e5e566672 100644
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individu
XDRIVER_XF86_VIDEO_NEOMAGIC_AUTORECONF = YES
XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-neomagic))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-neomagic))
diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
index 306969325..c2ef5c015 100644
--- a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
+++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_NEWPORT_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_VIDEO_NEWPORT_AUTORECONF = YES
XDRIVER_XF86_VIDEO_NEWPORT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-newport))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-newport))
diff --git a/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk b/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk
index f1cefd060..7fa30ce9d 100644
--- a/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk
+++ b/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_NSC_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_NSC_AUTORECONF = YES
XDRIVER_XF86_VIDEO_NSC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-nsc))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-nsc))
diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
index 4dd3d7611..6a73cf7e5 100644
--- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
+++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/dri
XDRIVER_XF86_VIDEO_NV_AUTORECONF = YES
XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-nv))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-nv))
diff --git a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
index 46877fcbc..8a14d71c8 100644
--- a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
+++ b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_RENDITION_SITE = http://xorg.freedesktop.org/releases/individ
XDRIVER_XF86_VIDEO_RENDITION_AUTORECONF = YES
XDRIVER_XF86_VIDEO_RENDITION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-rendition))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-rendition))
diff --git a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
index 4741d2a15..139774df8 100644
--- a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
+++ b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_S3_SITE = http://xorg.freedesktop.org/releases/individual/dri
XDRIVER_XF86_VIDEO_S3_AUTORECONF = YES
XDRIVER_XF86_VIDEO_S3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-s3))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-s3))
diff --git a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
index f080f6d10..1a4bd177b 100644
--- a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
+++ b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_S3VIRGE_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_VIDEO_S3VIRGE_AUTORECONF = YES
XDRIVER_XF86_VIDEO_S3VIRGE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-s3virge))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-s3virge))
diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
index 2cdf1c7f0..f1e99087e 100644
--- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-savage))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-savage))
diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
index 40ffcae75..c8cffde7e 100644
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/ind
XDRIVER_XF86_VIDEO_SILICONMOTION_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-siliconmotion))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-siliconmotion))
diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
index 4243b8a96..9e27e035c 100644
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-sis))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sis))
diff --git a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
index 3b0ea124a..04bc0c24b 100644
--- a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
+++ b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SISUSB_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SISUSB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-sisusb))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sisusb))
diff --git a/package/x11r7/xdriver_xf86-video-sunbw2/xdriver_xf86-video-sunbw2.mk b/package/x11r7/xdriver_xf86-video-sunbw2/xdriver_xf86-video-sunbw2.mk
index 662951552..658d33d97 100644
--- a/package/x11r7/xdriver_xf86-video-sunbw2/xdriver_xf86-video-sunbw2.mk
+++ b/package/x11r7/xdriver_xf86-video-sunbw2/xdriver_xf86-video-sunbw2.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNBW2_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SUNBW2_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SUNBW2_DEPENDENCIES = xserver_xorg-server xproto_randrproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-sunbw2))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sunbw2))
diff --git a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
index 67bf8e59a..e4b825c98 100644
--- a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNCG14_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_VIDEO_SUNCG14_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SUNCG14_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-suncg14))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-suncg14))
diff --git a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
index 38c8f066d..1e1bd67c6 100644
--- a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNCG3_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SUNCG3_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SUNCG3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-suncg3))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-suncg3))
diff --git a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
index b84781eae..6a51a3b35 100644
--- a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNCG6_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SUNCG6_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SUNCG6_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-suncg6))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-suncg6))
diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
index eb6c1831b..2f2f4ab03 100644
--- a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
+++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNFFB_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SUNFFB_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-sunffb))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sunffb))
diff --git a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
index bd9d6584d..2c1205509 100644
--- a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
+++ b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNLEO_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SUNLEO_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SUNLEO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-sunleo))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-sunleo))
diff --git a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
index ddfc3fb1d..73d9fa325 100644
--- a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
+++ b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_SUNTCX_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_SUNTCX_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SUNTCX_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-suntcx))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-suntcx))
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
index 7915ee2ab..4c00bc4c3 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES
XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-tdfx))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-tdfx))
diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
index 4efe7175a..b9ce4a76f 100644
--- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
+++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_TGA_AUTORECONF = YES
XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-tga))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-tga))
diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
index 7866ee6b3..81a241a8c 100644
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individua
XDRIVER_XF86_VIDEO_TRIDENT_AUTORECONF = YES
XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-trident))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-trident))
diff --git a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
index 4a889e7d1..1461c2753 100644
--- a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
+++ b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_TSENG_SITE = http://xorg.freedesktop.org/releases/individual/
XDRIVER_XF86_VIDEO_TSENG_AUTORECONF = YES
XDRIVER_XF86_VIDEO_TSENG_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-tseng))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-tseng))
diff --git a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
index abb41f24b..8cf6a39f0 100644
--- a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
+++ b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_V4L_AUTORECONF = YES
XDRIVER_XF86_VIDEO_V4L_DEPENDENCIES = xserver_xorg-server xproto_randrproto xproto_videoproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-v4l))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-v4l))
diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
index 4df953360..d735de0ca 100644
--- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/d
XDRIVER_XF86_VIDEO_VESA_AUTORECONF = YES
XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-vesa))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-vesa))
diff --git a/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk b/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk
index bdb50c0e2..4c96290f9 100644
--- a/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk
+++ b/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_VGA_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_VGA_AUTORECONF = YES
XDRIVER_XF86_VIDEO_VGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-vga))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-vga))
diff --git a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk
index 4ee2dc519..6a6fed7e8 100644
--- a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk
+++ b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_VIA_SITE = http://xorg.freedesktop.org/releases/individual/dr
XDRIVER_XF86_VIDEO_VIA_AUTORECONF = YES
XDRIVER_XF86_VIDEO_VIA_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-via))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-via))
diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
index 9bea5c656..b7ab639dd 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_VMWARE_AUTORECONF = YES
XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-vmware))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-vmware))
diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
index 07c0dc3dc..a400226b2 100644
--- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
+++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
@@ -10,4 +10,4 @@ XDRIVER_XF86_VIDEO_VOODOO_SITE = http://xorg.freedesktop.org/releases/individual
XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = YES
XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
-$(eval $(call AUTOTARGETS,xdriver_xf86-video-voodoo))
+$(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-voodoo))
diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index 85a9afe11..0d2d3b8a0 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -10,4 +10,4 @@ XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
XFONT_ENCODINGS_AUTORECONF = YES
XFONT_ENCODINGS_MAKE_OPT =
-$(eval $(call AUTOTARGETS,xfont_encodings))
+$(eval $(call AUTOTARGETS,package/x11r7,xfont_encodings))
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
index 7217427ff..98f195049 100644
--- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -11,4 +11,4 @@ XFONT_FONT_ADOBE_UTOPIA_TYPE1_AUTORECONF = YES
XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install
XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install-data
-$(eval $(call AUTOTARGETS,xfont_font-adobe-utopia-type1))
+$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-adobe-utopia-type1))
diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
index b27f3e7f0..4bfc187aa 100644
--- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -11,4 +11,4 @@ XFONT_FONT_BITSTREAM_TYPE1_AUTORECONF = YES
XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install
XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install-data
-$(eval $(call AUTOTARGETS,xfont_font-bitstream-type1))
+$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-bitstream-type1))
diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
index 72eeccc06..b53523298 100644
--- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -11,4 +11,4 @@ XFONT_FONT_IBM_TYPE1_AUTORECONF = YES
XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install
XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install-data
-$(eval $(call AUTOTARGETS,xfont_font-ibm-type1))
+$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-ibm-type1))
diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
index d8fc47f44..b2f29df68 100644
--- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -11,4 +11,4 @@ XFONT_FONT_XFREE86_TYPE1_AUTORECONF = YES
XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install
XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install-data
-$(eval $(call AUTOTARGETS,xfont_font-xfree86-type1))
+$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-xfree86-type1))
diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index 099d61ef9..3e7844290 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -12,4 +12,4 @@ XLIB_LIBFS_INSTALL_STAGING = YES
XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xproto_xproto xproto_fontsproto
XLIB_LIBFS_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libFS))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libFS))
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index e6d8bb76d..d9d4549e5 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -12,4 +12,4 @@ XLIB_LIBICE_INSTALL_STAGING = YES
XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xproto_xproto
XLIB_LIBICE_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libICE))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libICE))
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index eef6ce04f..561fe81be 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -12,4 +12,4 @@ XLIB_LIBSM_INSTALL_STAGING = YES
XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
XLIB_LIBSM_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libSM))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libSM))
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 0517213c2..52a573744 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -13,4 +13,4 @@ XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib
XLIB_LIBX11_CONF_ENV = ac_cv_func_mmap_fixed_mapped=yes CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include"
XLIB_LIBX11_CONF_OPT = --disable-malloc0returnsnull --with-xcb --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libX11))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11))
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index 17001b141..55cace043 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -12,4 +12,4 @@ XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
XLIB_LIBXSCRNSAVER_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXScrnSaver))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXScrnSaver))
diff --git a/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk b/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
index 645a6005c..42a315cca 100644
--- a/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
+++ b/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
@@ -12,4 +12,4 @@ XLIB_LIBXTRAP_INSTALL_STAGING = YES
XLIB_LIBXTRAP_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXext xproto_trapproto
XLIB_LIBXTRAP_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXTrap))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXTrap))
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index 94ddbcf70..4f9baa86a 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -12,4 +12,4 @@ XLIB_LIBXAU_INSTALL_STAGING = YES
XLIB_LIBXAU_DEPENDENCIES = xproto_xproto xproto_xproto xutil_util-macros
XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXau))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau))
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index 93f57e688..bf357e87c 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -12,4 +12,4 @@ XLIB_LIBXAW_INSTALL_STAGING = YES
XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto xlib_libXp
XLIB_LIBXAW_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXaw))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXaw))
diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
index 7a8f65484..92b78f2b5 100644
--- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -12,4 +12,4 @@ XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES
XLIB_LIBXCOMPOSITE_DEPENDENCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto
XLIB_LIBXCOMPOSITE_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXcomposite))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXcomposite))
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index 846bcf174..65f27ab22 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -12,4 +12,4 @@ XLIB_LIBXCURSOR_INSTALL_STAGING = YES
XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
XLIB_LIBXCURSOR_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXcursor))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXcursor))
diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
index d54acc7c7..683dbe4ad 100644
--- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -12,4 +12,4 @@ XLIB_LIBXDAMAGE_INSTALL_STAGING = YES
XLIB_LIBXDAMAGE_DEPENDENCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto
XLIB_LIBXDAMAGE_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXdamage))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdamage))
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index 0b1982e8f..3def88278 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -12,4 +12,4 @@ XLIB_LIBXDMCP_INSTALL_STAGING = YES
XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
XLIB_LIBXDMCP_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXdmcp))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXdmcp))
diff --git a/package/x11r7/xlib_libXevie/xlib_libXevie.mk b/package/x11r7/xlib_libXevie/xlib_libXevie.mk
index 1eafca93a..b2da4d274 100644
--- a/package/x11r7/xlib_libXevie/xlib_libXevie.mk
+++ b/package/x11r7/xlib_libXevie/xlib_libXevie.mk
@@ -12,4 +12,4 @@ XLIB_LIBXEVIE_INSTALL_STAGING = YES
XLIB_LIBXEVIE_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_evieext xproto_xproto
XLIB_LIBXEVIE_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXevie))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXevie))
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index 8da2d631f..d3c2917aa 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -12,4 +12,4 @@ XLIB_LIBXEXT_INSTALL_STAGING = YES
XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto
XLIB_LIBXEXT_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXext))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXext))
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index 186e7226c..109aafb12 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -12,4 +12,4 @@ XLIB_LIBXFIXES_INSTALL_STAGING = YES
XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
XLIB_LIBXFIXES_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXfixes))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfixes))
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index 4c3ce2ff8..4523d9dcf 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -12,4 +12,4 @@ XLIB_LIBXFONT_INSTALL_STAGING = YES
XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings
XLIB_LIBXFONT_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXfont))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfont))
diff --git a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
index d969b27bc..66e19856c 100644
--- a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
+++ b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
@@ -12,4 +12,4 @@ XLIB_LIBXFONTCACHE_INSTALL_STAGING = YES
XLIB_LIBXFONTCACHE_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_fontcacheproto
XLIB_LIBXFONTCACHE_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXfontcache))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXfontcache))
diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index be2ed4ffd..2411ad2fc 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -12,4 +12,4 @@ XLIB_LIBXFT_INSTALL_STAGING = YES
XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
XLIB_LIBXFT_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXft))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXft))
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index d7f9da90a..f0ab9ba7c 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -12,4 +12,4 @@ XLIB_LIBXI_INSTALL_STAGING = YES
XLIB_LIBXI_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXext xproto_xproto
XLIB_LIBXI_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXi))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXi))
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index 579abd5ad..ca2c46e57 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -12,4 +12,4 @@ XLIB_LIBXINERAMA_INSTALL_STAGING = YES
XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
XLIB_LIBXINERAMA_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXinerama))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXinerama))
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index 4fd6b7959..7c537c5d8 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -12,4 +12,4 @@ XLIB_LIBXMU_INSTALL_STAGING = YES
XLIB_LIBXMU_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
XLIB_LIBXMU_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXmu))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXmu))
diff --git a/package/x11r7/xlib_libXp/xlib_libXp.mk b/package/x11r7/xlib_libXp/xlib_libXp.mk
index e1ad8aade..cc5139d21 100644
--- a/package/x11r7/xlib_libXp/xlib_libXp.mk
+++ b/package/x11r7/xlib_libXp/xlib_libXp.mk
@@ -12,4 +12,4 @@ XLIB_LIBXP_INSTALL_STAGING = YES
XLIB_LIBXP_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xproto_printproto
XLIB_LIBXP_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXp))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXp))
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 65a4e50f6..c600435dc 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -12,4 +12,4 @@ XLIB_LIBXPM_INSTALL_STAGING = YES
XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
XLIB_LIBXPM_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXpm))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXpm))
diff --git a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
index d9e69cdd7..abbd1336b 100644
--- a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
+++ b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
@@ -12,4 +12,4 @@ XLIB_LIBXPRINTAPPUTIL_INSTALL_STAGING = YES
XLIB_LIBXPRINTAPPUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
XLIB_LIBXPRINTAPPUTIL_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXprintAppUtil))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXprintAppUtil))
diff --git a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
index a70379dfb..7e7174822 100644
--- a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
+++ b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
@@ -12,4 +12,4 @@ XLIB_LIBXPRINTUTIL_INSTALL_STAGING = YES
XLIB_LIBXPRINTUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXt xproto_printproto
XLIB_LIBXPRINTUTIL_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXprintUtil))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXprintUtil))
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index b23057977..602ad2a50 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -12,4 +12,4 @@ XLIB_LIBXRANDR_INSTALL_STAGING = YES
XLIB_LIBXRANDR_DEPENDENCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
XLIB_LIBXRANDR_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXrandr))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXrandr))
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index 75289672b..1717c5ece 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -12,4 +12,4 @@ XLIB_LIBXRENDER_INSTALL_STAGING = YES
XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXrender))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXrender))
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index b63350e58..e37b2afcd 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -12,4 +12,4 @@ XLIB_LIBXRES_INSTALL_STAGING = YES
XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
XLIB_LIBXRES_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXres))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXres))
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index c02b1b1b5..37aefbabb 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -13,4 +13,4 @@ XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xc
XLIB_LIBXT_CONF_ENV = CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include"
XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXt))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXt))
diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index a28636a2f..4040f4cf8 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -12,4 +12,4 @@ XLIB_LIBXTST_INSTALL_STAGING = YES
XLIB_LIBXTST_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_recordproto
XLIB_LIBXTST_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXtst))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXtst))
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index 4709cf907..5e453e726 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -12,4 +12,4 @@ XLIB_LIBXV_INSTALL_STAGING = YES
XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
XLIB_LIBXV_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXv))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXv))
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index 2e05f07e3..085341339 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -12,4 +12,4 @@ XLIB_LIBXVMC_INSTALL_STAGING = YES
XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
XLIB_LIBXVMC_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXvMC))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXvMC))
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index 202219163..c6362edbf 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -12,4 +12,4 @@ XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
XLIB_LIBXXF86DGA_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXxf86dga))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXxf86dga))
diff --git a/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk b/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk
index 3f344052c..88016ba5b 100644
--- a/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk
+++ b/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk
@@ -12,4 +12,4 @@ XLIB_LIBXXF86MISC_INSTALL_STAGING = YES
XLIB_LIBXXF86MISC_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86miscproto xproto_xproto
XLIB_LIBXXF86MISC_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXxf86misc))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXxf86misc))
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index 32c27caae..5ea56b85c 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -12,4 +12,4 @@ XLIB_LIBXXF86VM_INSTALL_STAGING = YES
XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
XLIB_LIBXXF86VM_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libXxf86vm))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libXxf86vm))
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index 7a29c5891..0c3d88926 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -12,4 +12,4 @@ XLIB_LIBDMX_INSTALL_STAGING = YES
XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
XLIB_LIBDMX_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libdmx))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libdmx))
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index 6672d282d..bc2e8b853 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -12,4 +12,4 @@ XLIB_LIBFONTENC_INSTALL_STAGING = YES
XLIB_LIBFONTENC_DEPENDENCIES = xproto_xproto
XLIB_LIBFONTENC_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libfontenc))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libfontenc))
diff --git a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
index aefaf50da..503698c97 100644
--- a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
+++ b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
@@ -12,4 +12,4 @@ XLIB_LIBLBXUTIL_INSTALL_STAGING = YES
XLIB_LIBLBXUTIL_DEPENDENCIES = xproto_xextproto
XLIB_LIBLBXUTIL_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_liblbxutil))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_liblbxutil))
diff --git a/package/x11r7/xlib_liboldX/xlib_liboldX.mk b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
index 5c5df0819..699b5cc6f 100644
--- a/package/x11r7/xlib_liboldX/xlib_liboldX.mk
+++ b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
@@ -12,4 +12,4 @@ XLIB_LIBOLDX_INSTALL_STAGING = YES
XLIB_LIBOLDX_DEPENDENCIES = xlib_libX11
XLIB_LIBOLDX_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_liboldX))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_liboldX))
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index 7843fd17f..46798a9af 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -12,4 +12,4 @@ XLIB_LIBXKBFILE_INSTALL_STAGING = YES
XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
XLIB_LIBXKBFILE_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libxkbfile))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbfile))
diff --git a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
index 74820bfdd..11519a99d 100644
--- a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
+++ b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
@@ -12,4 +12,4 @@ XLIB_LIBXKBUI_INSTALL_STAGING = YES
XLIB_LIBXKBUI_DEPENDENCIES = xlib_libxkbfile xlib_libXt xproto_kbproto
XLIB_LIBXKBUI_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_libxkbui))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libxkbui))
diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index 897adf710..9af330924 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -11,4 +11,4 @@ XLIB_XTRANS_AUTORECONF = YES
XLIB_XTRANS_INSTALL_STAGING = YES
XLIB_XTRANS_CONF_OPT = --enable-shared --disable-static
-$(eval $(call AUTOTARGETS,xlib_xtrans))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_xtrans))
diff --git a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
index f3a9c99a2..fcb380b9c 100644
--- a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
+++ b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
@@ -11,4 +11,4 @@ XPROTO_APPLEWMPROTO_AUTORECONF = YES
XPROTO_APPLEWMPROTO_INSTALL_STAGING = YES
XPROTO_APPLEWMPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_applewmproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_applewmproto))
diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
index 455480ea2..37182ca28 100644
--- a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
+++ b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
@@ -11,4 +11,4 @@ XPROTO_BIGREQSPROTO_AUTORECONF = YES
XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES
XPROTO_BIGREQSPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_bigreqsproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_bigreqsproto))
diff --git a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
index 1726c168e..e53cd6efd 100644
--- a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
+++ b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
@@ -11,4 +11,4 @@ XPROTO_COMPOSITEPROTO_AUTORECONF = YES
XPROTO_COMPOSITEPROTO_INSTALL_STAGING = YES
XPROTO_COMPOSITEPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_compositeproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_compositeproto))
diff --git a/package/x11r7/xproto_damageproto/xproto_damageproto.mk b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
index 84589f641..5f23012d2 100644
--- a/package/x11r7/xproto_damageproto/xproto_damageproto.mk
+++ b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
@@ -11,4 +11,4 @@ XPROTO_DAMAGEPROTO_AUTORECONF = YES
XPROTO_DAMAGEPROTO_INSTALL_STAGING = YES
XPROTO_DAMAGEPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_damageproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_damageproto))
diff --git a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
index f85e54e0f..65c250c25 100644
--- a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
+++ b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
@@ -11,4 +11,4 @@ XPROTO_DMXPROTO_AUTORECONF = YES
XPROTO_DMXPROTO_INSTALL_STAGING = YES
XPROTO_DMXPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_dmxproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_dmxproto))
diff --git a/package/x11r7/xproto_evieext/xproto_evieext.mk b/package/x11r7/xproto_evieext/xproto_evieext.mk
index 8d48b1d87..64041aa8e 100644
--- a/package/x11r7/xproto_evieext/xproto_evieext.mk
+++ b/package/x11r7/xproto_evieext/xproto_evieext.mk
@@ -11,4 +11,4 @@ XPROTO_EVIEEXT_AUTORECONF = YES
XPROTO_EVIEEXT_INSTALL_STAGING = YES
XPROTO_EVIEEXT_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_evieext))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_evieext))
diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
index ac8debc4b..93d5e11d1 100644
--- a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
+++ b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
@@ -11,4 +11,4 @@ XPROTO_FIXESPROTO_AUTORECONF = YES
XPROTO_FIXESPROTO_INSTALL_STAGING = YES
XPROTO_FIXESPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_fixesproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_fixesproto))
diff --git a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
index 35f34cbd2..fdfc9d8f6 100644
--- a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
+++ b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
@@ -11,4 +11,4 @@ XPROTO_FONTCACHEPROTO_AUTORECONF = YES
XPROTO_FONTCACHEPROTO_INSTALL_STAGING = YES
XPROTO_FONTCACHEPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_fontcacheproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_fontcacheproto))
diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
index ae4c9d051..4d35cab10 100644
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
+++ b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
@@ -11,4 +11,4 @@ XPROTO_FONTSPROTO_AUTORECONF = YES
XPROTO_FONTSPROTO_INSTALL_STAGING = YES
XPROTO_FONTSPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_fontsproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_fontsproto))
diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk
index 411effea8..f2c4b55a5 100644
--- a/package/x11r7/xproto_glproto/xproto_glproto.mk
+++ b/package/x11r7/xproto_glproto/xproto_glproto.mk
@@ -11,4 +11,4 @@ XPROTO_GLPROTO_AUTORECONF = YES
XPROTO_GLPROTO_INSTALL_STAGING = YES
XPROTO_GLPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_glproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_glproto))
diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
index bfc8ac11f..a491ebbba 100644
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -11,4 +11,4 @@ XPROTO_INPUTPROTO_AUTORECONF = YES
XPROTO_INPUTPROTO_INSTALL_STAGING = YES
XPROTO_INPUTPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_inputproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_inputproto))
diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
index 1492a29c1..d6e9d98c8 100644
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -11,4 +11,4 @@ XPROTO_KBPROTO_AUTORECONF = YES
XPROTO_KBPROTO_INSTALL_STAGING = YES
XPROTO_KBPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_kbproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_kbproto))
diff --git a/package/x11r7/xproto_printproto/xproto_printproto.mk b/package/x11r7/xproto_printproto/xproto_printproto.mk
index 5d1c81b23..7a9283cc9 100644
--- a/package/x11r7/xproto_printproto/xproto_printproto.mk
+++ b/package/x11r7/xproto_printproto/xproto_printproto.mk
@@ -11,4 +11,4 @@ XPROTO_PRINTPROTO_AUTORECONF = YES
XPROTO_PRINTPROTO_INSTALL_STAGING = YES
XPROTO_PRINTPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_printproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_printproto))
diff --git a/package/x11r7/xproto_randrproto/xproto_randrproto.mk b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
index ef92ab5d6..bc1893f34 100644
--- a/package/x11r7/xproto_randrproto/xproto_randrproto.mk
+++ b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
@@ -11,4 +11,4 @@ XPROTO_RANDRPROTO_AUTORECONF = YES
XPROTO_RANDRPROTO_INSTALL_STAGING = YES
XPROTO_RANDRPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_randrproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_randrproto))
diff --git a/package/x11r7/xproto_recordproto/xproto_recordproto.mk b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
index 74537f705..de4edb628 100644
--- a/package/x11r7/xproto_recordproto/xproto_recordproto.mk
+++ b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
@@ -11,4 +11,4 @@ XPROTO_RECORDPROTO_AUTORECONF = YES
XPROTO_RECORDPROTO_INSTALL_STAGING = YES
XPROTO_RECORDPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_recordproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_recordproto))
diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.mk b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
index d101a8ff7..486768492 100644
--- a/package/x11r7/xproto_renderproto/xproto_renderproto.mk
+++ b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
@@ -11,4 +11,4 @@ XPROTO_RENDERPROTO_AUTORECONF = YES
XPROTO_RENDERPROTO_INSTALL_STAGING = YES
XPROTO_RENDERPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_renderproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_renderproto))
diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
index 4999708c5..d26854953 100644
--- a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
+++ b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
@@ -11,4 +11,4 @@ XPROTO_RESOURCEPROTO_AUTORECONF = YES
XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES
XPROTO_RESOURCEPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_resourceproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_resourceproto))
diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
index aa566a8c3..57ec0a78a 100644
--- a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
+++ b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
@@ -11,4 +11,4 @@ XPROTO_SCRNSAVERPROTO_AUTORECONF = YES
XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES
XPROTO_SCRNSAVERPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_scrnsaverproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_scrnsaverproto))
diff --git a/package/x11r7/xproto_trapproto/xproto_trapproto.mk b/package/x11r7/xproto_trapproto/xproto_trapproto.mk
index f074f255a..14ee198bd 100644
--- a/package/x11r7/xproto_trapproto/xproto_trapproto.mk
+++ b/package/x11r7/xproto_trapproto/xproto_trapproto.mk
@@ -11,4 +11,4 @@ XPROTO_TRAPPROTO_AUTORECONF = YES
XPROTO_TRAPPROTO_INSTALL_STAGING = YES
XPROTO_TRAPPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_trapproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_trapproto))
diff --git a/package/x11r7/xproto_videoproto/xproto_videoproto.mk b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
index 84b34b233..08d190a69 100644
--- a/package/x11r7/xproto_videoproto/xproto_videoproto.mk
+++ b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
@@ -11,4 +11,4 @@ XPROTO_VIDEOPROTO_AUTORECONF = YES
XPROTO_VIDEOPROTO_INSTALL_STAGING = YES
XPROTO_VIDEOPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_videoproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_videoproto))
diff --git a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
index 234cdf484..768d9392a 100644
--- a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
+++ b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
@@ -11,4 +11,4 @@ XPROTO_WINDOWSWMPROTO_AUTORECONF = YES
XPROTO_WINDOWSWMPROTO_INSTALL_STAGING = YES
XPROTO_WINDOWSWMPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_windowswmproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_windowswmproto))
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
index f0fe3ccc7..dc4ecfc96 100644
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -11,4 +11,4 @@ XPROTO_XCMISCPROTO_AUTORECONF = YES
XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
XPROTO_XCMISCPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_xcmiscproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xcmiscproto))
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
index cce0311ee..0bd34cbe3 100644
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -11,4 +11,4 @@ XPROTO_XEXTPROTO_AUTORECONF = YES
XPROTO_XEXTPROTO_INSTALL_STAGING = YES
XPROTO_XEXTPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_xextproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xextproto))
diff --git a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
index 27c651247..7f33f4b6f 100644
--- a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
+++ b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86BIGFONTPROTO_AUTORECONF = YES
XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES
XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_xf86bigfontproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86bigfontproto))
diff --git a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
index 3c8fc1969..8ff1730e6 100644
--- a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
+++ b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86DGAPROTO_AUTORECONF = YES
XPROTO_XF86DGAPROTO_INSTALL_STAGING = YES
XPROTO_XF86DGAPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_xf86dgaproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86dgaproto))
diff --git a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
index 18aacc3fe..56266fd8e 100644
--- a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
+++ b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86DRIPROTO_AUTORECONF = YES
XPROTO_XF86DRIPROTO_INSTALL_STAGING = YES
XPROTO_XF86DRIPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_xf86driproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86driproto))
diff --git a/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk b/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk
index 58f95fffb..eaadf50db 100644
--- a/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk
+++ b/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86MISCPROTO_AUTORECONF = YES
XPROTO_XF86MISCPROTO_INSTALL_STAGING = YES
XPROTO_XF86MISCPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_xf86miscproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86miscproto))
diff --git a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
index 5fafaad2b..9f6828296 100644
--- a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
+++ b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86RUSHPROTO_AUTORECONF = YES
XPROTO_XF86RUSHPROTO_INSTALL_STAGING = YES
XPROTO_XF86RUSHPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_xf86rushproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86rushproto))
diff --git a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
index 64d3c0a22..4b1d1a9ca 100644
--- a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
+++ b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
@@ -11,4 +11,4 @@ XPROTO_XF86VIDMODEPROTO_AUTORECONF = YES
XPROTO_XF86VIDMODEPROTO_INSTALL_STAGING = YES
XPROTO_XF86VIDMODEPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_xf86vidmodeproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xf86vidmodeproto))
diff --git a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
index ae209a724..15b4f5d31 100644
--- a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
+++ b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
@@ -11,4 +11,4 @@ XPROTO_XINERAMAPROTO_AUTORECONF = YES
XPROTO_XINERAMAPROTO_INSTALL_STAGING = YES
XPROTO_XINERAMAPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_xineramaproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xineramaproto))
diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
index 9398b18ac..b9da538d1 100644
--- a/package/x11r7/xproto_xproto/xproto_xproto.mk
+++ b/package/x11r7/xproto_xproto/xproto_xproto.mk
@@ -11,4 +11,4 @@ XPROTO_XPROTO_AUTORECONF = YES
XPROTO_XPROTO_INSTALL_STAGING = YES
XPROTO_XPROTO_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_xproto))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xproto))
diff --git a/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk b/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk
index 41ee26566..9dcbd06de 100644
--- a/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk
+++ b/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk
@@ -11,4 +11,4 @@ XPROTO_XPROXYMANAGEMENTPROTOCOL_AUTORECONF = YES
XPROTO_XPROXYMANAGEMENTPROTOCOL_INSTALL_STAGING = YES
XPROTO_XPROXYMANAGEMENTPROTOCOL_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xproto_xproxymanagementprotocol))
+$(eval $(call AUTOTARGETS,package/x11r7,xproto_xproxymanagementprotocol))
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index fedc4ccb4..2692a9bca 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -12,4 +12,4 @@ XSERVER_XORG_SERVER_INSTALL_STAGING = YES
XSERVER_XORG_SERVER_DEPENDENCIES = xutil_util-macros xlib_libXfont libdrm xlib_libxkbui xproto_compositeproto xproto_damageproto xproto_fixesproto xproto_glproto xproto_kbproto xproto_randrproto freetype xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm xlib_libXrender xlib_libXres xlib_libXtst xlib_libXft xlib_libXcursor xlib_libXinerama xlib_libXrandr xlib_libXdamage xlib_libXxf86misc xlib_libXxf86vm xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto xproto_evieext xproto_fontsproto xproto_inputproto xproto_recordproto xproto_renderproto xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto
XSERVER_XORG_SERVER_CONF_OPT = --disable-xprint --disable-xinerama --disable-xnest --disable-xvfb --disable-dmx --disable-dri --disable-xdmcp --disable-screensaver
-$(eval $(call AUTOTARGETS,xserver_xorg-server))
+$(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))
diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
index db89426ec..1d636741c 100644
--- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -11,4 +11,4 @@ XUTIL_MAKEDEPEND_AUTORECONF = YES
XUTIL_MAKEDEPEND_INSTALL_STAGING = YES
XUTIL_MAKEDEPEND_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xutil_makedepend))
+$(eval $(call AUTOTARGETS,package/x11r7,xutil_makedepend))
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
index 89452f42d..9672656d6 100644
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -11,4 +11,4 @@ XUTIL_UTIL_MACROS_AUTORECONF = YES
XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
-$(eval $(call AUTOTARGETS,xutil_util-macros))
+$(eval $(call AUTOTARGETS,package/x11r7,xutil_util-macros))