summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-11 19:15:33 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-11 19:15:33 +0100
commit4c89b446f8d87344c244cda2eb97657d159905e2 (patch)
treef89946eb8eb37ceacedea6d11eb1c27e2ffa4a24
parent7e9efc2e40250fe9717e1af16465a391a72a4ff6 (diff)
parent5d8ca48432408fe46e89590ea0e5948607c4ce5d (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/libXfont/Makefile1
-rw-r--r--package/libXt/patches/patch-util_Makefile_in46
-rw-r--r--scripts/scan-pkgs.sh16
3 files changed, 63 insertions, 0 deletions
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index 8276aa6c2..9b8243bdf 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -16,6 +16,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+XAKE_FLAGS+= V=1
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in
new file mode 100644
index 000000000..7a9a888b7
--- /dev/null
+++ b/package/libXt/patches/patch-util_Makefile_in
@@ -0,0 +1,46 @@
+--- libXt-1.0.7.orig/util/Makefile.in 2009-10-09 06:51:17.000000000 +0200
++++ libXt-1.0.7/util/Makefile.in 2009-12-11 18:16:05.000000000 +0100
+@@ -131,7 +131,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+ CHANGELOG_CMD = @CHANGELOG_CMD@
+ CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS =
+ CWARNFLAGS = @CWARNFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+@@ -253,7 +253,8 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
+-makestrs_CFLAGS = $(XT_CFLAGS)
++makestrs_CFLAGS = $(HOSTCFLAGS)
++makestrs_CPPFLAGS = $(HOSTCPPFLAGS)
+ makestrs_SOURCES = makestrs.c
+
+ # Man page
+@@ -393,20 +394,20 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ makestrs-makestrs.o: makestrs.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makestrs-makestrs.Tpo $(DEPDIR)/makestrs-makestrs.Po
+ @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
+
+ makestrs-makestrs.obj: makestrs.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makestrs-makestrs.Tpo $(DEPDIR)/makestrs-makestrs.Po
+ @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
+
+ mostlyclean-libtool:
+ -rm -f *.lo
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 1e4d6db8c..fe94d8317 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -83,6 +83,11 @@ if [[ -n $ADK_PACKAGE_LIBPCAP ]]; then
NEED_BISON="$NEED_BISON libpcap"
fi
+if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
+ NEED_WWW="$NEED_WWW libXfont"
+ NEED_XMLTO="$NEED_XMLTO libXfont"
+fi
+
if [[ -n $NEED_GETTEXT ]]; then
if ! which xgettext >/dev/null 2>&1; then
echo >&2 You need gettext to build $NEED_GETTEXT
@@ -118,6 +123,17 @@ if [[ -n $NEED_INTL ]]; then
fi
fi
+if [[ -n $NEED_WWW ]]; then
+ if ! which w3m >/dev/null 2>&1; then
+ if ! which lynx >/dev/null 2>&1; then
+ if ! which links >/dev/null 2>&1; then
+ echo >&2 You need w3m/links/lynx to build $NEED_WWW
+ out=1
+ fi
+ fi
+ fi
+fi
+
if [[ -n $NEED_BISON ]]; then
if ! which bison >/dev/null 2>&1; then
echo >&2 You need bison to build $NEED_BISON