summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rules/at-spi.in4
-rw-r--r--rules/at-spi.make46
-rw-r--r--rules/konq-e.in6
-rw-r--r--rules/konq-e.make44
-rw-r--r--rules/libIDL-2.in2
-rw-r--r--rules/libIDL-2.make48
-rw-r--r--rules/netkit-ftp.in2
-rw-r--r--rules/netkit-ftp.make72
-rw-r--r--rules/troll-ftpd.in2
-rw-r--r--rules/troll-ftpd.make42
10 files changed, 134 insertions, 134 deletions
diff --git a/rules/at-spi.in b/rules/at-spi.in
index 5445fd1ae..97766f8ce 100644
--- a/rules/at-spi.in
+++ b/rules/at-spi.in
@@ -1,4 +1,4 @@
-config AT-SPI
+config AT_SPI
bool
depends on BROKEN
prompt "Assistive Technology Service Provider Interface"
@@ -8,7 +8,7 @@ config AT-SPI
including the use of services, products, and information.
Assistive access means that system infrastructure allows add-on
assistive software to transparently provide specialized input and
- output capabilities. This is a part of the GNOME Prokect.
+ output capabilities. This is a part of the GNOME Project.
comment "at-spi is broken, please send a patch"
depends on !BROKEN
diff --git a/rules/at-spi.make b/rules/at-spi.make
index 607732645..e102a5ac1 100644
--- a/rules/at-spi.make
+++ b/rules/at-spi.make
@@ -12,17 +12,17 @@
#
# We provide this package
#
-PACKAGES-$(PTXCONF_AT-SPI) += at-spi
+PACKAGES-$(PTXCONF_AT_SPI) += at-spi
#
# Paths and names
#
-AT-SPI_VERSION = 1.3.13
-AT-SPI = at-spi-$(AT-SPI_VERSION)
-AT-SPI_SUFFIX = tar.bz2
-AT-SPI_URL = ftp://ftp.gnome.org/pub/GNOME/sources/at-spi/1.3/$(AT-SPI).$(AT-SPI_SUFFIX)
-AT-SPI_SOURCE = $(SRCDIR)/$(AT-SPI).$(AT-SPI_SUFFIX)
-AT-SPI_DIR = $(BUILDDIR)/$(AT-SPI)
+AT_SPI_VERSION = 1.3.13
+AT_SPI = at-spi-$(AT_SPI_VERSION)
+AT_SPI_SUFFIX = tar.bz2
+AT_SPI_URL = ftp://ftp.gnome.org/pub/GNOME/sources/at-spi/1.3/$(AT_SPI).$(AT_SPI_SUFFIX)
+AT_SPI_SOURCE = $(SRCDIR)/$(AT_SPI).$(AT_SPI_SUFFIX)
+AT_SPI_DIR = $(BUILDDIR)/$(AT_SPI)
-include $(call package_depfile)
@@ -36,9 +36,9 @@ $(STATEDIR)/at-spi.get: $(at-spi_get_deps_deps)
@$(call targetinfo, $@)
@$(call touch, $@)
-$(AT-SPI_SOURCE):
+$(AT_SPI_SOURCE):
@$(call targetinfo, $@)
- @$(call get, $(AT-SPI_URL))
+ @$(call get, $(AT_SPI_URL))
# ----------------------------------------------------------------------------
# Extract
@@ -48,9 +48,9 @@ at-spi_extract: $(STATEDIR)/at-spi.extract
$(STATEDIR)/at-spi.extract: $(at-spi_extract_deps_deps)
@$(call targetinfo, $@)
- @$(call clean, $(AT-SPI_DIR))
- @$(call extract, $(AT-SPI_SOURCE))
- @$(call patchin, $(AT-SPI))
+ @$(call clean, $(AT_SPI_DIR))
+ @$(call extract, $(AT_SPI_SOURCE))
+ @$(call patchin, $(AT_SPI))
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -59,21 +59,21 @@ $(STATEDIR)/at-spi.extract: $(at-spi_extract_deps_deps)
at-spi_prepare: $(STATEDIR)/at-spi.prepare
-AT-SPI_PATH = PATH=$(CROSS_PATH)
-AT-SPI_ENV = $(CROSS_ENV)
-#AT-SPI_ENV +=
+AT_SPI_PATH = PATH=$(CROSS_PATH)
+AT_SPI_ENV = $(CROSS_ENV)
+#AT_SPI_ENV +=
#
# autoconf
#
-AT-SPI_AUTOCONF = $(CROSS_AUTOCONF_USR)
+AT_SPI_AUTOCONF = $(CROSS_AUTOCONF_USR)
$(STATEDIR)/at-spi.prepare: $(at-spi_prepare_deps_default)
@$(call targetinfo, $@)
- @$(call clean, $(AT-SPI_DIR)/config.cache)
- cd $(AT-SPI_DIR) && \
- $(AT-SPI_PATH) $(AT-SPI_ENV) \
- ./configure $(AT-SPI_AUTOCONF)
+ @$(call clean, $(AT_SPI_DIR)/config.cache)
+ cd $(AT_SPI_DIR) && \
+ $(AT_SPI_PATH) $(AT_SPI_ENV) \
+ ./configure $(AT_SPI_AUTOCONF)
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -84,7 +84,7 @@ at-spi_compile: $(STATEDIR)/at-spi.compile
$(STATEDIR)/at-spi.compile: $(at-spi_compile_deps_default)
@$(call targetinfo, $@)
- cd $(AT-SPI_DIR) && $(AT-SPI_PATH) make
+ cd $(AT_SPI_DIR) && $(AT_SPI_PATH) make
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -95,7 +95,7 @@ at-spi_install: $(STATEDIR)/at-spi.install
$(STATEDIR)/at-spi.install: $(at-spi_install_deps_default)
@$(call targetinfo, $@)
- @$(call install, AT-SPI)
+ @$(call install, AT_SPI)
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -115,6 +115,6 @@ $(STATEDIR)/at-spi.targetinstall: $(at-spi_targetinstall_deps_default)
at-spi_clean:
rm -rf $(STATEDIR)/at-spi.*
- rm -rf $(AT-SPI_DIR)
+ rm -rf $(AT_SPI_DIR)
# vim: syntax=make
diff --git a/rules/konq-e.in b/rules/konq-e.in
index a7eda9d6e..caffd544d 100644
--- a/rules/konq-e.in
+++ b/rules/konq-e.in
@@ -1,10 +1,10 @@
-config KONQ-E
+config KONQ_E
bool
depends on BROKEN
- prompt "KONQ-E"
+ prompt "KONQ_E"
help
FIXME: This item needs to be documented
-comment "KONQ-E is broken, please send a patch"
+comment "KONQ_E is broken, please send a patch"
depends on !BROKEN
diff --git a/rules/konq-e.make b/rules/konq-e.make
index 731d4772b..aa4835b41 100644
--- a/rules/konq-e.make
+++ b/rules/konq-e.make
@@ -12,17 +12,17 @@
#
# We provide this package
#
-PACKAGES-$(PTXCONF_KONQ-E) += konq-e
+PACKAGES-$(PTXCONF_KONQ_E) += konq-e
#
# Paths and names
#
-KONQ-E_VERSION = snapshot-20030705
-KONQ-E = konqueror-embedded-$(KONQ-E_VERSION)
-KONQ-E_SUFFIX = tar.gz
-KONQ-E_URL = http://devel-home.kde.org/~hausmann/snapshots/$(KONQ-E).$(KONQ-E_SUFFIX)
-KONQ-E_SOURCE = $(SRCDIR)/$(KONQ-E).$(KONQ-E_SUFFIX)
-KONQ-E_DIR = $(BUILDDIR)/$(KONQ-E)
+KONQ_E_VERSION = snapshot-20030705
+KONQ_E = konqueror-embedded-$(KONQ_E_VERSION)
+KONQ_E_SUFFIX = tar.gz
+KONQ_E_URL = http://devel-home.kde.org/~hausmann/snapshots/$(KONQ_E).$(KONQ_E_SUFFIX)
+KONQ_E_SOURCE = $(SRCDIR)/$(KONQ_E).$(KONQ_E_SUFFIX)
+KONQ_E_DIR = $(BUILDDIR)/$(KONQ_E)
-include $(call package_depfile)
@@ -36,9 +36,9 @@ $(STATEDIR)/konq-e.get: $(konq-e_get_deps_default)
@$(call targetinfo, $@)
@$(call touch, $@)
-$(KONQ-E_SOURCE):
+$(KONQ_E_SOURCE):
@$(call targetinfo, $@)
- @$(call get, $(KONQ-E_URL))
+ @$(call get, $(KONQ_E_URL))
# ----------------------------------------------------------------------------
# Extract
@@ -48,9 +48,9 @@ konq-e_extract: $(STATEDIR)/konq-e.extract
$(STATEDIR)/konq-e.extract: $(konq-e_extract_deps_default)
@$(call targetinfo, $@)
- @$(call clean, $(KONQ-E_DIR))
- @$(call extract, $(KONQ-E_SOURCE))
- @$(call patchin, $(KONQ-E))
+ @$(call clean, $(KONQ_E_DIR))
+ @$(call extract, $(KONQ_E_SOURCE))
+ @$(call patchin, $(KONQ_E))
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -59,20 +59,20 @@ $(STATEDIR)/konq-e.extract: $(konq-e_extract_deps_default)
konq-e_prepare: $(STATEDIR)/konq-e.prepare
-KONQ-E_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
-KONQ-E_ENV = $(CROSS_ENV)
+KONQ_E_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
+KONQ_E_ENV = $(CROSS_ENV)
#
# autoconf
#
-KONQ-E_AUTOCONF = $(CROSS_AUTOCONF_USR)
+KONQ_E_AUTOCONF = $(CROSS_AUTOCONF_USR)
$(STATEDIR)/konq-e.prepare: $(konq-e_prepare_deps_default)
@$(call targetinfo, $@)
- @$(call clean, $(KONQ-E_BUILDDIR))
- cd $(KONQ-E_DIR) && \
- $(KONQ-E_PATH) $(KONQ-E_ENV) \
- ./configure $(KONQ-E_AUTOCONF)
+ @$(call clean, $(KONQ_E_BUILDDIR))
+ cd $(KONQ_E_DIR) && \
+ $(KONQ_E_PATH) $(KONQ_E_ENV) \
+ ./configure $(KONQ_E_AUTOCONF)
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -83,7 +83,7 @@ konq-e_compile: $(STATEDIR)/konq-e.compile
$(STATEDIR)/konq-e.compile: $(konq-e_compile_deps_default)
@$(call targetinfo, $@)
- cd $(KONQ-E_DIR) && $(KONQ-E_PATH) $(KONQ-E_ENV) make
+ cd $(KONQ_E_DIR) && $(KONQ_E_PATH) $(KONQ_E_ENV) make
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -95,7 +95,7 @@ konq-e_install: $(STATEDIR)/konq-e.install
$(STATEDIR)/konq-e.install: $(konq-e_install_deps_default)
@$(call targetinfo, $@)
# FIXME: RSC: shouldn't this be target-install?
- @$(call install, KONQ-E)
+ @$(call install, KONQ_E)
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -114,6 +114,6 @@ $(STATEDIR)/konq-e.targetinstall: $(konq-e_targetinstall_deps_default)
konq-e_clean:
rm -rf $(STATEDIR)/konq-e.*
- rm -rf $(KONQ-E_DIR)
+ rm -rf $(KONQ_E_DIR)
# vim: syntax=make
diff --git a/rules/libIDL-2.in b/rules/libIDL-2.in
index a3905f219..baad9832b 100644
--- a/rules/libIDL-2.in
+++ b/rules/libIDL-2.in
@@ -1,4 +1,4 @@
-config LIBIDL-2
+config LIBIDL_2
bool
depends on BROKEN
prompt "LIBIDL-2"
diff --git a/rules/libIDL-2.make b/rules/libIDL-2.make
index 682030b05..f00d5709d 100644
--- a/rules/libIDL-2.make
+++ b/rules/libIDL-2.make
@@ -15,17 +15,17 @@
#
# We provide this package
#
-PACKAGES-$(PTXCONF_LIBIDL-2) += libidl-2
+PACKAGES-$(PTXCONF_LIBIDL_2) += libidl-2
#
# Paths and names
#
-LIBIDL-2_VERSION = 0.8.3
-LIBIDL-2 = libIDL-$(LIBIDL-2_VERSION)
-LIBIDL-2_SUFFIX = tar.gz
-LIBIDL-2_URL = http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/$(LIBIDL-2).$(LIBIDL-2_SUFFIX)
-LIBIDL-2_SOURCE = $(SRCDIR)/$(LIBIDL-2).$(LIBIDL-2_SUFFIX)
-LIBIDL-2_DIR = $(BUILDDIR)/$(LIBIDL-2)
+LIBIDL_2_VERSION = 0.8.3
+LIBIDL_2 = libIDL-$(LIBIDL_2_VERSION)
+LIBIDL_2_SUFFIX = tar.gz
+LIBIDL_2_URL = http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/$(LIBIDL_2).$(LIBIDL_2_SUFFIX)
+LIBIDL_2_SOURCE = $(SRCDIR)/$(LIBIDL_2).$(LIBIDL_2_SUFFIX)
+LIBIDL_2_DIR = $(BUILDDIR)/$(LIBIDL_2)
-include $(call package_depfile)
@@ -39,9 +39,9 @@ $(STATEDIR)/libidl-2.get: $(libidl-2_get_deps_default)
@$(call targetinfo, $@)
@$(call touch, $@)
-$(LIBIDL-2_SOURCE):
+$(LIBIDL_2_SOURCE):
@$(call targetinfo, $@)
- @$(call get, $(LIBIDL-2_URL))
+ @$(call get, $(LIBIDL_2_URL))
# ----------------------------------------------------------------------------
# Extract
@@ -51,9 +51,9 @@ libidl-2_extract: $(STATEDIR)/libidl-2.extract
$(STATEDIR)/libidl-2.extract: $(libidl-2_extract_deps_default)
@$(call targetinfo, $@)
- @$(call clean, $(LIBIDL-2_DIR))
- @$(call extract, $(LIBIDL-2_SOURCE))
- @$(call patchin, $(LIBIDL-2))
+ @$(call clean, $(LIBIDL_2_DIR))
+ @$(call extract, $(LIBIDL_2_SOURCE))
+ @$(call patchin, $(LIBIDL_2))
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -62,26 +62,26 @@ $(STATEDIR)/libidl-2.extract: $(libidl-2_extract_deps_default)
libidl-2_prepare: $(STATEDIR)/libidl-2.prepare
-LIBIDL-2_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
-LIBIDL-2_ENV = \
+LIBIDL_2_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
+LIBIDL_2_ENV = \
$(CROSS_ENV) \
libIDL_cv_long_long_format=ll
#
# autoconf
#
-LIBIDL-2_AUTOCONF = $(CROSS_AUTOCONF_USR)
+LIBIDL_2_AUTOCONF = $(CROSS_AUTOCONF_USR)
-ifdef PTXCONF_LIBIDL-2_FOO
-LIBIDL-2_AUTOCONF += --enable-foo
+ifdef PTXCONF_LIBIDL_2_FOO
+LIBIDL_2_AUTOCONF += --enable-foo
endif
$(STATEDIR)/libidl-2.prepare: $(libidl-2_prepare_deps_default)
@$(call targetinfo, $@)
- @$(call clean, $(LIBIDL-2_BUILDDIR))
- cd $(LIBIDL-2_DIR) && \
- $(LIBIDL-2_PATH) $(LIBIDL-2_ENV) \
- ./configure $(LIBIDL-2_AUTOCONF)
+ @$(call clean, $(LIBIDL_2_BUILDDIR))
+ cd $(LIBIDL_2_DIR) && \
+ $(LIBIDL_2_PATH) $(LIBIDL_2_ENV) \
+ ./configure $(LIBIDL_2_AUTOCONF)
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -93,7 +93,7 @@ libidl-2_compile: $(STATEDIR)/libidl-2.compile
$(STATEDIR)/libidl-2.compile: $(libidl-2_compile_deps_default)
@$(call targetinfo, $@)
- cd $(LIBIDL-2_DIR) && $(LIBIDL-2_PATH) $(LIBIDL-2_ENV) make
+ cd $(LIBIDL_2_DIR) && $(LIBIDL_2_PATH) $(LIBIDL_2_ENV) make
@$(call touch, $@)
@@ -105,7 +105,7 @@ libidl-2_install: $(STATEDIR)/libidl-2.install
$(STATEDIR)/libidl-2.install: $(libidl-2_install_deps_default)
@$(call targetinfo, $@)
- @$(call install, LIBIDL-2)
+ @$(call install, LIBIDL_2)
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -125,6 +125,6 @@ $(STATEDIR)/libidl-2.targetinstall: $(libidl-2_targetinstall_deps_default)
libidl-2_clean:
rm -rf $(STATEDIR)/libidl-2.*
- rm -rf $(LIBIDL-2_DIR)
+ rm -rf $(LIBIDL_2_DIR)
# vim: syntax=make
diff --git a/rules/netkit-ftp.in b/rules/netkit-ftp.in
index 0c63be007..a7139ff49 100644
--- a/rules/netkit-ftp.in
+++ b/rules/netkit-ftp.in
@@ -1,6 +1,6 @@
menu "netkit-ftp "
-config NETKIT-FTP
+config NETKIT_FTP
bool
prompt "Install the NetKit FTP client"
help
diff --git a/rules/netkit-ftp.make b/rules/netkit-ftp.make
index 5d4e02a95..a592394d3 100644
--- a/rules/netkit-ftp.make
+++ b/rules/netkit-ftp.make
@@ -12,17 +12,17 @@
#
# We provide this package
#
-PACKAGES-$(PTXCONF_NETKIT-FTP) += netkit-ftp
+PACKAGES-$(PTXCONF_NETKIT_FTP) += netkit-ftp
#
# Paths and names
#
-NETKIT-FTP_VERSION = 0.17
-NETKIT-FTP = netkit-ftp-$(NETKIT-FTP_VERSION)
-NETKIT-FTP_SUFFIX = tar.gz
-NETKIT-FTP_URL = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit//$(NETKIT-FTP).$(NETKIT-FTP_SUFFIX)
-NETKIT-FTP_SOURCE = $(SRCDIR)/$(NETKIT-FTP).$(NETKIT-FTP_SUFFIX)
-NETKIT-FTP_DIR = $(BUILDDIR)/$(NETKIT-FTP)
+NETKIT_FTP_VERSION = 0.17
+NETKIT_FTP = netkit-ftp-$(NETKIT_FTP_VERSION)
+NETKIT_FTP_SUFFIX = tar.gz
+NETKIT_FTP_URL = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit//$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX)
+NETKIT_FTP_SOURCE = $(SRCDIR)/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX)
+NETKIT_FTP_DIR = $(BUILDDIR)/$(NETKIT_FTP)
-include $(call package_depfile)
@@ -36,9 +36,9 @@ $(STATEDIR)/netkit-ftp.get: $(netkit-ftp_get_deps_default)
@$(call targetinfo, $@)
@$(call touch, $@)
-$(NETKIT-FTP_SOURCE):
+$(NETKIT_FTP_SOURCE):
@$(call targetinfo, $@)
- @$(call get, $(NETKIT-FTP_URL))
+ @$(call get, $(NETKIT_FTP_URL))
# ----------------------------------------------------------------------------
# Extract
@@ -48,9 +48,9 @@ netkit-ftp_extract: $(STATEDIR)/netkit-ftp.extract
$(STATEDIR)/netkit-ftp.extract: $(netkit-ftp_extract_deps_default)
@$(call targetinfo, $@)
- @$(call clean, $(NETKIT-FTP_DIR))
- @$(call extract, $(NETKIT-FTP_SOURCE))
- @$(call patchin, $(NETKIT-FTP))
+ @$(call clean, $(NETKIT_FTP_DIR))
+ @$(call extract, $(NETKIT_FTP_SOURCE))
+ @$(call patchin, $(NETKIT_FTP))
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -59,32 +59,32 @@ $(STATEDIR)/netkit-ftp.extract: $(netkit-ftp_extract_deps_default)
netkit-ftp_prepare: $(STATEDIR)/netkit-ftp.prepare
-NETKIT-FTP_PATH = PATH=$(CROSS_PATH)
-NETKIT-FTP_ENV = $(CROSS_ENV)
+NETKIT_FTP_PATH = PATH=$(CROSS_PATH)
+NETKIT_FTP_ENV = $(CROSS_ENV)
#
# autoconf
#
-NETKIT-FTP_AUTOCONF = $(CROSS_AUTOCONF_USR)
+NETKIT_FTP_AUTOCONF = $(CROSS_AUTOCONF_USR)
$(STATEDIR)/netkit-ftp.prepare: $(netkit-ftp_prepare_deps_default)
@$(call targetinfo, $@)
- @$(call clean, $(NETKIT-FTP_DIR)/config.cache)
- cd $(NETKIT-FTP_DIR) && \
- echo "BINDIR=/usr/bin" > $(NETKIT-FTP_DIR)/MCONFIG \
- echo "MANDIR=/usr/man" >> $(NETKIT-FTP_DIR)/MCONFIG \
- echo "BINMODE=755" >> $(NETKIT-FTP_DIR)/MCONFIG \
- echo "MANMODE=644" >> $(NETKIT-FTP_DIR)/MCONFIG \
- echo "PREFIX=/usr" >> $(NETKIT-FTP_DIR)/MCONFIG \
- echo "EXECPREFIX=/usr" >> $(NETKIT-FTP_DIR)/MCONFIG \
- echo "INSTALLROOT=" >> $(NETKIT-FTP_DIR)/MCONFIG \
- echo $(CROSS_ENV_CC) >> $(NETKIT-FTP_DIR)/MCONFIG \
- echo "CFLAGS=-O2 -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline" >> $(NETKIT-FTP_DIR)/MCONFIG \
- echo "LDFLAGS=" >> $(NETKIT-FTP_DIR)/MCONFIG \
- echo "LIBS=" >> $(NETKIT-FTP_DIR)/MCONFIG \
- echo "LIBTERMCAP=-lncurses" >> $(NETKIT-FTP_DIR)/MCONFIG \
- echo "USE_GLIBC=1" >> $(NETKIT-FTP_DIR)/MCONFIG \
- echo "USE_READLINE=0" >> $(NETKIT-FTP_DIR)/MCONFIG
+ @$(call clean, $(NETKIT_FTP_DIR)/config.cache)
+ cd $(NETKIT_FTP_DIR) && \
+ echo "BINDIR=/usr/bin" > $(NETKIT_FTP_DIR)/MCONFIG \
+ echo "MANDIR=/usr/man" >> $(NETKIT_FTP_DIR)/MCONFIG \
+ echo "BINMODE=755" >> $(NETKIT_FTP_DIR)/MCONFIG \
+ echo "MANMODE=644" >> $(NETKIT_FTP_DIR)/MCONFIG \
+ echo "PREFIX=/usr" >> $(NETKIT_FTP_DIR)/MCONFIG \
+ echo "EXECPREFIX=/usr" >> $(NETKIT_FTP_DIR)/MCONFIG \
+ echo "INSTALLROOT=" >> $(NETKIT_FTP_DIR)/MCONFIG \
+ echo $(CROSS_ENV_CC) >> $(NETKIT_FTP_DIR)/MCONFIG \
+ echo "CFLAGS=-O2 -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline" >> $(NETKIT_FTP_DIR)/MCONFIG \
+ echo "LDFLAGS=" >> $(NETKIT_FTP_DIR)/MCONFIG \
+ echo "LIBS=" >> $(NETKIT_FTP_DIR)/MCONFIG \
+ echo "LIBTERMCAP=-lncurses" >> $(NETKIT_FTP_DIR)/MCONFIG \
+ echo "USE_GLIBC=1" >> $(NETKIT_FTP_DIR)/MCONFIG \
+ echo "USE_READLINE=0" >> $(NETKIT_FTP_DIR)/MCONFIG
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -95,7 +95,7 @@ netkit-ftp_compile: $(STATEDIR)/netkit-ftp.compile
$(STATEDIR)/netkit-ftp.compile: $(netkit-ftp_compile_deps_default)
@$(call targetinfo, $@)
- cd $(NETKIT-FTP_DIR) && $(NETKIT-FTP_ENV) $(NETKIT-FTP_PATH) make
+ cd $(NETKIT_FTP_DIR) && $(NETKIT_FTP_ENV) $(NETKIT_FTP_PATH) make
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -107,7 +107,7 @@ netkit-ftp_install: $(STATEDIR)/netkit-ftp.install
$(STATEDIR)/netkit-ftp.install: $(netkit-ftp_install_deps_default)
@$(call targetinfo, $@)
# FIXME
- # @$(call install, NETKIT-FTP)
+ # @$(call install, NETKIT_FTP)
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -122,13 +122,13 @@ $(STATEDIR)/netkit-ftp.targetinstall: $(netkit-ftp_targetinstall_deps_default)
@$(call install_init, netkit-ftp)
@$(call install_fixup, netkit-ftp,PACKAGE,netkit-ftp)
@$(call install_fixup, netkit-ftp,PRIORITY,optional)
- @$(call install_fixup, netkit-ftp,VERSION,$(NETKIT-FTP_VERSION))
+ @$(call install_fixup, netkit-ftp,VERSION,$(NETKIT_FTP_VERSION))
@$(call install_fixup, netkit-ftp,SECTION,base)
@$(call install_fixup, netkit-ftp,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
@$(call install_fixup, netkit-ftp,DEPENDS,libc)
@$(call install_fixup, netkit-ftp,DESCRIPTION,missing)
- @$(call install_copy, netkit-ftp, 0, 0, 0755, $(NETKIT-FTP_DIR)/ftp/ftp, /bin/ftp)
+ @$(call install_copy, netkit-ftp, 0, 0, 0755, $(NETKIT_FTP_DIR)/ftp/ftp, /bin/ftp)
@$(call install_finish, netkit-ftp)
@@ -141,6 +141,6 @@ $(STATEDIR)/netkit-ftp.targetinstall: $(netkit-ftp_targetinstall_deps_default)
netkit-ftp_clean:
rm -rf $(STATEDIR)/netkit-ftp.*
rm -rf $(IMAGEDIR)/netkit-ftp_*
- rm -rf $(NETKIT-FTP_DIR)
+ rm -rf $(NETKIT_FTP_DIR)
# vim: syntax=make
diff --git a/rules/troll-ftpd.in b/rules/troll-ftpd.in
index 8fa95011e..2e4a07004 100644
--- a/rules/troll-ftpd.in
+++ b/rules/troll-ftpd.in
@@ -1,6 +1,6 @@
menu "Troll FTPD "
-config TROLL-FTPD
+config TROLL_FTPD
bool
prompt "troll-ftpd"
depends on BROKEN
diff --git a/rules/troll-ftpd.make b/rules/troll-ftpd.make
index 6c56ee3f9..8384201f7 100644
--- a/rules/troll-ftpd.make
+++ b/rules/troll-ftpd.make
@@ -12,17 +12,17 @@
#
# We provide this package
#
-PACKAGES-$(PTXCONF_TROLL-FTPD) += troll-ftpd
+PACKAGES-$(PTXCONF_TROLL_FTPD) += troll-ftpd
#
# Paths and names
#
-TROLL-FTPD_VERSION = 1.28
-TROLL-FTPD = troll-ftpd-$(TROLL-FTPD_VERSION)
-TROLL-FTPD_SUFFIX = tar.gz
-TROLL-FTPD_URL = ftp://ftp.trolltech.com/freebies/ftpd/$(TROLL-FTPD).$(TROLL-FTPD_SUFFIX)
-TROLL-FTPD_SOURCE = $(SRCDIR)/$(TROLL-FTPD).$(TROLL-FTPD_SUFFIX)
-TROLL-FTPD_DIR = $(BUILDDIR)/$(TROLL-FTPD)
+TROLL_FTPD_VERSION = 1.28
+TROLL_FTPD = troll-ftpd-$(TROLL_FTPD_VERSION)
+TROLL_FTPD_SUFFIX = tar.gz
+TROLL_FTPD_URL = ftp://ftp.trolltech.com/freebies/ftpd/$(TROLL_FTPD).$(TROLL_FTPD_SUFFIX)
+TROLL_FTPD_SOURCE = $(SRCDIR)/$(TROLL_FTPD).$(TROLL_FTPD_SUFFIX)
+TROLL_FTPD_DIR = $(BUILDDIR)/$(TROLL_FTPD)
-include $(call package_depfile)
@@ -36,9 +36,9 @@ $(STATEDIR)/troll-ftpd.get: $(troll-ftpd_get_deps_default)
@$(call targetinfo, $@)
@$(call touch, $@)
-$(TROLL-FTPD_SOURCE):
+$(TROLL_FTPD_SOURCE):
@$(call targetinfo, $@)
- @$(call get, $(TROLL-FTPD_URL))
+ @$(call get, $(TROLL_FTPD_URL))
# ----------------------------------------------------------------------------
# Extract
@@ -48,9 +48,9 @@ troll-ftpd_extract: $(STATEDIR)/troll-ftpd.extract
$(STATEDIR)/troll-ftpd.extract: $(troll-ftpd_extract_deps_default)
@$(call targetinfo, $@)
- @$(call clean, $(TROLL-FTPD_DIR))
- @$(call extract, $(TROLL-FTPD_SOURCE))
- @$(call patchin, $(TROLL-FTPD))
+ @$(call clean, $(TROLL_FTPD_DIR))
+ @$(call extract, $(TROLL_FTPD_SOURCE))
+ @$(call patchin, $(TROLL_FTPD))
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -59,14 +59,14 @@ $(STATEDIR)/troll-ftpd.extract: $(troll-ftpd_extract_deps_default)
troll-ftpd_prepare: $(STATEDIR)/troll-ftpd.prepare
-TROLL-FTPD_PATH = PATH=$(CROSS_PATH)
-TROLL-FTPD_ENV = $(CROSS_ENV)
+TROLL_FTPD_PATH = PATH=$(CROSS_PATH)
+TROLL_FTPD_ENV = $(CROSS_ENV)
$(STATEDIR)/troll-ftpd.prepare: $(troll-ftpd_prepare_deps_default)
@$(call targetinfo, $@)
- @$(call clean, $(TROLL-FTPD_DIR)/config.cache)
- perl -p -i -e 's/CC = /CC ?= /' $(TROLL-FTPD_DIR)/Makefile
- perl -p -i -e 's/CFLAGS = /CFLAGS ?= /' $(TROLL-FTPD_DIR)/Makefile
+ @$(call clean, $(TROLL_FTPD_DIR)/config.cache)
+ perl -p -i -e 's/CC = /CC ?= /' $(TROLL_FTPD_DIR)/Makefile
+ perl -p -i -e 's/CFLAGS = /CFLAGS ?= /' $(TROLL_FTPD_DIR)/Makefile
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -77,7 +77,7 @@ troll-ftpd_compile: $(STATEDIR)/troll-ftpd.compile
$(STATEDIR)/troll-ftpd.compile: $(troll-ftpd_compile_deps_default)
@$(call targetinfo, $@)
- cd $(TROLL-FTPD_DIR) && $(TROLL-FTPD_ENV) $(TROLL-FTPD_PATH) make
+ cd $(TROLL_FTPD_DIR) && $(TROLL_FTPD_ENV) $(TROLL_FTPD_PATH) make
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -102,13 +102,13 @@ $(STATEDIR)/troll-ftpd.targetinstall: $(troll-ftpd_targetinstall_deps_default)
@$(call install_init, troll-ftpd)
@$(call install_fixup, troll-ftpd,PACKAGE,trollftpd)
@$(call install_fixup, troll-ftpd,PRIORITY,optional)
- @$(call install_fixup, troll-ftpd,VERSION,$(TROLL-FTPD_VERSION))
+ @$(call install_fixup, troll-ftpd,VERSION,$(TROLL_FTPD_VERSION))
@$(call install_fixup, troll-ftpd,SECTION,base)
@$(call install_fixup, troll-ftpd,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
@$(call install_fixup, troll-ftpd,DEPENDS,)
@$(call install_fixup, troll-ftpd,DESCRIPTION,missing)
- @$(call install_copy, troll-ftpd, 0, 0, 0755, $(TROLL-FTPD_DIR)/ftpd, /sbin/ftpd)
+ @$(call install_copy, troll-ftpd, 0, 0, 0755, $(TROLL_FTPD_DIR)/ftpd, /sbin/ftpd)
@$(call install_finish, troll-ftpd)
@@ -121,6 +121,6 @@ $(STATEDIR)/troll-ftpd.targetinstall: $(troll-ftpd_targetinstall_deps_default)
troll-ftpd_clean:
rm -rf $(STATEDIR)/troll-ftpd.*
rm -rf $(IMAGEDIR)/troll-ftpd_*
- rm -rf $(TROLL-FTPD_DIR)
+ rm -rf $(TROLL_FTPD_DIR)
# vim: syntax=make
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-22 08:27:43 +0000