resolve xterm Makefile conflict

115 files changed, 1166 insertions, 209 deletions

diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 97ee10c19..3ad50203f 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -16,7 +16,9 @@ PKG_URL:=		http://www.mesa3d.org/
 PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/7.8.2/
 PKG_NEED_CXX:=		1
 
-PKG_SUBPKGS:=		MESALIB GLXINFO GLXGEARS
+PKG_SUBPKGS:=		MESALIB MESALIB_DEV GLXINFO GLXGEARS
+PKGSD_MESALIB_DEV:=	MESA headers
+PKGSC_MESALIB_DEV:=	devel
 PKGSD_GLXINFO:=		Display various GLX information
 PKGSC_GLXINFO:=		x11/apps
 PKGSD_GLXGEARS:=	Nice little OpenGL demo application
@@ -29,6 +31,7 @@ WRKDIST=		${WRKDIR}/Mesa-${PKG_VERSION}
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MESALIB_DEV,mesalib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MESALIB_DEV},${PKGSC_MESALIB_DEV}))
 $(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXINFO},${PKGSC_GLXINFO}))
 $(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXGEARS},${PKGSC_GLXGEARS}))
 
@@ -44,6 +47,9 @@ CONFIGURE_ARGS+=	--disable-static \
 			--with-demos=xdemos
 
 XAKE_FLAGS+=		HOST_CC=${CC_FOR_BUILD} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile
+ifeq ($(ADK_NATIVE),y)
+XAKE_FLAGS+=		RANLIB=ranlib AR=ar
+endif
 
 post-extract:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
@@ -59,25 +65,33 @@ post-extract:
 		${STAGING_HOST_DIR}/bin/glslcompile
 	${MAKE} -C ${WRKBUILD}/src/glsl clean
 
-pre-configure:
-	$(SED) "s#@@RANLIB@@#${TARGET_CROSS}ranlib#" ${WRKBUILD}/configs/default
-	$(SED) "s#@@AR@@#${TARGET_CROSS}ar#" ${WRKBUILD}/configs/default
-
-post-install:
+mesalib-install:
 	$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri
 	$(CP) $(WRKINST)/usr/lib/libGL*.so* \
 		$(IDIR_MESALIB)/usr/lib
+	${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \
+		${IDIR_MESALIB}/usr/lib/dri/
 ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
 	${CP} $(WRKINST)/usr/lib/dri/i915_dri.so \
 		${IDIR_MESALIB}/usr/lib/dri/
 endif
-	${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \
-		${IDIR_MESALIB}/usr/lib/dri/
+
+glxinfo-install:
 	${INSTALL_DIR} ${IDIR_GLXINFO}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/progs/xdemos/glxinfo \
 		${IDIR_GLXINFO}/usr/bin/
+
+glxgears-install:
 	${INSTALL_DIR} ${IDIR_GLXGEARS}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/progs/xdemos/glxgears \
 		${IDIR_GLXGEARS}/usr/bin/
 
+mesalib-dev-install:
+	$(INSTALL_DIR) $(IDIR_MESALIB_DEV)/usr/include
+	${CP} ${WRKINST}/usr/include/* \
+		$(IDIR_MESALIB_DEV)/usr/include
+	$(INSTALL_DIR) $(IDIR_MESALIB_DEV)/usr/lib/pkgconfig
+	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		$(IDIR_MESALIB_DEV)/usr/lib/pkgconfig
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 0449b21fb..169374eb0 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -167,10 +167,10 @@ do-install:
 
 asterisk-pgsql-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/etc/asterisk
-	${INSTALL_DATA} $(WRKBUILD)/configs/cdr_pgsql.conf.sample \
-		$(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf
+	${INSTALL_DATA} $(WRKINST)/etc/asterisk/cdr_pgsql.conf \
+		$(IDIR_ASTERISK_PGSQL)/etc/asterisk/
 	${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules
-	${INSTALL_BIN} $(WRKBUILD)/cdr/cdr_pgsql.so \
+	${INSTALL_BIN} $(WRKINST)/usr/lib/asterisk/modules/cdr_pgsql.so \
 		$(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
 
 asterisk-sounds-install:
diff --git a/package/base-files/src/etc/network/if-pre-up.d/02-vlan b/package/base-files/src/etc/network/if-pre-up.d/02-vlan
index 35b7fca59..26b33ca80 100755
--- a/package/base-files/src/etc/network/if-pre-up.d/02-vlan
+++ b/package/base-files/src/etc/network/if-pre-up.d/02-vlan
@@ -1,12 +1,18 @@
 #!/bin/sh
 
-[ -x /sbin/vconfig ] || exit 0
-[ -d /proc/net/vlan ] || exit 0
+which vconfig || {
+	echo "vconfig executable not found, aborting"
+	exit 0
+}
+[ -d /proc/net/vlan ] || {
+	echo "no kernel support for 802.1q found, aborting"
+	exit 0
+}
 
 case "$IFACE" in
         vlan*)
-               	vconfig set_name_type VLAN_PLUS_VID_NO_PAD
-               	VLANID=`echo $IFACE|sed "s/vlan*//"`
+		vconfig set_name_type VLAN_PLUS_VID_NO_PAD
+		VLANID=`echo $IFACE|sed "s/vlan*//"`
 		;;
 	eth*.*)
 		vconfig set_name_type DEV_PLUS_VID_NO_PAD
diff --git a/package/bdftopcf/Makefile b/package/bdftopcf/Makefile
new file mode 100644
index 000000000..f807f9d48
--- /dev/null
+++ b/package/bdftopcf/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		bdftopcf
+PKG_VERSION:=		1.0.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f2d5c8a7813c3f9902e163c620a83dd4
+PKG_DESCR:=		bdftopcf font utility
+PKG_BUILDDEP:=		libXfont
+PKG_SECTION:=		x11/apps
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,BDFTOPCF,bdftopcf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+bdftopcf-install:
+	$(INSTALL_DIR) $(IDIR_BDFTOPCF)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/bdftopcf \
+		$(IDIR_BDFTOPCF)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile
index fb7cc7f97..454ff1b60 100644
--- a/package/bigreqsproto/Makefile
+++ b/package/bigreqsproto/Makefile
@@ -18,5 +18,8 @@ $(eval $(call PKG_template,BIGREQSPROTO,bigreqsproto,$(PKG_VERSION)-${PKG_RELEAS
 post-install:
 	${INSTALL_DIR} ${IDIR_BIGREQSPROTO}/usr/include
 	${CP} ${WRKINST}/usr/include/X11 ${IDIR_BIGREQSPROTO}/usr/include
+	${INSTALL_DIR} ${IDIR_BIGREQSPROTO}/usr/lib/pkgconfig
+	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/bigreqsproto.pc \
+		${IDIR_BIGREQSPROTO}/usr/lib/pkgconfig