- extend AUTOTARGETS with an argument DIR_PREFIX for the location of the package

  (Ivan Kuten)

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

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))
 

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))

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))
 

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))

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))
 

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))
 

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))

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))

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))

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))

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))