Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
authorKoen Kooi <koen@openembedded.org>
Fri, 22 Apr 2005 22:26:58 +0000 (22:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 22 Apr 2005 22:26:58 +0000 (22:26 +0000)
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/04/23 00:25:30+02:00 utwente.nl!koen
libbtctl_0.4.1.bb, driftnet_0.1.6.bb, btchatd_011.bb: add to nonworking in the hope someone will get them to work

BKrev: 42697a328du0AS7BIuckbrM9ao5C9w

packages/gpe-tetris/gpe-tetris-0.6-2/fix-makefiles.patch
packages/nonworking/btchatd_011.bb [new file with mode: 0644]
packages/nonworking/driftnet_0.1.6.bb [new file with mode: 0644]
packages/nonworking/libbtctl_0.4.1.bb [new file with mode: 0644]

index e69de29..b129773 100644 (file)
@@ -0,0 +1,282 @@
+diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg
+--- ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg   1970-01-01 01:00:00.000000000 +0100
++++ gpe-tetris-0.6-2/build/Makefile.dpkg_ipkg  2004-09-18 21:04:03.000000000 +0100
+@@ -0,0 +1,114 @@
++## Please read the README in this directory to see how to use this
++## Makefile snippet
++
++# Let's use whatever clean target the specific app provides
++
++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
++
++# URL to source tarball
++SOURCE = ftp://gpe.handhelds.org/gpe/source/$(PACKAGE)-$(VERSION).tar.gz
++
++# can change this to e.g. /var/tmp/deb
++DEB_PATH = ../deb
++
++ifeq ($(CVSBUILD),yes)
++LIBGPEWIDGET_PC = libgpewidget-uninstalled
++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget
++else
++LIBGPEWIDGET_PC = libgpewidget
++endif
++
++ifeq ($(IN_LIBGPEWIDGET),)
++GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC))
++GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC))
++endif
++
++GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0)
++GTKLIBS = $(shell pkg-config --libs gtk+-2.0)
++
++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
++STANDARD_CFLAGS = -MD -Wall
++
++ifeq ($(DEBUG),yes)
++CFLAGS += -O2 -g
++LDFLAGS = -g
++else
++CFLAGS += -Os -fomit-frame-pointer
++endif
++
++dist: check-source clean dist-prep
++      rm -rf ../$(PACKAGE)-$(VERSION)
++      mkdir ../$(PACKAGE)-$(VERSION)
++      ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -)
++      ( cd ../$(PACKAGE)-$(VERSION); mkdir build; cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ ; sed 's:^CVSBUILD.*:CVSBUILD = no:' < Makefile > Makefile.new; mv Makefile.new Makefile )
++      ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
++      rm -rf ../$(PACKAGE)-$(VERSION)
++      $(MAKE) printinfo
++
++dist-upload: dist
++      scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@handhelds.org:/home/ftp/pub/projects/gpe/source/
++
++dist-prep:
++ipkg-prep:
++install-mo:
++# empty, can be filled in Makefile.translation
++
++install: install-program install-mo
++
++clean-dist:
++      rm -rf familiar/dist familiar/dist.list
++
++clean: clean-dist
++
++check-source:
++      @if [ -e familiar ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file.  Aborting.\n"; exit 1; fi
++
++ipkg: check-source ipkg-prep clean
++      rm -rf familiar/dist
++      mkdir -p familiar/dist/CONTROL
++      sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control
++      if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi
++      if test -e familiar/preinst;   then install familiar/preinst   familiar/dist/CONTROL; fi
++      if test -e familiar/postinst;  then install familiar/postinst  familiar/dist/CONTROL; fi
++      if test -e familiar/prerm;     then install familiar/prerm     familiar/dist/CONTROL; fi
++      if test -e familiar/postrm;    then install familiar/postrm    familiar/dist/CONTROL; fi
++      $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
++      rm -rf familiar/dist.list
++      ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
++      if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
++      md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
++      rm -rf familiar/dist familiar/dist.list
++      $(MAKE) printinfo
++
++dpkg: dist
++      mkdir -p $(DEB_PATH)
++      ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz )
++      mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian
++      for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done
++
++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_])
++printinfo:
++      @printf '-------------------------------------------------------------------------------\n'
++      @printf "If this becomes a package release, please add a CVS tag.\n"
++      @printf "You can use 'make tag' for that, it will execute\n"
++      @printf "   cvs tag %s\n" $(CVSTAG)
++      @printf "Please upload a tarball (created with 'make dist') to\n"
++      @printf "   ftp://ftp.handhelds.org/pub/projects/gpe/\n"
++      @printf "   (handhelds.org:~ftp/pub/projects/gpe/source)\n"
++      @printf "You can use 'make dist-upload' to do that.\n"
++      @printf "You are currently known as USER %s.\n" $(USER)
++      @printf '-------------------------------------------------------------------------------\n'
++
++tag: check-source
++      cvs tag $(CVSTAG)
++
++retag: check-source
++      cvs tag -F $(CVSTAG)
++
++source: tag dist-upload
++
++%.pc: %.pc.in
++      sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@
++
++.c.o:;
++      $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
+diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.translation gpe-tetris-0.6-2/build/Makefile.translation
+--- ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100
++++ gpe-tetris-0.6-2/build/Makefile.translation        2004-09-18 21:04:03.000000000 +0100
+@@ -0,0 +1,103 @@
++.SUFFIXES: .mo .po .pot .po8
++
++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
++
++# use ipkg-build or ipkg-deb-build
++IPKG_BUILD := ipkg-build
++
++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
++
++ifeq ($(DIR_PO),)
++DIR_PO := po
++endif
++
++ifeq ($(BINPACKAGE),)
++BINPACKAGE := $(PACKAGE)
++endif
++
++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS))
++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
++
++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present)
++desktop-files += $(PACKAGE).desktop
++endif
++
++ifneq ($(EXTRA_DESKTOPS),)
++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS))
++endif
++
++all-mo: $(mo-files)
++
++all-desktop: $(desktop-files)
++
++install-mo: all-mo
++      if [ "x$(LINGUAS)" != "x" ]; then \
++              for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \
++      fi;
++
++.po8.mo:;
++      msgfmt -o $@ $<
++
++.po.po8:;
++      CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@
++
++update-po: $(po-files) extract-po
++
++dist-prep: update-po freshen-po
++# empty
++
++ifeq ($(CVSBUILD),yes)
++ipkg-prep: freshen-po
++# empty
++endif
++
++extract-po:
++      mkdir -p $(DIR_PO)
++      ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi )
++      if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi
++
++clean: clean-po clean-dist-translation
++
++clean-po:
++      rm -rf $(DIR_PO)/*.mo
++      for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done
++
++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
++      intltool-merge -u -d $(DIR_PO) $< $@
++
++freshen-po:
++      rm -rf tmp-po
++      mkdir tmp-po
++      cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done
++      for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done
++      rm -rf tmp-po
++
++# ------------------------------------------------------------------------
++
++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-)
++
++ifndef BUILD
++BUILD = ../build
++endif
++
++transdist := familiar/dist-translation
++templates := $(BUILD)/familiar
++ipkglist  := translation-ipkgs.txt
++
++clean-dist-translation:
++      rm -rf $(transdist) $(ipkglist)
++
++real-translation-package: all-mo
++      rm -rf $(transdist) $(ipkglist)
++      for LINGUA in $(LINGUAS); do \
++              i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \
++              mkdir -p $(transdist)/$$i/CONTROL; \
++              mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \
++              install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \
++              sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \
++              install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \
++              $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \
++      done
++
++translation-ipkg:
++      make PREFIX=/usr real-translation-package
+diff -urNd ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/Makefile gpe-tetris-0.6-2/Makefile
+--- ../gpe-tetris-0.6-2-r0/gpe-tetris-0.6-2/Makefile   2004-09-17 23:48:05.000000000 +0100
++++ gpe-tetris-0.6-2/Makefile  2004-09-18 21:09:31.000000000 +0100
+@@ -9,30 +9,29 @@
+ CVSBUILD = no
+ VERSION = 0.6-2
++MEMBERS = tetris highscore interface misc
+ GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+-GTKLDFLAGS += `pkg-config --libs gtk+-2.0`
+-
+-PACKAGE_CFLAGS = $(GTKCFLAGS) -DHIGHSCORE_FILE=\"$(HIGHSCORE_FILE)\" -DDOWN_DROPS -D_GNU_SOURCE -Wall -DPREFIX=\"$(PREFIX)\" -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+-PACKAGE_LDFLAGS = $(GTKLDFLAGS)
++GTKLDFLAGS = `pkg-config --libs gtk+-2.0 gdk-2.0`
+-ifeq ($(DEBUG),yes)
+-CFLAGS += -O2 -g
+-LDFLAGS += -g #-lefence
+-else
+-CFLAGS += -Os -fomit-frame-pointer
+-endif
++PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GTKCFLAGS) $(GPECFLAGS) -DHIGHSCORE_FILE=\"$(HIGHSCORE_FILE)\" -DDOWN_DROPS
++PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
++PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GTKLDFLAGS) $(GPELIBS)
+ ifeq ($(CVSBUILD),yes)
+-PACKAGE_CFLAGS += -I../../base/libgpewidget
+-PACKAGE_LDFLAGS += -L../../base/libgpewidget
++BUILD = ../build
+ else
+-PACKAGE_CFLAGS += -I/usr/include/gpe
++BUILD = build
+ endif
+-PACKAGE_LDFLAGS += -lgpewidget
+-all: $(OBJS)
+-      $(CC) $(DEFINES) $(CFLAGS) $(OBJS) -o $(PACKAGE) $(PACKAGE_LDFLAGS)
++OBJS = $(patsubst %,%.o,$(MEMBERS))
++SOURCES = $(patsubst %,%.c,$(MEMBERS))
++DEPS = $(patsubst %,%.d,$(MEMBERS))
++
++all: $(PACKAGE)
++
++$(PACKAGE): $(OBJS)
++      $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
+ clean: 
+       rm -f *.o $(PACKAGE)
+@@ -55,5 +54,6 @@
+       rm -i $(HIGHSCORE_FILE)
+       rmdir $(HIGHSCORE_PATH)
+-include ../../base/build/Makefile.dpkg_ipkg
++include $(BUILD)/Makefile.dpkg_ipkg
++include $(BUILD)/Makefile.translation
+ -include $(DEPS)
diff --git a/packages/nonworking/btchatd_011.bb b/packages/nonworking/btchatd_011.bb
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/nonworking/driftnet_0.1.6.bb b/packages/nonworking/driftnet_0.1.6.bb
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/nonworking/libbtctl_0.4.1.bb b/packages/nonworking/libbtctl_0.4.1.bb
new file mode 100644 (file)
index 0000000..e69de29