diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2011-01-02 23:27:23 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2011-01-02 23:27:23 +0100 |
| commit | 9352995934adec8059077af241c35ccd1573bd80 (patch) | |
| tree | 60286e266b3b31b90b952ac37e12a1ebbcdd2eb6 | |
| parent | ef3b84d78197acbd45d73a9b1ae44b47b5904290 (diff) | |
| parent | 880bca260c4ce91554a49b2475232cf5c0ffd447 (diff) | |
| download | qipackages-fork-9352995934adec8059077af241c35ccd1573bd80.tar.gz | |
Conflicts:
links/Makefile
385 files changed, 10441 insertions, 403 deletions
diff --git a/NanoMap/Makefile b/NanoMap/Makefile index e07514f..b1d22e9 100644 --- a/NanoMap/Makefile +++ b/NanoMap/Makefile @@ -21,14 +21,22 @@ PKG_SOURCE_VERSION:=$(PKG_REV) include $(INCLUDE_DIR)/package.mk $(call include_mk,qmake.mk) -define Package/NanoMap +define Package/NanoMap/Default SECTION:=utils CATEGORY:=Utilities TITLE:=Qt4-based map viewer - DEPENDS:=+qt4 +qt4-gui +qt4-network +dejavu-fonts-ttf URL:=http://projects.qi-hardware.com/index.php/p/nanomap/ endef +define Package/NanoMap + $(call Package/NanoMap/Default) + DEPENDS:=+qt4 +qt4-gui +qt4-network +dejavu-fonts-ttf +endef + +define Package/NanoMap-maps + $(call Package/NanoMap/Default) + TITLE+=(Sample Maps) +endef TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib @@ -41,4 +49,10 @@ define Package/NanoMap/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/NanoMap $(1)/usr/bin/ endef +define Package/NanoMap-maps/install + $(INSTALL_DIR) $(1)/root + $(CP) ./files/Maps/ $(1)/root/ +endef + $(eval $(call BuildPackage,NanoMap)) +$(eval $(call BuildPackage,NanoMap-maps)) diff --git a/NanoMap/files/Maps/OSM/0/0/0.png b/NanoMap/files/Maps/OSM/0/0/0.png Binary files differnew file mode 100644 index 0000000..6615498 --- /dev/null +++ b/NanoMap/files/Maps/OSM/0/0/0.png diff --git a/NanoMap/files/Maps/OSM/1/0/0.png b/NanoMap/files/Maps/OSM/1/0/0.png Binary files differnew file mode 100644 index 0000000..53976f9 --- /dev/null +++ b/NanoMap/files/Maps/OSM/1/0/0.png diff --git a/NanoMap/files/Maps/OSM/1/0/1.png b/NanoMap/files/Maps/OSM/1/0/1.png Binary files differnew file mode 100644 index 0000000..bb3d4ba --- /dev/null +++ b/NanoMap/files/Maps/OSM/1/0/1.png diff --git a/NanoMap/files/Maps/OSM/1/1/0.png b/NanoMap/files/Maps/OSM/1/1/0.png Binary files differnew file mode 100644 index 0000000..91eed69 --- /dev/null +++ b/NanoMap/files/Maps/OSM/1/1/0.png diff --git a/NanoMap/files/Maps/OSM/1/1/1.png b/NanoMap/files/Maps/OSM/1/1/1.png Binary files differnew file mode 100644 index 0000000..91582fe --- /dev/null +++ b/NanoMap/files/Maps/OSM/1/1/1.png diff --git a/NanoMap/files/Maps/OSM/10/549/335.png b/NanoMap/files/Maps/OSM/10/549/335.png Binary files differnew file mode 100644 index 0000000..1ad54c3 --- /dev/null +++ b/NanoMap/files/Maps/OSM/10/549/335.png diff --git a/NanoMap/files/Maps/OSM/10/549/336.png b/NanoMap/files/Maps/OSM/10/549/336.png Binary files differnew file mode 100644 index 0000000..7dbd4f9 --- /dev/null +++ b/NanoMap/files/Maps/OSM/10/549/336.png diff --git a/NanoMap/files/Maps/OSM/10/550/335.png b/NanoMap/files/Maps/OSM/10/550/335.png Binary files differnew file mode 100644 index 0000000..e7d7612 --- /dev/null +++ b/NanoMap/files/Maps/OSM/10/550/335.png diff --git a/NanoMap/files/Maps/OSM/10/550/336.png b/NanoMap/files/Maps/OSM/10/550/336.png Binary files differnew file mode 100644 index 0000000..8f83be3 --- /dev/null +++ b/NanoMap/files/Maps/OSM/10/550/336.png diff --git a/NanoMap/files/Maps/OSM/10/551/335.png b/NanoMap/files/Maps/OSM/10/551/335.png Binary files differnew file mode 100644 index 0000000..113d8d0 --- /dev/null +++ b/NanoMap/files/Maps/OSM/10/551/335.png diff --git a/NanoMap/files/Maps/OSM/10/551/336.png b/NanoMap/files/Maps/OSM/10/551/336.png Binary files differnew file mode 100644 index 0000000..cdbeb85 --- /dev/null +++ b/NanoMap/files/Maps/OSM/10/551/336.png diff --git a/NanoMap/files/Maps/OSM/10/552/335.png b/NanoMap/files/Maps/OSM/10/552/335.png Binary files differnew file mode 100644 index 0000000..9f7ea9c --- /dev/null +++ b/NanoMap/files/Maps/OSM/10/552/335.png diff --git a/NanoMap/files/Maps/OSM/10/552/336.png b/NanoMap/files/Maps/OSM/10/552/336.png Binary files differnew file mode 100644 index 0000000..88c6f68 --- /dev/null +++ b/NanoMap/files/Maps/OSM/10/552/336.png diff --git a/NanoMap/files/Maps/OSM/11/1099/671.png b/NanoMap/files/Maps/OSM/11/1099/671.png Binary files differnew file mode 100644 index 0000000..4da7511 --- /dev/null +++ b/NanoMap/files/Maps/OSM/11/1099/671.png diff --git a/NanoMap/files/Maps/OSM/11/1099/672.png b/NanoMap/files/Maps/OSM/11/1099/672.png Binary files differnew file mode 100644 index 0000000..56f13ab --- /dev/null +++ b/NanoMap/files/Maps/OSM/11/1099/672.png diff --git a/NanoMap/files/Maps/OSM/11/1100/671.png b/NanoMap/files/Maps/OSM/11/1100/671.png Binary files differnew file mode 100644 index 0000000..67851d3 --- /dev/null +++ b/NanoMap/files/Maps/OSM/11/1100/671.png diff --git a/NanoMap/files/Maps/OSM/11/1100/672.png b/NanoMap/files/Maps/OSM/11/1100/672.png Binary files differnew file mode 100644 index 0000000..de33a28 --- /dev/null +++ b/NanoMap/files/Maps/OSM/11/1100/672.png diff --git a/NanoMap/files/Maps/OSM/11/1101/671.png b/NanoMap/files/Maps/OSM/11/1101/671.png Binary files differnew file mode 100644 index 0000000..12efdc7 --- /dev/null +++ b/NanoMap/files/Maps/OSM/11/1101/671.png diff --git a/NanoMap/files/Maps/OSM/11/1101/672.png b/NanoMap/files/Maps/OSM/11/1101/672.png Binary files differnew file mode 100644 index 0000000..280ebbc --- /dev/null +++ b/NanoMap/files/Maps/OSM/11/1101/672.png diff --git a/NanoMap/files/Maps/OSM/11/1102/671.png b/NanoMap/files/Maps/OSM/11/1102/671.png Binary files differnew file mode 100644 index 0000000..d1bfdb8 --- /dev/null +++ b/NanoMap/files/Maps/OSM/11/1102/671.png diff --git a/NanoMap/files/Maps/OSM/11/1102/672.png b/NanoMap/files/Maps/OSM/11/1102/672.png Binary files differnew file mode 100644 index 0000000..17b9b37 --- /dev/null +++ b/NanoMap/files/Maps/OSM/11/1102/672.png diff --git a/NanoMap/files/Maps/OSM/12/2199/1342.png b/NanoMap/files/Maps/OSM/12/2199/1342.png Binary files differnew file mode 100644 index 0000000..c5ad4ef --- /dev/null +++ b/NanoMap/files/Maps/OSM/12/2199/1342.png diff --git a/NanoMap/files/Maps/OSM/12/2199/1343.png b/NanoMap/files/Maps/OSM/12/2199/1343.png Binary files differnew file mode 100644 index 0000000..05c884a --- /dev/null +++ b/NanoMap/files/Maps/OSM/12/2199/1343.png diff --git a/NanoMap/files/Maps/OSM/12/2199/1344.png b/NanoMap/files/Maps/OSM/12/2199/1344.png Binary files differnew file mode 100644 index 0000000..80f4437 --- /dev/null +++ b/NanoMap/files/Maps/OSM/12/2199/1344.png diff --git a/NanoMap/files/Maps/OSM/12/2200/1342.png b/NanoMap/files/Maps/OSM/12/2200/1342.png Binary files differnew file mode 100644 index 0000000..6dac0dd --- /dev/null +++ b/NanoMap/files/Maps/OSM/12/2200/1342.png diff --git a/NanoMap/files/Maps/OSM/12/2200/1343.png b/NanoMap/files/Maps/OSM/12/2200/1343.png Binary files differnew file mode 100644 index 0000000..5ce2012 --- /dev/null +++ b/NanoMap/files/Maps/OSM/12/2200/1343.png diff --git a/NanoMap/files/Maps/OSM/12/2200/1344.png b/NanoMap/files/Maps/OSM/12/2200/1344.png Binary files differnew file mode 100644 index 0000000..35af938 --- /dev/null +++ b/NanoMap/files/Maps/OSM/12/2200/1344.png diff --git a/NanoMap/files/Maps/OSM/12/2201/1342.png b/NanoMap/files/Maps/OSM/12/2201/1342.png Binary files differnew file mode 100644 index 0000000..83f74ce --- /dev/null +++ b/NanoMap/files/Maps/OSM/12/2201/1342.png diff --git a/NanoMap/files/Maps/OSM/12/2201/1343.png b/NanoMap/files/Maps/OSM/12/2201/1343.png Binary files differnew file mode 100644 index 0000000..5281103 --- /dev/null +++ b/NanoMap/files/Maps/OSM/12/2201/1343.png diff --git a/NanoMap/files/Maps/OSM/12/2201/1344.png b/NanoMap/files/Maps/OSM/12/2201/1344.png Binary files differnew file mode 100644 index 0000000..39258c6 --- /dev/null +++ b/NanoMap/files/Maps/OSM/12/2201/1344.png diff --git a/NanoMap/files/Maps/OSM/12/2202/1342.png b/NanoMap/files/Maps/OSM/12/2202/1342.png Binary files differnew file mode 100644 index 0000000..b7b6d6d --- /dev/null +++ b/NanoMap/files/Maps/OSM/12/2202/1342.png diff --git a/NanoMap/files/Maps/OSM/12/2202/1343.png b/NanoMap/files/Maps/OSM/12/2202/1343.png Binary files differnew file mode 100644 index 0000000..f584749 --- /dev/null +++ b/NanoMap/files/Maps/OSM/12/2202/1343.png diff --git a/NanoMap/files/Maps/OSM/12/2202/1344.png b/NanoMap/files/Maps/OSM/12/2202/1344.png Binary files differnew file mode 100644 index 0000000..18cd442 --- /dev/null +++ b/NanoMap/files/Maps/OSM/12/2202/1344.png diff --git a/NanoMap/files/Maps/OSM/13/4400/2686.png b/NanoMap/files/Maps/OSM/13/4400/2686.png Binary files differnew file mode 100644 index 0000000..299efa7 --- /dev/null +++ b/NanoMap/files/Maps/OSM/13/4400/2686.png diff --git a/NanoMap/files/Maps/OSM/13/4400/2687.png b/NanoMap/files/Maps/OSM/13/4400/2687.png Binary files differnew file mode 100644 index 0000000..cbac58b --- /dev/null +++ b/NanoMap/files/Maps/OSM/13/4400/2687.png diff --git a/NanoMap/files/Maps/OSM/13/4401/2686.png b/NanoMap/files/Maps/OSM/13/4401/2686.png Binary files differnew file mode 100644 index 0000000..4d20b08 --- /dev/null +++ b/NanoMap/files/Maps/OSM/13/4401/2686.png diff --git a/NanoMap/files/Maps/OSM/13/4401/2687.png b/NanoMap/files/Maps/OSM/13/4401/2687.png Binary files differnew file mode 100644 index 0000000..7631539 --- /dev/null +++ b/NanoMap/files/Maps/OSM/13/4401/2687.png diff --git a/NanoMap/files/Maps/OSM/13/4402/2686.png b/NanoMap/files/Maps/OSM/13/4402/2686.png Binary files differnew file mode 100644 index 0000000..0960304 --- /dev/null +++ b/NanoMap/files/Maps/OSM/13/4402/2686.png diff --git a/NanoMap/files/Maps/OSM/13/4402/2687.png b/NanoMap/files/Maps/OSM/13/4402/2687.png Binary files differnew file mode 100644 index 0000000..109fce5 --- /dev/null +++ b/NanoMap/files/Maps/OSM/13/4402/2687.png diff --git a/NanoMap/files/Maps/OSM/13/4403/2686.png b/NanoMap/files/Maps/OSM/13/4403/2686.png Binary files differnew file mode 100644 index 0000000..489d927 --- /dev/null +++ b/NanoMap/files/Maps/OSM/13/4403/2686.png diff --git a/NanoMap/files/Maps/OSM/13/4403/2687.png b/NanoMap/files/Maps/OSM/13/4403/2687.png Binary files differnew file mode 100644 index 0000000..644df3a --- /dev/null +++ b/NanoMap/files/Maps/OSM/13/4403/2687.png diff --git a/NanoMap/files/Maps/OSM/14/8801/5372.png b/NanoMap/files/Maps/OSM/14/8801/5372.png Binary files differnew file mode 100644 index 0000000..b5cf64c --- /dev/null +++ b/NanoMap/files/Maps/OSM/14/8801/5372.png diff --git a/NanoMap/files/Maps/OSM/14/8801/5373.png b/NanoMap/files/Maps/OSM/14/8801/5373.png Binary files differnew file mode 100644 index 0000000..89b60a2 --- /dev/null +++ b/NanoMap/files/Maps/OSM/14/8801/5373.png diff --git a/NanoMap/files/Maps/OSM/14/8801/5374.png b/NanoMap/files/Maps/OSM/14/8801/5374.png Binary files differnew file mode 100644 index 0000000..8f9d8df --- /dev/null +++ b/NanoMap/files/Maps/OSM/14/8801/5374.png diff --git a/NanoMap/files/Maps/OSM/14/8802/5372.png b/NanoMap/files/Maps/OSM/14/8802/5372.png Binary files differnew file mode 100644 index 0000000..2ccb707 --- /dev/null +++ b/NanoMap/files/Maps/OSM/14/8802/5372.png diff --git a/NanoMap/files/Maps/OSM/14/8802/5373.png b/NanoMap/files/Maps/OSM/14/8802/5373.png Binary files differnew file mode 100644 index 0000000..87edc8e --- /dev/null +++ b/NanoMap/files/Maps/OSM/14/8802/5373.png diff --git a/NanoMap/files/Maps/OSM/14/8802/5374.png b/NanoMap/files/Maps/OSM/14/8802/5374.png Binary files differnew file mode 100644 index 0000000..62a44cb --- /dev/null +++ b/NanoMap/files/Maps/OSM/14/8802/5374.png diff --git a/NanoMap/files/Maps/OSM/14/8803/5372.png b/NanoMap/files/Maps/OSM/14/8803/5372.png Binary files differnew file mode 100644 index 0000000..3c7c516 --- /dev/null +++ b/NanoMap/files/Maps/OSM/14/8803/5372.png diff --git a/NanoMap/files/Maps/OSM/14/8803/5373.png b/NanoMap/files/Maps/OSM/14/8803/5373.png Binary files differnew file mode 100644 index 0000000..868f77e --- /dev/null +++ b/NanoMap/files/Maps/OSM/14/8803/5373.png diff --git a/NanoMap/files/Maps/OSM/14/8803/5374.png b/NanoMap/files/Maps/OSM/14/8803/5374.png Binary files differnew file mode 100644 index 0000000..1e3401f --- /dev/null +++ b/NanoMap/files/Maps/OSM/14/8803/5374.png diff --git a/NanoMap/files/Maps/OSM/14/8804/5372.png b/NanoMap/files/Maps/OSM/14/8804/5372.png Binary files differnew file mode 100644 index 0000000..b07dee1 --- /dev/null +++ b/NanoMap/files/Maps/OSM/14/8804/5372.png diff --git a/NanoMap/files/Maps/OSM/14/8804/5373.png b/NanoMap/files/Maps/OSM/14/8804/5373.png Binary files differnew file mode 100644 index 0000000..e157ec5 --- /dev/null +++ b/NanoMap/files/Maps/OSM/14/8804/5373.png diff --git a/NanoMap/files/Maps/OSM/14/8804/5374.png b/NanoMap/files/Maps/OSM/14/8804/5374.png Binary files differnew file mode 100644 index 0000000..4f1d354 --- /dev/null +++ b/NanoMap/files/Maps/OSM/14/8804/5374.png diff --git a/NanoMap/files/Maps/OSM/15/17604/10745.png b/NanoMap/files/Maps/OSM/15/17604/10745.png Binary files differnew file mode 100644 index 0000000..c192273 --- /dev/null +++ b/NanoMap/files/Maps/OSM/15/17604/10745.png diff --git a/NanoMap/files/Maps/OSM/15/17604/10746.png b/NanoMap/files/Maps/OSM/15/17604/10746.png Binary files differnew file mode 100644 index 0000000..425de40 --- /dev/null +++ b/NanoMap/files/Maps/OSM/15/17604/10746.png diff --git a/NanoMap/files/Maps/OSM/15/17604/10747.png b/NanoMap/files/Maps/OSM/15/17604/10747.png Binary files differnew file mode 100644 index 0000000..08fad32 --- /dev/null +++ b/NanoMap/files/Maps/OSM/15/17604/10747.png diff --git a/NanoMap/files/Maps/OSM/15/17605/10745.png b/NanoMap/files/Maps/OSM/15/17605/10745.png Binary files differnew file mode 100644 index 0000000..fa55260 --- /dev/null +++ b/NanoMap/files/Maps/OSM/15/17605/10745.png diff --git a/NanoMap/files/Maps/OSM/15/17605/10746.png b/NanoMap/files/Maps/OSM/15/17605/10746.png Binary files differnew file mode 100644 index 0000000..4538e98 --- /dev/null +++ b/NanoMap/files/Maps/OSM/15/17605/10746.png diff --git a/NanoMap/files/Maps/OSM/15/17605/10747.png b/NanoMap/files/Maps/OSM/15/17605/10747.png Binary files differnew file mode 100644 index 0000000..b81c301 --- /dev/null +++ b/NanoMap/files/Maps/OSM/15/17605/10747.png diff --git a/NanoMap/files/Maps/OSM/15/17606/10745.png b/NanoMap/files/Maps/OSM/15/17606/10745.png Binary files differnew file mode 100644 index 0000000..3857e5a --- /dev/null +++ b/NanoMap/files/Maps/OSM/15/17606/10745.png diff --git a/NanoMap/files/Maps/OSM/15/17606/10746.png b/NanoMap/files/Maps/OSM/15/17606/10746.png Binary files differnew file mode 100644 index 0000000..c3f1dfb --- /dev/null +++ b/NanoMap/files/Maps/OSM/15/17606/10746.png diff --git a/NanoMap/files/Maps/OSM/15/17606/10747.png b/NanoMap/files/Maps/OSM/15/17606/10747.png Binary files differnew file mode 100644 index 0000000..ca83031 --- /dev/null +++ b/NanoMap/files/Maps/OSM/15/17606/10747.png diff --git a/NanoMap/files/Maps/OSM/15/17607/10746.png b/NanoMap/files/Maps/OSM/15/17607/10746.png Binary files differnew file mode 100644 index 0000000..80d3f6a --- /dev/null +++ b/NanoMap/files/Maps/OSM/15/17607/10746.png diff --git a/NanoMap/files/Maps/OSM/15/17607/10747.png b/NanoMap/files/Maps/OSM/15/17607/10747.png Binary files differnew file mode 100644 index 0000000..eed0759 --- /dev/null +++ b/NanoMap/files/Maps/OSM/15/17607/10747.png diff --git a/NanoMap/files/Maps/OSM/16/35209/21491.png b/NanoMap/files/Maps/OSM/16/35209/21491.png Binary files differnew file mode 100644 index 0000000..6302a00 --- /dev/null +++ b/NanoMap/files/Maps/OSM/16/35209/21491.png diff --git a/NanoMap/files/Maps/OSM/16/35209/21492.png b/NanoMap/files/Maps/OSM/16/35209/21492.png Binary files differnew file mode 100644 index 0000000..74eec45 --- /dev/null +++ b/NanoMap/files/Maps/OSM/16/35209/21492.png diff --git a/NanoMap/files/Maps/OSM/16/35209/21493.png b/NanoMap/files/Maps/OSM/16/35209/21493.png Binary files differnew file mode 100644 index 0000000..047fde0 --- /dev/null +++ b/NanoMap/files/Maps/OSM/16/35209/21493.png diff --git a/NanoMap/files/Maps/OSM/16/35210/21491.png b/NanoMap/files/Maps/OSM/16/35210/21491.png Binary files differnew file mode 100644 index 0000000..9576d8c --- /dev/null +++ b/NanoMap/files/Maps/OSM/16/35210/21491.png diff --git a/NanoMap/files/Maps/OSM/16/35210/21492.png b/NanoMap/files/Maps/OSM/16/35210/21492.png Binary files differnew file mode 100644 index 0000000..b3436aa --- /dev/null +++ b/NanoMap/files/Maps/OSM/16/35210/21492.png diff --git a/NanoMap/files/Maps/OSM/16/35210/21493.png b/NanoMap/files/Maps/OSM/16/35210/21493.png Binary files differnew file mode 100644 index 0000000..963d512 --- /dev/null +++ b/NanoMap/files/Maps/OSM/16/35210/21493.png diff --git a/NanoMap/files/Maps/OSM/16/35211/21491.png b/NanoMap/files/Maps/OSM/16/35211/21491.png Binary files differnew file mode 100644 index 0000000..e7bd63d --- /dev/null +++ b/NanoMap/files/Maps/OSM/16/35211/21491.png diff --git a/NanoMap/files/Maps/OSM/16/35211/21492.png b/NanoMap/files/Maps/OSM/16/35211/21492.png Binary files differnew file mode 100644 index 0000000..5d72441 --- /dev/null +++ b/NanoMap/files/Maps/OSM/16/35211/21492.png diff --git a/NanoMap/files/Maps/OSM/16/35211/21493.png b/NanoMap/files/Maps/OSM/16/35211/21493.png Binary files differnew file mode 100644 index 0000000..8b548d1 --- /dev/null +++ b/NanoMap/files/Maps/OSM/16/35211/21493.png diff --git a/NanoMap/files/Maps/OSM/16/35212/21492.png b/NanoMap/files/Maps/OSM/16/35212/21492.png Binary files differnew file mode 100644 index 0000000..fcbdf51 --- /dev/null +++ b/NanoMap/files/Maps/OSM/16/35212/21492.png diff --git a/NanoMap/files/Maps/OSM/16/35212/21493.png b/NanoMap/files/Maps/OSM/16/35212/21493.png Binary files differnew file mode 100644 index 0000000..be929e1 --- /dev/null +++ b/NanoMap/files/Maps/OSM/16/35212/21493.png diff --git a/NanoMap/files/Maps/OSM/17/70420/42983.png b/NanoMap/files/Maps/OSM/17/70420/42983.png Binary files differnew file mode 100644 index 0000000..f029857 --- /dev/null +++ b/NanoMap/files/Maps/OSM/17/70420/42983.png diff --git a/NanoMap/files/Maps/OSM/17/70420/42984.png b/NanoMap/files/Maps/OSM/17/70420/42984.png Binary files differnew file mode 100644 index 0000000..86cebff --- /dev/null +++ b/NanoMap/files/Maps/OSM/17/70420/42984.png diff --git a/NanoMap/files/Maps/OSM/17/70420/42985.png b/NanoMap/files/Maps/OSM/17/70420/42985.png Binary files differnew file mode 100644 index 0000000..ccc2143 --- /dev/null +++ b/NanoMap/files/Maps/OSM/17/70420/42985.png diff --git a/NanoMap/files/Maps/OSM/17/70421/42983.png b/NanoMap/files/Maps/OSM/17/70421/42983.png Binary files differnew file mode 100644 index 0000000..84ce9e6 --- /dev/null +++ b/NanoMap/files/Maps/OSM/17/70421/42983.png diff --git a/NanoMap/files/Maps/OSM/17/70421/42984.png b/NanoMap/files/Maps/OSM/17/70421/42984.png Binary files differnew file mode 100644 index 0000000..f305a68 --- /dev/null +++ b/NanoMap/files/Maps/OSM/17/70421/42984.png diff --git a/NanoMap/files/Maps/OSM/17/70421/42985.png b/NanoMap/files/Maps/OSM/17/70421/42985.png Binary files differnew file mode 100644 index 0000000..fe9fc4f --- /dev/null +++ b/NanoMap/files/Maps/OSM/17/70421/42985.png diff --git a/NanoMap/files/Maps/OSM/17/70422/42983.png b/NanoMap/files/Maps/OSM/17/70422/42983.png Binary files differnew file mode 100644 index 0000000..10cd682 --- /dev/null +++ b/NanoMap/files/Maps/OSM/17/70422/42983.png diff --git a/NanoMap/files/Maps/OSM/17/70422/42984.png b/NanoMap/files/Maps/OSM/17/70422/42984.png Binary files differnew file mode 100644 index 0000000..6659b88 --- /dev/null +++ b/NanoMap/files/Maps/OSM/17/70422/42984.png diff --git a/NanoMap/files/Maps/OSM/17/70422/42985.png b/NanoMap/files/Maps/OSM/17/70422/42985.png Binary files differnew file mode 100644 index 0000000..ad05b75 --- /dev/null +++ b/NanoMap/files/Maps/OSM/17/70422/42985.png diff --git a/NanoMap/files/Maps/OSM/17/70423/42984.png b/NanoMap/files/Maps/OSM/17/70423/42984.png Binary files differnew file mode 100644 index 0000000..6931629 --- /dev/null +++ b/NanoMap/files/Maps/OSM/17/70423/42984.png diff --git a/NanoMap/files/Maps/OSM/17/70423/42985.png b/NanoMap/files/Maps/OSM/17/70423/42985.png Binary files differnew file mode 100644 index 0000000..e84aa88 --- /dev/null +++ b/NanoMap/files/Maps/OSM/17/70423/42985.png diff --git a/NanoMap/files/Maps/OSM/18/140841/85967.png b/NanoMap/files/Maps/OSM/18/140841/85967.png Binary files differnew file mode 100644 index 0000000..faf96ec --- /dev/null +++ b/NanoMap/files/Maps/OSM/18/140841/85967.png diff --git a/NanoMap/files/Maps/OSM/18/140841/85968.png b/NanoMap/files/Maps/OSM/18/140841/85968.png Binary files differnew file mode 100644 index 0000000..9ac7438 --- /dev/null +++ b/NanoMap/files/Maps/OSM/18/140841/85968.png diff --git a/NanoMap/files/Maps/OSM/18/140841/85969.png b/NanoMap/files/Maps/OSM/18/140841/85969.png Binary files differnew file mode 100644 index 0000000..0b210c7 --- /dev/null +++ b/NanoMap/files/Maps/OSM/18/140841/85969.png diff --git a/NanoMap/files/Maps/OSM/18/140842/85967.png b/NanoMap/files/Maps/OSM/18/140842/85967.png Binary files differnew file mode 100644 index 0000000..83a0498 --- /dev/null +++ b/NanoMap/files/Maps/OSM/18/140842/85967.png diff --git a/NanoMap/files/Maps/OSM/18/140842/85968.png b/NanoMap/files/Maps/OSM/18/140842/85968.png Binary files differnew file mode 100644 index 0000000..03a694a --- /dev/null +++ b/NanoMap/files/Maps/OSM/18/140842/85968.png diff --git a/NanoMap/files/Maps/OSM/18/140842/85969.png b/NanoMap/files/Maps/OSM/18/140842/85969.png Binary files differnew file mode 100644 index 0000000..470356e --- /dev/null +++ b/NanoMap/files/Maps/OSM/18/140842/85969.png diff --git a/NanoMap/files/Maps/OSM/18/140843/85967.png b/NanoMap/files/Maps/OSM/18/140843/85967.png Binary files differnew file mode 100644 index 0000000..fa51d95 --- /dev/null +++ b/NanoMap/files/Maps/OSM/18/140843/85967.png diff --git a/NanoMap/files/Maps/OSM/18/140843/85968.png b/NanoMap/files/Maps/OSM/18/140843/85968.png Binary files differnew file mode 100644 index 0000000..5b6d94e --- /dev/null +++ b/NanoMap/files/Maps/OSM/18/140843/85968.png diff --git a/NanoMap/files/Maps/OSM/18/140843/85969.png b/NanoMap/files/Maps/OSM/18/140843/85969.png Binary files differnew file mode 100644 index 0000000..424ef5f --- /dev/null +++ b/NanoMap/files/Maps/OSM/18/140843/85969.png diff --git a/NanoMap/files/Maps/OSM/18/140844/85968.png b/NanoMap/files/Maps/OSM/18/140844/85968.png Binary files differnew file mode 100644 index 0000000..e568d95 --- /dev/null +++ b/NanoMap/files/Maps/OSM/18/140844/85968.png diff --git a/NanoMap/files/Maps/OSM/18/140844/85969.png b/NanoMap/files/Maps/OSM/18/140844/85969.png Binary files differnew file mode 100644 index 0000000..ed9b72f --- /dev/null +++ b/NanoMap/files/Maps/OSM/18/140844/85969.png diff --git a/NanoMap/files/Maps/OSM/2/1/0.png b/NanoMap/files/Maps/OSM/2/1/0.png Binary files differnew file mode 100644 index 0000000..4af0e93 --- /dev/null +++ b/NanoMap/files/Maps/OSM/2/1/0.png diff --git a/NanoMap/files/Maps/OSM/2/1/1.png b/NanoMap/files/Maps/OSM/2/1/1.png Binary files differnew file mode 100644 index 0000000..5be2743 --- /dev/null +++ b/NanoMap/files/Maps/OSM/2/1/1.png diff --git a/NanoMap/files/Maps/OSM/2/1/2.png b/NanoMap/files/Maps/OSM/2/1/2.png Binary files differnew file mode 100644 index 0000000..daf6a23 --- /dev/null +++ b/NanoMap/files/Maps/OSM/2/1/2.png diff --git a/NanoMap/files/Maps/OSM/2/2/0.png b/NanoMap/files/Maps/OSM/2/2/0.png Binary files differnew file mode 100644 index 0000000..d4578e7 --- /dev/null +++ b/NanoMap/files/Maps/OSM/2/2/0.png diff --git a/NanoMap/files/Maps/OSM/2/2/1.png b/NanoMap/files/Maps/OSM/2/2/1.png Binary files differnew file mode 100644 index 0000000..d04c5e1 --- /dev/null +++ b/NanoMap/files/Maps/OSM/2/2/1.png diff --git a/NanoMap/files/Maps/OSM/2/2/2.png b/NanoMap/files/Maps/OSM/2/2/2.png Binary files differnew file mode 100644 index 0000000..a99696c --- /dev/null +++ b/NanoMap/files/Maps/OSM/2/2/2.png diff --git a/NanoMap/files/Maps/OSM/2/3/0.png b/NanoMap/files/Maps/OSM/2/3/0.png Binary files differnew file mode 100644 index 0000000..d950f77 --- /dev/null +++ b/NanoMap/files/Maps/OSM/2/3/0.png diff --git a/NanoMap/files/Maps/OSM/2/3/1.png b/NanoMap/files/Maps/OSM/2/3/1.png Binary files differnew file mode 100644 index 0000000..013cb05 --- /dev/null +++ b/NanoMap/files/Maps/OSM/2/3/1.png diff --git a/NanoMap/files/Maps/OSM/2/3/2.png b/NanoMap/files/Maps/OSM/2/3/2.png Binary files differnew file mode 100644 index 0000000..b01b059 --- /dev/null +++ b/NanoMap/files/Maps/OSM/2/3/2.png diff --git a/NanoMap/files/Maps/OSM/3/2/3.png b/NanoMap/files/Maps/OSM/3/2/3.png Binary files differnew file mode 100644 index 0000000..bb2cbdd --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/2/3.png diff --git a/NanoMap/files/Maps/OSM/3/2/4.png b/NanoMap/files/Maps/OSM/3/2/4.png Binary files differnew file mode 100644 index 0000000..f592941 --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/2/4.png diff --git a/NanoMap/files/Maps/OSM/3/3/2.png b/NanoMap/files/Maps/OSM/3/3/2.png Binary files differnew file mode 100644 index 0000000..4968e84 --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/3/2.png diff --git a/NanoMap/files/Maps/OSM/3/3/3.png b/NanoMap/files/Maps/OSM/3/3/3.png Binary files differnew file mode 100644 index 0000000..25d0c9b --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/3/3.png diff --git a/NanoMap/files/Maps/OSM/3/3/4.png b/NanoMap/files/Maps/OSM/3/3/4.png Binary files differnew file mode 100644 index 0000000..66fcdad --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/3/4.png diff --git a/NanoMap/files/Maps/OSM/3/4/2.png b/NanoMap/files/Maps/OSM/3/4/2.png Binary files differnew file mode 100644 index 0000000..3823737 --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/4/2.png diff --git a/NanoMap/files/Maps/OSM/3/4/3.png b/NanoMap/files/Maps/OSM/3/4/3.png Binary files differnew file mode 100644 index 0000000..204878d --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/4/3.png diff --git a/NanoMap/files/Maps/OSM/3/4/4.png b/NanoMap/files/Maps/OSM/3/4/4.png Binary files differnew file mode 100644 index 0000000..e478e2e --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/4/4.png diff --git a/NanoMap/files/Maps/OSM/3/5/2.png b/NanoMap/files/Maps/OSM/3/5/2.png Binary files differnew file mode 100644 index 0000000..99db135 --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/5/2.png diff --git a/NanoMap/files/Maps/OSM/3/5/3.png b/NanoMap/files/Maps/OSM/3/5/3.png Binary files differnew file mode 100644 index 0000000..763c060 --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/5/3.png diff --git a/NanoMap/files/Maps/OSM/3/5/4.png b/NanoMap/files/Maps/OSM/3/5/4.png Binary files differnew file mode 100644 index 0000000..5d17994 --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/5/4.png diff --git a/NanoMap/files/Maps/OSM/3/6/2.png b/NanoMap/files/Maps/OSM/3/6/2.png Binary files differnew file mode 100644 index 0000000..7cdf724 --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/6/2.png diff --git a/NanoMap/files/Maps/OSM/3/6/3.png b/NanoMap/files/Maps/OSM/3/6/3.png Binary files differnew file mode 100644 index 0000000..0ceb631 --- /dev/null +++ b/NanoMap/files/Maps/OSM/3/6/3.png diff --git a/NanoMap/files/Maps/OSM/4/10/4.png b/NanoMap/files/Maps/OSM/4/10/4.png Binary files differnew file mode 100644 index 0000000..0636288 --- /dev/null +++ b/NanoMap/files/Maps/OSM/4/10/4.png diff --git a/NanoMap/files/Maps/OSM/4/10/5.png b/NanoMap/files/Maps/OSM/4/10/5.png Binary files differnew file mode 100644 index 0000000..a93eec8 --- /dev/null +++ b/NanoMap/files/Maps/OSM/4/10/5.png diff --git a/NanoMap/files/Maps/OSM/4/10/6.png b/NanoMap/files/Maps/OSM/4/10/6.png Binary files differnew file mode 100644 index 0000000..2331663 --- /dev/null +++ b/NanoMap/files/Maps/OSM/4/10/6.png diff --git a/NanoMap/files/Maps/OSM/4/7/4.png b/NanoMap/files/Maps/OSM/4/7/4.png Binary files differnew file mode 100644 index 0000000..654b9d8 --- /dev/null +++ b/NanoMap/files/Maps/OSM/4/7/4.png diff --git a/NanoMap/files/Maps/OSM/4/7/5.png b/NanoMap/files/Maps/OSM/4/7/5.png Binary files differnew file mode 100644 index 0000000..d044cb0 --- /dev/null +++ b/NanoMap/files/Maps/OSM/4/7/5.png diff --git a/NanoMap/files/Maps/OSM/4/7/6.png b/NanoMap/files/Maps/OSM/4/7/6.png Binary files differnew file mode 100644 index 0000000..88f28e7 --- /dev/null +++ b/NanoMap/files/Maps/OSM/4/7/6.png diff --git a/NanoMap/files/Maps/OSM/4/8/4.png b/NanoMap/files/Maps/OSM/4/8/4.png Binary files differnew file mode 100644 index 0000000..fb6fb50 --- /dev/null +++ b/NanoMap/files/Maps/OSM/4/8/4.png diff --git a/NanoMap/files/Maps/OSM/4/8/5.png b/NanoMap/files/Maps/OSM/4/8/5.png Binary files differnew file mode 100644 index 0000000..309846f --- /dev/null +++ b/NanoMap/files/Maps/OSM/4/8/5.png diff --git a/NanoMap/files/Maps/OSM/4/8/6.png b/NanoMap/files/Maps/OSM/4/8/6.png Binary files differnew file mode 100644 index 0000000..0b7f974 --- /dev/null +++ b/NanoMap/files/Maps/OSM/4/8/6.png diff --git a/NanoMap/files/Maps/OSM/4/9/4.png b/NanoMap/files/Maps/OSM/4/9/4.png Binary files differnew file mode 100644 index 0000000..b8a47a8 --- /dev/null +++ b/NanoMap/files/Maps/OSM/4/9/4.png diff --git a/NanoMap/files/Maps/OSM/4/9/5.png b/NanoMap/files/Maps/OSM/4/9/5.png Binary files differnew file mode 100644 index 0000000..0b8418d --- /dev/null +++ b/NanoMap/files/Maps/OSM/4/9/5.png diff --git a/NanoMap/files/Maps/OSM/4/9/6.png b/NanoMap/files/Maps/OSM/4/9/6.png Binary files differnew file mode 100644 index 0000000..34b14d2 --- /dev/null +++ b/NanoMap/files/Maps/OSM/4/9/6.png diff --git a/NanoMap/files/Maps/OSM/5/16/10.png b/NanoMap/files/Maps/OSM/5/16/10.png Binary files differnew file mode 100644 index 0000000..1744993 --- /dev/null +++ b/NanoMap/files/Maps/OSM/5/16/10.png diff --git a/NanoMap/files/Maps/OSM/5/16/11.png b/NanoMap/files/Maps/OSM/5/16/11.png Binary files differnew file mode 100644 index 0000000..a7701bb --- /dev/null +++ b/NanoMap/files/Maps/OSM/5/16/11.png diff --git a/NanoMap/files/Maps/OSM/5/17/10.png b/NanoMap/files/Maps/OSM/5/17/10.png Binary files differnew file mode 100644 index 0000000..7417625 --- /dev/null +++ b/NanoMap/files/Maps/OSM/5/17/10.png diff --git a/NanoMap/files/Maps/OSM/5/17/11.png b/NanoMap/files/Maps/OSM/5/17/11.png Binary files differnew file mode 100644 index 0000000..c9a81f5 --- /dev/null +++ b/NanoMap/files/Maps/OSM/5/17/11.png diff --git a/NanoMap/files/Maps/OSM/5/18/10.png b/NanoMap/files/Maps/OSM/5/18/10.png Binary files differnew file mode 100644 index 0000000..4313b27 --- /dev/null +++ b/NanoMap/files/Maps/OSM/5/18/10.png diff --git a/NanoMap/files/Maps/OSM/5/18/11.png b/NanoMap/files/Maps/OSM/5/18/11.png Binary files differnew file mode 100644 index 0000000..88d9c45 --- /dev/null +++ b/NanoMap/files/Maps/OSM/5/18/11.png diff --git a/NanoMap/files/Maps/OSM/5/19/10.png b/NanoMap/files/Maps/OSM/5/19/10.png Binary files differnew file mode 100644 index 0000000..6381c0e --- /dev/null +++ b/NanoMap/files/Maps/OSM/5/19/10.png diff --git a/NanoMap/files/Maps/OSM/5/19/11.png b/NanoMap/files/Maps/OSM/5/19/11.png Binary files differnew file mode 100644 index 0000000..fe6bf78 --- /dev/null +++ b/NanoMap/files/Maps/OSM/5/19/11.png diff --git a/NanoMap/files/Maps/OSM/6/33/20.png b/NanoMap/files/Maps/OSM/6/33/20.png Binary files differnew file mode 100644 index 0000000..0242c05 --- /dev/null +++ b/NanoMap/files/Maps/OSM/6/33/20.png diff --git a/NanoMap/files/Maps/OSM/6/33/21.png b/NanoMap/files/Maps/OSM/6/33/21.png Binary files differnew file mode 100644 index 0000000..777f041 --- /dev/null +++ b/NanoMap/files/Maps/OSM/6/33/21.png diff --git a/NanoMap/files/Maps/OSM/6/33/22.png b/NanoMap/files/Maps/OSM/6/33/22.png Binary files differnew file mode 100644 index 0000000..14cc6eb --- /dev/null +++ b/NanoMap/files/Maps/OSM/6/33/22.png diff --git a/NanoMap/files/Maps/OSM/6/34/20.png b/NanoMap/files/Maps/OSM/6/34/20.png Binary files differnew file mode 100644 index 0000000..015cc2b --- /dev/null +++ b/NanoMap/files/Maps/OSM/6/34/20.png diff --git a/NanoMap/files/Maps/OSM/6/34/21.png b/NanoMap/files/Maps/OSM/6/34/21.png Binary files differnew file mode 100644 index 0000000..2f18d3c --- /dev/null +++ b/NanoMap/files/Maps/OSM/6/34/21.png diff --git a/NanoMap/files/Maps/OSM/6/34/22.png b/NanoMap/files/Maps/OSM/6/34/22.png Binary files differnew file mode 100644 index 0000000..fe92935 --- /dev/null +++ b/NanoMap/files/Maps/OSM/6/34/22.png diff --git a/NanoMap/files/Maps/OSM/6/35/20.png b/NanoMap/files/Maps/OSM/6/35/20.png Binary files differnew file mode 100644 index 0000000..302b23e --- /dev/null +++ b/NanoMap/files/Maps/OSM/6/35/20.png diff --git a/NanoMap/files/Maps/OSM/6/35/21.png b/NanoMap/files/Maps/OSM/6/35/21.png Binary files differnew file mode 100644 index 0000000..cc42907 --- /dev/null +++ b/NanoMap/files/Maps/OSM/6/35/21.png diff --git a/NanoMap/files/Maps/OSM/6/35/22.png b/NanoMap/files/Maps/OSM/6/35/22.png Binary files differnew file mode 100644 index 0000000..ff4af9f --- /dev/null +++ b/NanoMap/files/Maps/OSM/6/35/22.png diff --git a/NanoMap/files/Maps/OSM/6/36/20.png b/NanoMap/files/Maps/OSM/6/36/20.png Binary files differnew file mode 100644 index 0000000..48889ec --- /dev/null +++ b/NanoMap/files/Maps/OSM/6/36/20.png diff --git a/NanoMap/files/Maps/OSM/6/36/21.png b/NanoMap/files/Maps/OSM/6/36/21.png Binary files differnew file mode 100644 index 0000000..a48bb41 --- /dev/null +++ b/NanoMap/files/Maps/OSM/6/36/21.png diff --git a/NanoMap/files/Maps/OSM/6/36/22.png b/NanoMap/files/Maps/OSM/6/36/22.png Binary files differnew file mode 100644 index 0000000..393ec15 --- /dev/null +++ b/NanoMap/files/Maps/OSM/6/36/22.png diff --git a/NanoMap/files/Maps/OSM/7/67/41.png b/NanoMap/files/Maps/OSM/7/67/41.png Binary files differnew file mode 100644 index 0000000..e6251a8 --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/67/41.png diff --git a/NanoMap/files/Maps/OSM/7/67/42.png b/NanoMap/files/Maps/OSM/7/67/42.png Binary files differnew file mode 100644 index 0000000..88432b2 --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/67/42.png diff --git a/NanoMap/files/Maps/OSM/7/68/41.png b/NanoMap/files/Maps/OSM/7/68/41.png Binary files differnew file mode 100644 index 0000000..ad7b2c2 --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/68/41.png diff --git a/NanoMap/files/Maps/OSM/7/68/42.png b/NanoMap/files/Maps/OSM/7/68/42.png Binary files differnew file mode 100644 index 0000000..f497f1e --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/68/42.png diff --git a/NanoMap/files/Maps/OSM/7/68/43.png b/NanoMap/files/Maps/OSM/7/68/43.png Binary files differnew file mode 100644 index 0000000..4a28073 --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/68/43.png diff --git a/NanoMap/files/Maps/OSM/7/69/41.png b/NanoMap/files/Maps/OSM/7/69/41.png Binary files differnew file mode 100644 index 0000000..9a21a57 --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/69/41.png diff --git a/NanoMap/files/Maps/OSM/7/69/42.png b/NanoMap/files/Maps/OSM/7/69/42.png Binary files differnew file mode 100644 index 0000000..d6158bf --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/69/42.png diff --git a/NanoMap/files/Maps/OSM/7/69/43.png b/NanoMap/files/Maps/OSM/7/69/43.png Binary files differnew file mode 100644 index 0000000..901d364 --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/69/43.png diff --git a/NanoMap/files/Maps/OSM/7/70/41.png b/NanoMap/files/Maps/OSM/7/70/41.png Binary files differnew file mode 100644 index 0000000..c6785dd --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/70/41.png diff --git a/NanoMap/files/Maps/OSM/7/70/42.png b/NanoMap/files/Maps/OSM/7/70/42.png Binary files differnew file mode 100644 index 0000000..f3fb895 --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/70/42.png diff --git a/NanoMap/files/Maps/OSM/7/70/43.png b/NanoMap/files/Maps/OSM/7/70/43.png Binary files differnew file mode 100644 index 0000000..4cef1fb --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/70/43.png diff --git a/NanoMap/files/Maps/OSM/7/71/42.png b/NanoMap/files/Maps/OSM/7/71/42.png Binary files differnew file mode 100644 index 0000000..072c3e5 --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/71/42.png diff --git a/NanoMap/files/Maps/OSM/7/71/43.png b/NanoMap/files/Maps/OSM/7/71/43.png Binary files differnew file mode 100644 index 0000000..5e6d329 --- /dev/null +++ b/NanoMap/files/Maps/OSM/7/71/43.png diff --git a/NanoMap/files/Maps/OSM/8/136/83.png b/NanoMap/files/Maps/OSM/8/136/83.png Binary files differnew file mode 100644 index 0000000..2d19463 --- /dev/null +++ b/NanoMap/files/Maps/OSM/8/136/83.png diff --git a/NanoMap/files/Maps/OSM/8/136/84.png b/NanoMap/files/Maps/OSM/8/136/84.png Binary files differnew file mode 100644 index 0000000..ce7f904 --- /dev/null +++ b/NanoMap/files/Maps/OSM/8/136/84.png diff --git a/NanoMap/files/Maps/OSM/8/136/85.png b/NanoMap/files/Maps/OSM/8/136/85.png Binary files differnew file mode 100644 index 0000000..9f16814 --- /dev/null +++ b/NanoMap/files/Maps/OSM/8/136/85.png diff --git a/NanoMap/files/Maps/OSM/8/137/83.png b/NanoMap/files/Maps/OSM/8/137/83.png Binary files differnew file mode 100644 index 0000000..8a3e766 --- /dev/null +++ b/NanoMap/files/Maps/OSM/8/137/83.png diff --git a/NanoMap/files/Maps/OSM/8/137/84.png b/NanoMap/files/Maps/OSM/8/137/84.png Binary files differnew file mode 100644 index 0000000..35c6a82 --- /dev/null +++ b/NanoMap/files/Maps/OSM/8/137/84.png diff --git a/NanoMap/files/Maps/OSM/8/137/85.png b/NanoMap/files/Maps/OSM/8/137/85.png Binary files differnew file mode 100644 index 0000000..af63e54 --- /dev/null +++ b/NanoMap/files/Maps/OSM/8/137/85.png diff --git a/NanoMap/files/Maps/OSM/8/138/83.png b/NanoMap/files/Maps/OSM/8/138/83.png Binary files differnew file mode 100644 index 0000000..c1d1f6e --- /dev/null +++ b/NanoMap/files/Maps/OSM/8/138/83.png diff --git a/NanoMap/files/Maps/OSM/8/138/84.png b/NanoMap/files/Maps/OSM/8/138/84.png Binary files differnew file mode 100644 index 0000000..8be41b5 --- /dev/null +++ b/NanoMap/files/Maps/OSM/8/138/84.png diff --git a/NanoMap/files/Maps/OSM/8/138/85.png b/NanoMap/files/Maps/OSM/8/138/85.png Binary files differnew file mode 100644 index 0000000..011ce5a --- /dev/null +++ b/NanoMap/files/Maps/OSM/8/138/85.png diff --git a/NanoMap/files/Maps/OSM/8/139/83.png b/NanoMap/files/Maps/OSM/8/139/83.png Binary files differnew file mode 100644 index 0000000..9f72704 --- /dev/null +++ b/NanoMap/files/Maps/OSM/8/139/83.png diff --git a/NanoMap/files/Maps/OSM/8/139/84.png b/NanoMap/files/Maps/OSM/8/139/84.png Binary files differnew file mode 100644 index 0000000..056935b --- /dev/null +++ b/NanoMap/files/Maps/OSM/8/139/84.png diff --git a/NanoMap/files/Maps/OSM/8/139/85.png b/NanoMap/files/Maps/OSM/8/139/85.png Binary files differnew file mode 100644 index 0000000..3bdea1c --- /dev/null +++ b/NanoMap/files/Maps/OSM/8/139/85.png diff --git a/NanoMap/files/Maps/OSM/9/274/167.png b/NanoMap/files/Maps/OSM/9/274/167.png Binary files differnew file mode 100644 index 0000000..e0ad5d2 --- /dev/null +++ b/NanoMap/files/Maps/OSM/9/274/167.png diff --git a/NanoMap/files/Maps/OSM/9/274/168.png b/NanoMap/files/Maps/OSM/9/274/168.png Binary files differnew file mode 100644 index 0000000..3a28302 --- /dev/null +++ b/NanoMap/files/Maps/OSM/9/274/168.png diff --git a/NanoMap/files/Maps/OSM/9/274/169.png b/NanoMap/files/Maps/OSM/9/274/169.png Binary files differnew file mode 100644 index 0000000..bf6e4de --- /dev/null +++ b/NanoMap/files/Maps/OSM/9/274/169.png diff --git a/NanoMap/files/Maps/OSM/9/275/167.png b/NanoMap/files/Maps/OSM/9/275/167.png Binary files differnew file mode 100644 index 0000000..5c3480a --- /dev/null +++ b/NanoMap/files/Maps/OSM/9/275/167.png diff --git a/NanoMap/files/Maps/OSM/9/275/168.png b/NanoMap/files/Maps/OSM/9/275/168.png Binary files differnew file mode 100644 index 0000000..44e2e38 --- /dev/null +++ b/NanoMap/files/Maps/OSM/9/275/168.png diff --git a/NanoMap/files/Maps/OSM/9/275/169.png b/NanoMap/files/Maps/OSM/9/275/169.png Binary files differnew file mode 100644 index 0000000..8a34446 --- /dev/null +++ b/NanoMap/files/Maps/OSM/9/275/169.png diff --git a/NanoMap/files/Maps/OSM/9/276/167.png b/NanoMap/files/Maps/OSM/9/276/167.png Binary files differnew file mode 100644 index 0000000..f6f618b --- /dev/null +++ b/NanoMap/files/Maps/OSM/9/276/167.png diff --git a/NanoMap/files/Maps/OSM/9/276/168.png b/NanoMap/files/Maps/OSM/9/276/168.png Binary files differnew file mode 100644 index 0000000..b9c056d --- /dev/null +++ b/NanoMap/files/Maps/OSM/9/276/168.png diff --git a/NanoMap/files/Maps/OSM/9/276/169.png b/NanoMap/files/Maps/OSM/9/276/169.png Binary files differnew file mode 100644 index 0000000..a115b3a --- /dev/null +++ b/NanoMap/files/Maps/OSM/9/276/169.png diff --git a/NanoMap/files/Maps/OSM/9/277/167.png b/NanoMap/files/Maps/OSM/9/277/167.png Binary files differnew file mode 100644 index 0000000..a1efeb0 --- /dev/null +++ b/NanoMap/files/Maps/OSM/9/277/167.png diff --git a/NanoMap/files/Maps/OSM/9/277/168.png b/NanoMap/files/Maps/OSM/9/277/168.png Binary files differnew file mode 100644 index 0000000..8ea1dfb --- /dev/null +++ b/NanoMap/files/Maps/OSM/9/277/168.png diff --git a/NanoMap/files/Maps/OSM/9/277/169.png b/NanoMap/files/Maps/OSM/9/277/169.png Binary files differnew file mode 100644 index 0000000..543e030 --- /dev/null +++ b/NanoMap/files/Maps/OSM/9/277/169.png diff --git a/NanoMap/files/Maps/nanomap.conf b/NanoMap/files/Maps/nanomap.conf new file mode 100644 index 0000000..e40a3f4 --- /dev/null +++ b/NanoMap/files/Maps/nanomap.conf @@ -0,0 +1,5 @@ +[map] +lat=52.5162208639307 +level=8 +lon=13.4033203125 +usage=true diff --git a/abook/Makefile b/abook/Makefile index 0393096..d977a8f 100644 --- a/abook/Makefile +++ b/abook/Makefile @@ -4,12 +4,11 @@ PKG_NAME:=abook PKG_VERSION:=0.5.6 PKG_RELEASE:=2 -PKG_SOURCE:=abook-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/abook - PKG_MD5SUM:=87d25df96864a7c507a4965e6d1da49d - PKG_CAT:=zcat +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/$(PKG_NAME) +PKG_MD5SUM:=87d25df96864a7c507a4965e6d1da49d -PKG_BUILD_DIR:=$(BUILD_DIR)/abook-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk @@ -18,34 +17,18 @@ define Package/abook CATEGORY:=Utilities TITLE:=abook URL:=http://abook.sourceforge.net/ - DEPENDS:= +libreadline +libncurses @BROKEN + DEPENDS:=+libreadline +libncursesw endef define Package/abook/description Simple address book program. endef -define Build/Configure - $(call Build/Configure/Default, \ - --prefix=/usr \ - ) -endef - -#define Build/Configure -# (cd $(PKG_BUILD_DIR); \ -# $(TARGET_CONFIGURE_OPTS) \ -# CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \ -# UNAME_S="Linux" \ -# ./configure \ -# --host=mipsel \ -# --prefix=/usr \ -# ); -#endef - +CONFIGURE_ARGS+="--with-curses=$(STAGING_DIR)/lib" define Package/abook/install - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/abook $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/abook $(1)/usr/bin endef $(eval $(call BuildPackage,abook)) diff --git a/abook/patches/001-term-size.patch b/abook/patches/001-term-size.patch new file mode 100644 index 0000000..d02f067 --- /dev/null +++ b/abook/patches/001-term-size.patch @@ -0,0 +1,257 @@ +diff -ur abook-0.5.6.orig/abook.h abook-0.5.6/abook.h +--- abook-0.5.6.orig/abook.h 2010-11-09 22:02:43.433150687 +0300 ++++ abook-0.5.6/abook.h 2010-11-10 13:49:04.654025390 +0300 +@@ -13,12 +13,12 @@ + int strncasecmp (const char *, const char *, size_t); + #endif + +-#define MAIN_HELPLINE N_("q:quit ?:help a:add r:remove") ++#define MAIN_HELPLINE N_("q:quit ?:help a:add r:remove") + + #define Y_STATUSLINE (LINES - 2) + +-#define MIN_LINES 20 +-#define MIN_COLS 70 ++#define MIN_LINES 24 ++#define MIN_COLS 53 + + #define DEFAULT_UMASK 066 + #define DIR_IN_HOME ".abook" +diff -ur abook-0.5.6.orig/edit.c abook-0.5.6/edit.c +--- abook-0.5.6.orig/edit.c 2010-11-09 22:02:43.428150554 +0300 ++++ abook-0.5.6/edit.c 2010-11-10 15:05:29.395025554 +0300 +@@ -39,40 +39,39 @@ + editor_tab(const int tab) + { + int i, j; +- int x_pos = 2; /* current x pos */ ++ int x_pos = 0; /* current x pos */ + static char *tab_names[] = { + N_("CONTACT"), + N_("ADDRESS"), +- N_(" PHONE "), +- N_(" OTHER "), +- N_("CUSTOM ") ++ N_("PHONE"), ++ N_("OTHER"), ++ N_("CUSTOM") + }; + + mvwhline(editw, TABLINE + 1, 0, UI_HLINE_CHAR, EDITW_COLS); + + for(i = 0; i < TABS; i++) { +- int width = strwidth(gettext(tab_names[i])) + 5; ++ int width = strwidth(gettext(tab_names[i])) + 4; + + if(x_pos + width + 1 > EDITW_COLS) { + statusline_msg(_("Tab name too wide for screen")); + break; + } +- + mvwaddch(editw, TABLINE + 1, x_pos, UI_TEE_CHAR); +- mvwaddch(editw, TABLINE + 1, x_pos + width - 2, UI_TEE_CHAR); ++ mvwaddch(editw, TABLINE + 1, x_pos + width - 1, UI_TEE_CHAR); + + mvwaddch(editw, TABLINE, x_pos, UI_ULCORNER_CHAR); + mvwaddch(editw, TABLINE, x_pos + 1, UI_LBOXLINE_CHAR); + mvwaddstr(editw, TABLINE, x_pos + 2, gettext(tab_names[i])); +- mvwaddch(editw, TABLINE, x_pos + width - 3, UI_RBOXLINE_CHAR); +- mvwaddch(editw, TABLINE, x_pos + width - 2, UI_URCORNER_CHAR); ++ mvwaddch(editw, TABLINE, x_pos + width - 2, UI_RBOXLINE_CHAR); ++ mvwaddch(editw, TABLINE, x_pos + width - 1, UI_URCORNER_CHAR); + + if(i == tab) { + mvwaddch(editw, TABLINE + 1, x_pos, UI_LRCORNER_CHAR); +- for(j = 0; j < width - 3; j++) ++ for(j = 0; j < width - 2; j++) + mvwaddstr(editw, + TABLINE + 1, x_pos + j + 1, " "); +- mvwaddch(editw, TABLINE + 1, x_pos + width - 2, ++ mvwaddch(editw, TABLINE + 1, x_pos + width - 1, + UI_LLCORNER_CHAR); + } + x_pos += width; +diff -ur abook-0.5.6.orig/edit.h abook-0.5.6/edit.h +--- abook-0.5.6.orig/edit.h 2010-11-09 22:02:43.432150660 +0300 ++++ abook-0.5.6/edit.h 2010-11-10 13:10:42.897150393 +0300 +@@ -5,20 +5,20 @@ + void get_first_email(char *str, int item); + void add_item(); + +-#define EDITW_COLS (COLS - 6) ++#define EDITW_COLS COLS + #define EDITW_LINES (LINES - 5) + #define EDITW_TOP 2 +-#define EDITW_X 3 ++#define EDITW_X 0 + +-#define EDITOR_HELPLINE N_("?:help c:contact a:address p:phone o:other") ++#define EDITOR_HELPLINE N_("?:help c:cont. a:addr. p:phone o:other") + + #define TABLINE 1 + + #define MAX_TAB_FIELDS 7 + +-#define TAB_COLON_POS 28 ++#define TAB_COLON_POS 19 + #define FIELDS_START_Y 4 +-#define FIELDS_START_X 4 ++#define FIELDS_START_X 0 + + enum { + TAB_CONTACT, +diff -ur abook-0.5.6.orig/help.h abook-0.5.6/help.h +--- abook-0.5.6.orig/help.h 2010-11-09 22:02:43.432150660 +0300 ++++ abook-0.5.6/help.h 2010-11-10 13:35:52.772150205 +0300 +@@ -8,43 +8,43 @@ + /* TODO gettext: handle key and description separately? */ + static char *mainhelp[] = { + +-N_(" ? help\n"), +-N_(" q quit\n"), +-N_(" Q quit without saving\n"), +-N_(" P quit and output selected item(s) to stderr\n"), +-N_(" ^L refresh screen\n"), +-"\n", +-N_(" arrows / j,k scroll list\n"), +-N_(" enter view/edit item\n"), +-N_(" a add item\n"), +-N_(" r / del remove selected items\n"), +-N_(" D duplicate item\n"), +-"\n", +-N_(" space select item\n"), +-N_(" + select all\n"), +-N_(" - unselect all\n"), +-N_(" * invert selection\n"), +-"\n", +-N_(" w write database to disk\n"), +-N_(" l read database from disk\n"), +-N_(" C clear whole database\n"), +-N_(" i import database\n"), +-N_(" e export database\n"), +-N_(" p print database\n"), +-N_(" o open database\n"), +-"\n", +-N_(" s sort database\n"), +-N_(" S \"surname sort\"\n"), +-N_(" F sort by field (defined in configuration file)\n"), ++N_(" ? help\n"), ++N_(" q quit\n"), ++N_(" Q quit without saving\n"), ++N_(" P quit and output selected item(s) to stderr\n"), ++N_(" ^L refresh screen\n"), ++"\n", ++N_(" arrows / j,k scroll list\n"), ++N_(" enter view/edit item\n"), ++N_(" a add item\n"), ++N_(" r / del remove selected items\n"), ++N_(" D duplicate item\n"), ++"\n", ++N_(" space select item\n"), ++N_(" + select all\n"), ++N_(" - unselect all\n"), ++N_(" * invert selection\n"), ++"\n", ++N_(" w write database to disk\n"), ++N_(" l read database from disk\n"), ++N_(" C clear whole database\n"), ++N_(" i import database\n"), ++N_(" e export database\n"), ++N_(" p print database\n"), ++N_(" o open database\n"), ++"\n", ++N_(" s sort database\n"), ++N_(" S \"surname sort\"\n"), ++N_(" F sort by field (defined in configuration file)\n"), + "\n", +-N_(" / search\n"), +-N_(" \\ search next occurrence\n"), ++N_(" / search\n"), ++N_(" \\ search next occurrence\n"), + "\n", +-N_(" A move current item up\n"), +-N_(" Z move current item down\n"), ++N_(" A move current item up\n"), ++N_(" Z move current item down\n"), + "\n", +-N_(" m send mail with mutt\n"), +-N_(" v view URL with web browser\n"), ++N_(" m send mail with mutt\n"), ++N_(" v view URL with web browser\n"), + NULL + + }; +@@ -52,19 +52,19 @@ + static char *editorhelp[] = { + + "\n", +-N_(" a,c,p,o,C/arrows/h,l change tab\n"), ++N_(" a,c,p,o,C/arrows/h,l change tab\n"), + "\n", +-N_(" 1 - 5 edit fields\n"), ++N_(" 1 - 5 edit fields\n"), + "\n", +-N_(" k or < previous item\n"), +-N_(" j or > next item\n"), ++N_(" k or < previous item\n"), ++N_(" j or > next item\n"), + "\n", +-N_(" r roll e-mail addresses\n"), ++N_(" r roll e-mail addresses\n"), + "\n", +-N_(" u undo\n"), ++N_(" u undo\n"), + "\n", +-N_(" m send mail with mutt\n"), +-N_(" v view url with web browser\n"), ++N_(" m send mail with mutt\n"), ++N_(" v view url with web browser\n"), + "\n", + NULL + +diff -ur abook-0.5.6.orig/options.c abook-0.5.6/options.c +--- abook-0.5.6.orig/options.c 2010-11-09 22:02:43.432150660 +0300 ++++ abook-0.5.6/options.c 2010-11-10 15:09:15.241025395 +0300 +@@ -49,10 +49,10 @@ + { "autosave", OT_BOOL, BOOL_AUTOSAVE, TRUE }, + + { "show_all_emails", OT_BOOL, BOOL_SHOW_ALL_EMAILS, TRUE }, +- { "emailpos", OT_INT, INT_EMAILPOS, 25 }, ++ { "emailpos", OT_INT, INT_EMAILPOS, 16 }, + { "extra_column", OT_STR, STR_EXTRA_COLUMN, UL "phone" }, + { "extra_alternative", OT_STR, STR_EXTRA_ALTERNATIVE, UL "-1" }, +- { "extrapos", OT_INT, INT_EXTRAPOS, 65 }, ++ { "extrapos", OT_INT, INT_EXTRAPOS, 40 }, + + { "mutt_command", OT_STR, STR_MUTT_COMMAND, UL "mutt" }, + { "mutt_return_all_emails", OT_BOOL, BOOL_MUTT_RETURN_ALL_EMAILS, +@@ -64,7 +64,7 @@ + + { "address_style", OT_STR, STR_ADDRESS_STYLE, UL "eu" }, + +- { "use_ascii_only", OT_BOOL, BOOL_USE_ASCII_ONLY, FALSE }, ++ { "use_ascii_only", OT_BOOL, BOOL_USE_ASCII_ONLY, TRUE }, + + { "add_email_prevent_duplicates", OT_BOOL, BOOL_ADD_EMAIL_PREVENT_DUPLICATES, FALSE }, + { "sort_field", OT_STR, STR_SORT_FIELD, UL "nick" }, +diff -ur abook-0.5.6.orig/ui.c abook-0.5.6/ui.c +--- abook-0.5.6.orig/ui.c 2010-11-09 22:02:43.427150520 +0300 ++++ abook-0.5.6/ui.c 2010-11-10 13:48:55.824150192 +0300 +@@ -406,7 +406,7 @@ + default:return; + } + +- helpw = newwin(LINES - 5, COLS - 6, 2, 3); ++ helpw = newwin(LINES - 5, COLS, 2, 0); + erase(); + headerline(_("help")); + +@@ -588,7 +588,7 @@ + void + ui_print_number_of_items() + { +- char *str = strdup_printf(" " "|%3d/%3d", selected_items(), items); ++ char *str = strdup_printf(" " "|%3d/%3d", selected_items(), items); + + mvaddstr(0, COLS-strlen(str), str); + diff --git a/abook/patches/abook_h.patch b/abook/patches/abook_h.patch deleted file mode 100644 index 8cb7dcb..0000000 --- a/abook/patches/abook_h.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- abook-0.5.6/abook.h 2005-09-17 12:10:25.000000000 +0200 -+++ abook-0.5.6m/abook.h 2010-09-08 19:50:56.316495243 +0200 -@@ -17,8 +17,8 @@ - - #define Y_STATUSLINE (LINES - 2) - --#define MIN_LINES 20 --#define MIN_COLS 70 -+#define MIN_LINES 15 -+#define MIN_COLS 40 - - #define DEFAULT_UMASK 066 - #define DIR_IN_HOME ".abook" diff --git a/aewan/Makefile b/aewan/Makefile new file mode 100644 index 0000000..84a26b7 --- /dev/null +++ b/aewan/Makefile @@ -0,0 +1,37 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=aewan +PKG_VERSION:=1.0.01 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/$(PKG_NAME) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/aewan + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Ascii Art Editor + URL:=http://aewan.sourceforge.net/ + DEPENDS:=+libncurses +endef + +define Package/aewan/description + Ascii Art Editor +endef + +CONFIGURE_ARGS+="--prefix=/usr/bin" +TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include + +define Package/aewan/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/aewan \ + $(PKG_BUILD_DIR)/aecat \ + $(PKG_BUILD_DIR)/aemakeflic \ + $(1)/usr/bin +endef + +$(eval $(call BuildPackage,aewan)) diff --git a/ben-cyrillic/Makefile b/ben-cyrillic/Makefile new file mode 100644 index 0000000..ec72a76 --- /dev/null +++ b/ben-cyrillic/Makefile @@ -0,0 +1,61 @@ +# +# OpenWrt +# +# This is free software, licensed under the GNU General Public License v2. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=ben-cyrillic +PKG_VERSION:=0.0.1 +PKG_RELEASE:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/ben-cyrillic + SECTION:=utils + CATEGORY:=Utilities + TITLE:=implements cyrillic input/output for Ben + SUBMENU:=Terminal + DEPENDS:=+setfont2 +kbd +endef + +define Build/Compile +endef + +define Package/ben-cyrillic/description + Collection of files and scripts to support cyrillic + input and output for Ben. + Use the "Ben" key to switch between input languages. +endef + +define Package/ben-cyrillic/install + $(INSTALL_DIR) \ + $(1)/usr/share/ben-cyrillic \ + $(1)/usr/sbin \ + $(1)/etc/init.d \ + $(1)/usr/share/gmenu2x/sections/applications \ + $(1)/usr/bin + + $(INSTALL_BIN) \ + $(FILES_DIR)/russian.sh \ + $(1)/usr/sbin/russian.sh + + $(INSTALL_BIN) \ + $(FILES_DIR)/$(PKG_NAME).init \ + $(1)/etc/init.d/$(PKG_NAME) + + $(INSTALL_BIN) \ + $(FILES_DIR)/ben-ash-rus \ + $(1)/usr/bin/ + + $(INSTALL_DATA) \ + $(FILES_DIR)/{ben_ru_uni.map,ben_ru_uni.trans,un-fuzzy-6x10-font_rus.pnm} \ + $(1)/usr/share/ben-cyrillic/ + + $(INSTALL_DATA) \ + $(FILES_DIR)/ash-rus \ + $(1)/usr/share/gmenu2x/sections/applications/ +endef + +$(eval $(call BuildPackage,ben-cyrillic)) diff --git a/ben-cyrillic/files/ash-rus b/ben-cyrillic/files/ash-rus new file mode 100644 index 0000000..3b4b2e4 --- /dev/null +++ b/ben-cyrillic/files/ash-rus @@ -0,0 +1,4 @@ +title=ash-rus +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/ben-ash-rus +workdir=/root diff --git a/ben-cyrillic/files/ben-ash-rus b/ben-cyrillic/files/ben-ash-rus new file mode 100644 index 0000000..9e1c6e2 --- /dev/null +++ b/ben-cyrillic/files/ben-ash-rus @@ -0,0 +1,3 @@ +#!/bin/sh +/usr/sbin/russian.sh +/bin/ash --login diff --git a/ben-cyrillic/files/ben-cyrillic.init b/ben-cyrillic/files/ben-cyrillic.init new file mode 100755 index 0000000..c813fe9 --- /dev/null +++ b/ben-cyrillic/files/ben-cyrillic.init @@ -0,0 +1,8 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2008 OpenWrt.org +START=41 + +start() { + /usr/sbin/russian.sh +} + diff --git a/ben-cyrillic/files/ben_ru_uni.map b/ben-cyrillic/files/ben_ru_uni.map new file mode 100644 index 0000000..b0c37dc --- /dev/null +++ b/ben-cyrillic/files/ben_ru_uni.map @@ -0,0 +1,771 @@ +keycode 1 = Escape Escape + alt keycode 1 = Meta_Escape +ctrlr keycode 1 = Escape +ctrlr shift keycode 1 = Escape +ctrlr alt keycode 1 = Meta_Escape +keycode 2 = one exclam + alt keycode 2 = Meta_one +keycode 3 = two at at nul nul Meta_two +keycode 4 = three numbersign + control keycode 4 = Escape + alt keycode 4 = Meta_three +keycode 5 = four dollar dollar Control_backslash + alt keycode 5 = Meta_four +keycode 6 = five percent + control keycode 6 = Control_bracketright + alt keycode 6 = Meta_five +keycode 7 = six asciicircum + control keycode 7 = Control_asciicircum + alt keycode 7 = Meta_six +keycode 8 = seven ampersand braceleft Control_underscore + alt keycode 8 = Meta_seven +keycode 9 = eight asterisk bracketleft Delete + alt keycode 9 = Meta_eight +keycode 10 = nine parenleft bracketright + alt keycode 10 = Meta_nine +keycode 11 = zero parenright braceright + alt keycode 11 = Meta_zero +keycode 12 = minus underscore backslash Control_underscore Control_underscore Meta_minus +keycode 13 = equal plus asciitilde + alt keycode 13 = Meta_equal + ctrll keycode 13 = three +ctrlr keycode 13 = U+0431 +ctrlr shift keycode 13 = U+0411 +ctrlr alt keycode 13 = U+044E +ctrlr alt shift keycode 13 = U+042E +ctrlr ctrll keycode 13 = three +ctrlr altgr keycode 13 = asciitilde +keycode 14 = Delete Delete Remove + alt keycode 14 = Meta_Delete +ctrlr keycode 14 = Delete +ctrlr shift keycode 14 = Delete +ctrlr altgr keycode 14 = Remove +ctrlr alt keycode 14 = Meta_Delete +keycode 15 = Tab Tab + alt keycode 15 = Meta_Tab +ctrlr keycode 15 = Tab +ctrlr alt keycode 15 = Meta_Tab +keycode 16 = +q + shift keycode 16 = +Q + altgr keycode 16 = exclam + control keycode 16 = Control_q + shift control keycode 16 = Control_q + alt keycode 16 = Meta_q + control alt keycode 16 = Meta_Control_q +ctrlr keycode 16 = U+0439 +ctrlr shift keycode 16 = U+0419 +ctrlr altgr keycode 16 = exclam +ctrlr control keycode 16 = Control_q +ctrlr shift control keycode 16 = Control_q +ctrlr alt keycode 16 = Meta_q +ctrlr control alt keycode 16 = Meta_Control_q +keycode 17 = +w + shift keycode 17 = +W + altgr keycode 17 = at + control keycode 17 = Control_w + shift control keycode 17 = Control_w + alt keycode 17 = Meta_w + control alt keycode 17 = Meta_Control_w +ctrlr keycode 17 = U+0446 +ctrlr shift keycode 17 = U+0426 +ctrlr altgr keycode 17 = at +ctrlr control keycode 17 = Control_w +ctrlr shift control keycode 17 = Control_w +ctrlr alt keycode 17 = Meta_w +ctrlr control alt keycode 17 = Meta_Control_w +keycode 18 = +e + shift keycode 18 = +E + altgr keycode 18 = numbersign + control keycode 18 = Control_e + shift control keycode 18 = Control_e + alt keycode 18 = Meta_e + control alt keycode 18 = Meta_Control_e +ctrlr keycode 18 = U+0443 +ctrlr shift keycode 18 = U+0423 +ctrlr altgr keycode 18 = numbersign +ctrlr control keycode 18 = Control_e +ctrlr shift control keycode 18 = Control_e +ctrlr alt keycode 18 = Meta_e +ctrlr control alt keycode 18 = Meta_Control_e +keycode 19 = +r + shift keycode 19 = +R + altgr keycode 19 = dollar + control keycode 19 = Control_r + shift control keycode 19 = Control_r + alt keycode 19 = Meta_r + control alt keycode 19 = Meta_Control_r +ctrlr keycode 19 = U+043A +ctrlr shift keycode 19 = U+041A +ctrlr altgr keycode 19 = dollar +ctrlr control keycode 19 = Control_r +ctrlr shift control keycode 19 = Control_r +ctrlr alt keycode 19 = Meta_r +ctrlr control alt keycode 19 = Meta_Control_r +keycode 20 = +t + shift keycode 20 = +T + altgr keycode 20 = percent + control keycode 20 = Control_t + shift control keycode 20 = Control_t + alt keycode 20 = Meta_t + control alt keycode 20 = Meta_Control_t +ctrlr keycode 20 = U+0435 +ctrlr shift keycode 20 = U+0415 +ctrlr altgr keycode 20 = percent +ctrlr control keycode 20 = Control_t +ctrlr shift control keycode 20 = Control_t +ctrlr alt keycode 20 = Meta_t +ctrlr control alt keycode 20 = Meta_Control_t +keycode 21 = +y + shift keycode 21 = +Y + altgr keycode 21 = asciicircum + control keycode 21 = Control_y + shift control keycode 21 = Control_y + alt keycode 21 = Meta_y + control alt keycode 21 = Meta_Control_y +ctrlr keycode 21 = U+043D +ctrlr shift keycode 21 = U+041D +ctrlr altgr keycode 21 = asciicircum +ctrlr control keycode 21 = Control_y +ctrlr shift control keycode 21 = Control_y +ctrlr alt keycode 21 = Meta_y +ctrlr control alt keycode 21 = Meta_Control_y +keycode 22 = +u +U ampersand Control_u Control_u Meta_u Meta_Control_u seven +ctrlr keycode 22 = U+0433 +ctrlr shift keycode 22 = U+0413 +ctrlr altgr keycode 22 = ampersand +ctrlr control keycode 22 = Control_u +ctrlr shift control keycode 22 = Control_u +ctrlr alt keycode 22 = Meta_u +ctrlr control alt keycode 22 = Meta_Control_u +ctrlr ctrll keycode 22 = seven +keycode 23 = +i +I asterisk Tab Tab Meta_i Meta_Tab eight +ctrlr keycode 23 = U+0448 +ctrlr shift keycode 23 = U+0428 +ctrlr altgr keycode 23 = asterisk +ctrlr control keycode 23 = Tab +ctrlr shift control keycode 23 = Tab +ctrlr alt keycode 23 = Meta_i +ctrlr control alt keycode 23 = Meta_Tab +ctrlr ctrll keycode 23 = eight +keycode 24 = +o +O parenleft Control_o Control_o Meta_o Meta_Control_o nine +ctrlr keycode 24 = U+0449 +ctrlr shift keycode 24 = U+0429 +ctrlr altgr keycode 24 = parenleft +ctrlr control keycode 24 = Control_o +ctrlr shift control keycode 24 = Control_o +ctrlr alt keycode 24 = Meta_o +ctrlr control alt keycode 24 = Meta_Control_o +ctrlr ctrll keycode 24 = nine +keycode 25 = +p + shift keycode 25 = +P + altgr keycode 25 = parenright + control keycode 25 = Control_p + shift control keycode 25 = Control_p + alt keycode 25 = Meta_p + control alt keycode 25 = Meta_Control_p +ctrlr keycode 25 = U+0437 +ctrlr shift keycode 25 = U+0417 +ctrlr altgr keycode 25 = parenright +ctrlr control keycode 25 = Control_p +ctrlr shift control keycode 25 = Control_p +ctrlr alt keycode 25 = Meta_p +ctrlr control alt keycode 25 = Meta_Control_p +keycode 26 = bracketleft braceleft + control keycode 26 = Escape + alt keycode 26 = Meta_bracketleft +keycode 27 = bracketright braceright asciitilde Control_bracketright + alt keycode 27 = Meta_bracketright +keycode 28 = Return + alt keycode 28 = Meta_Control_m +ctrlr keycode 28 = Return +ctrlr alt keycode 28 = Meta_Control_m +keycode 29 = CtrlL +keycode 30 = +a + shift keycode 30 = +A + altgr keycode 30 = degree + control keycode 30 = Control_a + shift control keycode 30 = Control_a + alt keycode 30 = Meta_a + control alt keycode 30 = Meta_Control_a +ctrlr keycode 30 = U+0444 +ctrlr shift keycode 30 = U+0424 +ctrlr altgr keycode 30 = degree +ctrlr control keycode 30 = Control_a +ctrlr shift control keycode 30 = Control_a +ctrlr alt keycode 30 = Meta_a +ctrlr control alt keycode 30 = Meta_Control_a +keycode 31 = +s + shift keycode 31 = +S + altgr keycode 31 = diaeresis + control keycode 31 = Control_s + shift control keycode 31 = Control_s + alt keycode 31 = Meta_s + control alt keycode 31 = Meta_Control_s +ctrlr keycode 31 = U+044B +ctrlr shift keycode 31 = U+042B +ctrlr altgr keycode 31 = diaeresis +ctrlr control keycode 31 = Control_s +ctrlr shift control keycode 31 = Control_s +ctrlr alt keycode 31 = Meta_s +ctrlr control alt keycode 31 = Meta_Control_s +keycode 32 = +d + shift keycode 32 = +D + altgr keycode 32 = currency + control keycode 32 = Control_d + shift control keycode 32 = Control_d + alt keycode 32 = Meta_d + control alt keycode 32 = Meta_Control_d +ctrlr keycode 32 = U+0432 +ctrlr shift keycode 32 = U+0412 +ctrlr altgr keycode 32 = currency +ctrlr control keycode 32 = Control_d +ctrlr shift control keycode 32 = Control_d +ctrlr alt keycode 32 = Meta_d +ctrlr control alt keycode 32 = Meta_Control_d +keycode 33 = +f + shift keycode 33 = +F + altgr keycode 33 = minus + control keycode 33 = Control_f + shift control keycode 33 = Control_f + alt keycode 33 = Meta_f + control alt keycode 33 = Meta_Control_f +ctrlr keycode 33 = U+0430 +ctrlr shift keycode 33 = U+0410 +ctrlr altgr keycode 33 = minus +ctrlr control keycode 33 = Control_f +ctrlr shift control keycode 33 = Control_f +ctrlr alt keycode 33 = Meta_f +ctrlr control alt keycode 33 = Meta_Control_f +keycode 34 = +g + shift keycode 34 = +G + altgr keycode 34 = underscore + control keycode 34 = Control_g + shift control keycode 34 = Control_g + alt keycode 34 = Meta_g + control alt keycode 34 = Meta_Control_g +ctrlr keycode 34 = U+043F +ctrlr shift keycode 34 = U+041F +ctrlr altgr keycode 34 = underscore +ctrlr control keycode 34 = Control_g +ctrlr shift control keycode 34 = Control_g +ctrlr alt keycode 34 = Meta_g +ctrlr control alt keycode 34 = Meta_Control_g +keycode 35 = +h + shift keycode 35 = +H + altgr keycode 35 = braceleft + control keycode 35 = BackSpace + shift control keycode 35 = BackSpace + alt keycode 35 = Meta_h + control alt keycode 35 = Meta_BackSpace +ctrlr keycode 35 = U+0440 +ctrlr shift keycode 35 = U+0420 +ctrlr altgr keycode 35 = braceleft +ctrlr control keycode 35 = BackSpace +ctrlr shift control keycode 35 = BackSpace +ctrlr alt keycode 35 = Meta_h +ctrlr control alt keycode 35 = Meta_BackSpace +keycode 36 = +j +J bracketleft Linefeed Linefeed Meta_j Meta_Linefeed four +ctrlr keycode 36 = U+043E +ctrlr shift keycode 36 = U+041E +ctrlr altgr keycode 36 = bracketleft +ctrlr control keycode 36 = Linefeed +ctrlr shift control keycode 36 = Linefeed +ctrlr alt keycode 36 = Meta_j +ctrlr control alt keycode 36 = Meta_Linefeed +ctrlr ctrll keycode 36 = four +keycode 37 = +k +K bracketright Control_k Control_k Meta_k Meta_Control_k five +ctrlr keycode 37 = U+043B +ctrlr shift keycode 37 = U+041B +ctrlr altgr keycode 37 = bracketright +ctrlr control keycode 37 = Control_k +ctrlr shift control keycode 37 = Control_k +ctrlr alt keycode 37 = Meta_k +ctrlr control alt keycode 37 = Meta_Control_k +ctrlr ctrll keycode 37 = five +keycode 38 = +l +L braceright Control_l Control_l Meta_l Meta_Control_l six +ctrlr keycode 38 = U+0434 +ctrlr shift keycode 38 = U+0414 +ctrlr altgr keycode 38 = braceright +ctrlr control keycode 38 = Control_l +ctrlr shift control keycode 38 = Control_l +ctrlr alt keycode 38 = Meta_l +ctrlr control alt keycode 38 = Meta_Control_l +ctrlr ctrll keycode 38 = six +keycode 39 = semicolon colon + alt keycode 39 = Meta_semicolon +keycode 40 = apostrophe quotedbl + control keycode 40 = Control_g + alt keycode 40 = Meta_apostrophe +keycode 41 = acute grave +ctrlr keycode 41 = U+044A +ctrlr shift keycode 41 = U+042A +ctrlr ctrll keycode 41 = grave +ctrlr alt keycode 41 = acute +keycode 42 = Shift +ctrlr keycode 42 = Uncaps_Shift +keycode 43 = backslash bar + control keycode 43 = Control_backslash + alt keycode 43 = Meta_backslash +ctrlr keycode 43 = U+0445 +ctrlr shift keycode 43 = U+0425 +ctrlr ctrll keycode 43 = bar +ctrlr alt keycode 43 = backslash +ctrlr control keycode 43 = Control_backslash +ctrlr alt keycode 43 = Meta_backslash +keycode 44 = +z + shift keycode 44 = +Z + control keycode 44 = Control_z + shift control keycode 44 = Control_z + alt keycode 44 = Meta_z + control alt keycode 44 = Meta_Control_z +ctrlr keycode 44 = U+044F +ctrlr shift keycode 44 = U+042F +ctrlr control keycode 44 = Control_z +ctrlr shift control keycode 44 = Control_z +ctrlr alt keycode 44 = Meta_z +ctrlr control alt keycode 44 = Meta_Control_z +keycode 45 = +x + shift keycode 45 = +X + control keycode 45 = Control_x + shift control keycode 45 = Control_x + alt keycode 45 = Meta_x + control alt keycode 45 = Meta_Control_x +ctrlr keycode 45 = U+0447 +ctrlr shift keycode 45 = U+0427 +ctrlr control keycode 45 = Control_x +ctrlr shift control keycode 45 = Control_x +ctrlr alt keycode 45 = Meta_x +ctrlr control alt keycode 45 = Meta_Control_x +keycode 46 = +c + shift keycode 46 = +C + altgr keycode 46 = Hex_C + control keycode 46 = Control_c + shift control keycode 46 = Control_c + alt keycode 46 = Meta_c + control alt keycode 46 = Meta_Control_c +ctrlr keycode 46 = U+0441 +ctrlr shift keycode 46 = U+0421 +ctrlr altgr keycode 46 = Hex_C +ctrlr control keycode 46 = Control_c +ctrlr shift control keycode 46 = Control_c +ctrlr alt keycode 46 = Meta_c +ctrlr control alt keycode 46 = Meta_Control_c +keycode 47 = +v + shift keycode 47 = +V + control keycode 47 = Control_v + shift control keycode 47 = Control_v + alt keycode 47 = Meta_v + control alt keycode 47 = Meta_Control_v +ctrlr keycode 47 = U+043C +ctrlr shift keycode 47 = U+041C +ctrlr control keycode 47 = Control_v +ctrlr shift control keycode 47 = Control_v +ctrlr alt keycode 47 = Meta_v +ctrlr control alt keycode 47 = Meta_Control_v +keycode 48 = +b + shift keycode 48 = +B + altgr keycode 48 = Hex_B + control keycode 48 = Control_b + shift control keycode 48 = Control_b + alt keycode 48 = Meta_b + control alt keycode 48 = Meta_Control_b +ctrlr keycode 48 = U+0438 +ctrlr shift keycode 48 = U+0418 +ctrlr altgr keycode 48 = Hex_B +ctrlr control keycode 48 = Control_b +ctrlr shift control keycode 48 = Control_b +ctrlr alt keycode 48 = Meta_b +ctrlr control alt keycode 48 = Meta_Control_b +keycode 49 = +n +N less Control_n Control_n Meta_n Meta_Control_n one +ctrlr keycode 49 = U+0442 +ctrlr shift keycode 49 = U+0422 +ctrlr altgr keycode 49 = less +ctrlr control keycode 49 = Control_n +ctrlr shift control keycode 49 = Control_n +ctrlr alt keycode 49 = Meta_n +ctrlr control alt keycode 49 = Meta_Control_n +ctrlr ctrll keycode 49 = one +keycode 50 = +m +M greater Control_m Control_m Meta_m Meta_Control_m two +ctrlr keycode 50 = U+044C +ctrlr shift keycode 50 = U+042C +ctrlr altgr keycode 50 = greater +ctrlr control keycode 50 = Control_m +ctrlr shift control keycode 50 = Control_m +ctrlr alt keycode 50 = Meta_m +ctrlr control alt keycode 50 = Meta_Control_m +ctrlr ctrll keycode 50 = two +keycode 51 = comma semicolon apostrophe +ctrlr keycode 51 = U+0436 +ctrlr shift keycode 51 = U+0416 +ctrlr altgr keycode 51 = apostrophe +ctrlr alt keycode 51 = comma +ctrlr ctrll keycode 51 = semicolon +keycode 52 = period colon quotedbl Compose +ctrlr keycode 52 = U+044D +ctrlr shift keycode 52 = U+042D +ctrlr altgr keycode 52 = quotedbl +ctrlr alt keycode 52 = period +ctrlr ctrll keycode 52 = colon +keycode 53 = slash question + control keycode 53 = Delete + alt keycode 53 = Meta_slash + ctrll keycode 53 = zero +ctrlr keycode 53 = slash +ctrlr shift keycode 53 = question +ctrlr control keycode 53 = Delete +ctrlr alt keycode 53 = Meta_slash +ctrlr ctrll keycode 53 = zero +keycode 54 = AltGr +keycode 55 = KP_Multiply +keycode 56 = Alt +keycode 57 = space space + control keycode 57 = nul + alt keycode 57 = Meta_space +ctrlr keycode 57 = space +ctrlr shift keycode 57 = space +ctrlr control keycode 57 = nul +ctrlr alt keycode 57 = Meta_space +keycode 58 = Caps_Lock +ctrlr keycode 58 = Shift_Lock +keycode 59 = F1 F11 Console_13 F1 + alt keycode 59 = Console_1 + control alt keycode 59 = Console_1 +ctrlr keycode 59 = F1 +ctrlr shift keycode 59 = F11 +ctrlr altgr keycode 59 = Console_13 +ctrlr control keycode 59 = F1 +ctrlr alt keycode 59 = Console_1 +ctrlr control alt keycode 59 = Console_1 +keycode 60 = F2 F12 Console_14 F2 + alt keycode 60 = Console_2 + control alt keycode 60 = Console_2 +ctrlr keycode 60 = F2 +ctrlr shift keycode 60 = F12 +ctrlr altgr keycode 60 = Console_14 +ctrlr control keycode 60 = F2 +ctrlr alt keycode 60 = Console_2 +ctrlr control alt keycode 60 = Console_2 +keycode 61 = F3 F13 Console_15 F3 + alt keycode 61 = Console_3 + control alt keycode 61 = Console_3 +ctrlr keycode 61 = F3 +ctrlr shift keycode 61 = F13 +ctrlr altgr keycode 61 = Console_15 +ctrlr control keycode 61 = F3 +ctrlr alt keycode 61 = Console_3 +ctrlr control alt keycode 61 = Console_3 +keycode 62 = F4 F14 Console_16 F4 + alt keycode 62 = Console_4 + control alt keycode 62 = Console_4 +ctrlr keycode 62 = F4 +ctrlr shift keycode 62 = F14 +ctrlr altgr keycode 62 = Console_16 +ctrlr control keycode 62 = F4 +ctrlr alt keycode 62 = Console_4 +ctrlr control alt keycode 62 = Console_4 +keycode 63 = F5 F15 Console_17 F5 + alt keycode 63 = Console_5 + control alt keycode 63 = Console_5 +ctrlr keycode 63 = F5 +ctrlr shift keycode 63 = F15 +ctrlr altgr keycode 63 = Console_17 +ctrlr control keycode 63 = F5 +ctrlr alt keycode 63 = Console_5 +ctrlr control alt keycode 63 = Console_5 +keycode 64 = F6 F16 Console_18 F6 + alt keycode 64 = Console_6 + control alt keycode 64 = Console_6 +ctrlr keycode 64 = F6 +ctrlr shift keycode 64 = F16 +ctrlr altgr keycode 64 = Console_18 +ctrlr control keycode 64 = F6 +ctrlr alt keycode 64 = Console_6 +ctrlr control alt keycode 64 = Console_6 +keycode 65 = F7 F17 Console_19 F7 + alt keycode 65 = Console_7 + control alt keycode 65 = Console_7 +ctrlr keycode 65 = F7 +ctrlr shift keycode 65 = F17 +ctrlr altgr keycode 65 = Console_19 +ctrlr control keycode 65 = F7 +ctrlr alt keycode 65 = Console_7 +ctrlr control alt keycode 65 = Console_7 +keycode 66 = F8 F18 Console_20 F8 + alt keycode 66 = Console_8 + control alt keycode 66 = Console_8 +ctrlr keycode 66 = F8 +ctrlr shift keycode 66 = F18 +ctrlr altgr keycode 66 = Console_20 +ctrlr control keycode 66 = F8 +ctrlr alt keycode 66 = Console_8 +ctrlr control alt keycode 66 = Console_8 +keycode 67 = F9 F19 Console_21 F9 + alt keycode 67 = Console_9 + control alt keycode 67 = Console_9 +keycode 68 = F10 F20 Console_22 F10 + alt keycode 68 = Console_10 + control alt keycode 68 = Console_10 +keycode 69 = Num_Lock + shift keycode 69 = Bare_Num_Lock +keycode 70 = Scroll_Lock Show_Memory Show_Registers Show_State + alt keycode 70 = Scroll_Lock +keycode 71 = KP_7 + altgr keycode 71 = Hex_7 + alt keycode 71 = Ascii_7 +keycode 72 = KP_8 + altgr keycode 72 = Hex_8 + alt keycode 72 = Ascii_8 +keycode 73 = KP_9 + altgr keycode 73 = Hex_9 + alt keycode 73 = Ascii_9 +keycode 74 = KP_Subtract +keycode 75 = KP_4 + altgr keycode 75 = Hex_4 + alt keycode 75 = Ascii_4 +keycode 76 = KP_5 + altgr keycode 76 = Hex_5 + alt keycode 76 = Ascii_5 +keycode 77 = KP_6 + altgr keycode 77 = Hex_6 + alt keycode 77 = Ascii_6 +keycode 78 = KP_Add +keycode 79 = KP_1 + altgr keycode 79 = Hex_1 + alt keycode 79 = Ascii_1 +keycode 80 = KP_2 + altgr keycode 80 = Hex_2 + alt keycode 80 = Ascii_2 +keycode 81 = KP_3 + altgr keycode 81 = Hex_3 + alt keycode 81 = Ascii_3 +keycode 82 = KP_0 + altgr keycode 82 = Hex_0 + alt keycode 82 = Ascii_0 +keycode 83 = KP_Period + control alt keycode 83 = Boot +keycode 84 = Last_Console +keycode 85 = +keycode 86 = less greater bar + alt keycode 86 = Meta_less +keycode 87 = F11 Scroll_Backward Prior F11 + alt keycode 87 = Console_11 + control alt keycode 87 = Console_11 +ctrlr keycode 87 = F11 +ctrlr shift keycode 87 = Scroll_Backward +ctrlr altgr keycode 87 = Prior +ctrlr control keycode 87 = F11 +ctrlr alt keycode 87 = Console_11 +ctrlr control alt keycode 87 = Console_11 +keycode 88 = F12 Scroll_Forward Next F12 + alt keycode 88 = Console_12 + control alt keycode 88 = Console_12 +ctrlr keycode 88 = F12 +ctrlr shift keycode 88 = Scroll_Forward +ctrlr altgr keycode 88 = Next +ctrlr control keycode 88 = F12 +ctrlr alt keycode 88 = Console_12 +ctrlr control alt keycode 88 = Console_12 +keycode 89 = +keycode 90 = +keycode 91 = +keycode 92 = +keycode 93 = +keycode 94 = +keycode 95 = +keycode 96 = KP_Enter +keycode 97 = Control +keycode 98 = KP_Divide +keycode 99 = Control_backslash +keycode 100 = AltGr +keycode 101 = Break +keycode 102 = Find +keycode 103 = Up +ctrlr keycode 103 = Up +keycode 104 = Prior + shift keycode 104 = Scroll_Backward +keycode 105 = Left + alt keycode 105 = Decr_Console +ctrlr keycode 105 = Left +ctrlr alt keycode 105 = Decr_Console +keycode 106 = Right + alt keycode 106 = Incr_Console +ctrlr keycode 106 = Right +ctrlr alt keycode 106 = Incr_Console +keycode 107 = Select +keycode 108 = Down +ctrlr keycode 108 = Down +keycode 109 = Next + shift keycode 109 = Scroll_Forward +keycode 110 = Insert +keycode 111 = Remove + control alt keycode 111 = Boot +keycode 112 = Macro +keycode 113 = F13 +keycode 114 = F14 +keycode 115 = Help +keycode 116 = Do +keycode 117 = F17 +keycode 118 = KP_MinPlus +keycode 119 = Pause +keycode 120 = +keycode 121 = +keycode 122 = +keycode 123 = +keycode 124 = +keycode 125 = +keycode 126 = +keycode 127 = +keycode 128 = +keycode 129 = +keycode 130 = +keycode 131 = +keycode 132 = +keycode 133 = +keycode 134 = +keycode 135 = +keycode 136 = +keycode 137 = +keycode 138 = +keycode 139 = +keycode 140 = +keycode 141 = +keycode 142 = +keycode 143 = +keycode 144 = +keycode 145 = +keycode 146 = +keycode 147 = +keycode 148 = +keycode 149 = +keycode 150 = +keycode 151 = +keycode 152 = +keycode 153 = +keycode 154 = +keycode 155 = +keycode 156 = +keycode 157 = +keycode 158 = +keycode 159 = +keycode 160 = +keycode 161 = +keycode 162 = +keycode 163 = +keycode 164 = +keycode 165 = +keycode 166 = +keycode 167 = +keycode 168 = +keycode 169 = +keycode 170 = +keycode 171 = +keycode 172 = +keycode 173 = +keycode 174 = +keycode 175 = +keycode 176 = +keycode 177 = +keycode 178 = +keycode 179 = +keycode 180 = +keycode 181 = +keycode 182 = +keycode 183 = CtrlR_Lock +keycode 184 = +keycode 185 = +keycode 186 = +keycode 187 = +keycode 188 = +keycode 189 = +keycode 190 = +keycode 191 = +keycode 192 = +keycode 193 = +keycode 194 = +keycode 195 = +keycode 196 = +keycode 197 = +keycode 198 = +keycode 199 = +keycode 200 = +keycode 201 = +keycode 202 = +keycode 203 = +keycode 204 = +keycode 205 = +keycode 206 = +keycode 207 = +keycode 208 = +keycode 209 = +keycode 210 = +keycode 211 = +keycode 212 = +keycode 213 = +keycode 214 = +keycode 215 = +keycode 216 = +keycode 217 = +keycode 218 = +keycode 219 = +keycode 220 = +keycode 221 = +keycode 222 = +keycode 223 = +keycode 224 = +keycode 225 = +keycode 226 = +keycode 227 = +keycode 228 = +keycode 229 = +keycode 230 = +keycode 231 = +keycode 232 = +keycode 233 = +keycode 234 = +keycode 235 = +keycode 236 = +keycode 237 = +keycode 238 = +keycode 239 = +keycode 240 = +keycode 241 = +keycode 242 = +keycode 243 = +keycode 244 = +keycode 245 = +keycode 246 = +keycode 247 = +keycode 248 = +keycode 249 = +keycode 250 = +keycode 251 = +keycode 252 = +keycode 253 = +keycode 254 = +keycode 255 = +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" +string F6 = "\033[17~" +string F7 = "\033[18~" +string F8 = "\033[19~" +string F9 = "\033[20~" +string F10 = "\033[21~" +string F13 = "\033[25~" +string F14 = "\033[26~" +string F15 = "\033[28~" +string F16 = "\033[29~" +string F17 = "\033[31~" +string F18 = "\033[32~" +string F19 = "\033[33~" +string F20 = "\033[34~" +string Find = "\033[1~" +string Insert = "\033[2~" +string Remove = "\033[3~" +string Select = "\033[4~" +string Prior = "\033[5~" +string Next = "\033[6~" +string Macro = "\033[M" +string Pause = "\033[P" diff --git a/ben-cyrillic/files/ben_ru_uni.trans b/ben-cyrillic/files/ben_ru_uni.trans new file mode 100644 index 0000000..eaacde5 --- /dev/null +++ b/ben-cyrillic/files/ben_ru_uni.trans @@ -0,0 +1,64 @@ +0xa0 U+0410 # CYRILLIC CAPITAL LETTER A +0xa1 U+0411 # CYRILLIC CAPITAL LETTER BE +0xa2 U+0412 # CYRILLIC CAPITAL LETTER VE +0xa3 U+0413 # CYRILLIC CAPITAL LETTER GHE +0xa4 U+0414 # CYRILLIC CAPITAL LETTER DE +0xa5 U+0415 # CYRILLIC CAPITAL LETTER IE +0xa6 U+0416 # CYRILLIC CAPITAL LETTER ZHE +0xa7 U+0417 # CYRILLIC CAPITAL LETTER ZE +0xa8 U+0418 # CYRILLIC CAPITAL LETTER I +0xa9 U+0419 # CYRILLIC CAPITAL LETTER SHORT I +0xaa U+041A # CYRILLIC CAPITAL LETTER KA +0xab U+041B # CYRILLIC CAPITAL LETTER EL +0xac U+041C # CYRILLIC CAPITAL LETTER EM +0xad U+041D # CYRILLIC CAPITAL LETTER EN +0xae U+041E # CYRILLIC CAPITAL LETTER O +0xaf U+041F # CYRILLIC CAPITAL LETTER PE +0xb0 U+0420 # CYRILLIC CAPITAL LETTER ER +0xb1 U+0421 # CYRILLIC CAPITAL LETTER ES +0xb2 U+0422 # CYRILLIC CAPITAL LETTER TE +0xb3 U+0423 # CYRILLIC CAPITAL LETTER U +0xb4 U+0424 # CYRILLIC CAPITAL LETTER EF +0xb5 U+0425 # CYRILLIC CAPITAL LETTER HA +0xb6 U+0426 # CYRILLIC CAPITAL LETTER TSE +0xb7 U+0427 # CYRILLIC CAPITAL LETTER CHE +0xb8 U+0428 # CYRILLIC CAPITAL LETTER SHA +0xb9 U+0429 # CYRILLIC CAPITAL LETTER SHCHA +0xba U+042A # CYRILLIC CAPITAL LETTER HARD SIGN +0xbb U+042B # CYRILLIC CAPITAL LETTER YERU +0xbc U+042C # CYRILLIC CAPITAL LETTER SOFT SIGN +0xbd U+042D # CYRILLIC CAPITAL LETTER E +0xbe U+042E # CYRILLIC CAPITAL LETTER YU +0xbf U+042F # CYRILLIC CAPITAL LETTER YA +0xc0 U+0430 # CYRILLIC SMALL LETTER A +0xc1 U+0431 # CYRILLIC SMALL LETTER BE +0xc2 U+0432 # CYRILLIC SMALL LETTER VE +0xc3 U+0433 # CYRILLIC SMALL LETTER GHE +0xc4 U+0434 # CYRILLIC SMALL LETTER DE +0xc5 U+0435 # CYRILLIC SMALL LETTER IE +0xc6 U+0436 # CYRILLIC SMALL LETTER ZHE +0xc7 U+0437 # CYRILLIC SMALL LETTER ZE +0xc8 U+0438 # CYRILLIC SMALL LETTER I +0xc9 U+0439 # CYRILLIC SMALL LETTER SHORT I +0xca U+043A # CYRILLIC SMALL LETTER KA +0xcb U+043B # CYRILLIC SMALL LETTER EL +0xcc U+043C # CYRILLIC SMALL LETTER EM +0xcd U+043D # CYRILLIC SMALL LETTER EN +0xce U+043E # CYRILLIC SMALL LETTER O +0xcf U+043F # CYRILLIC SMALL LETTER PE +0xd0 U+0440 # CYRILLIC SMALL LETTER ER +0xd1 U+0441 # CYRILLIC SMALL LETTER ES +0xd2 U+0442 # CYRILLIC SMALL LETTER TE +0xd3 U+0443 # CYRILLIC SMALL LETTER U +0xd4 U+0444 # CYRILLIC SMALL LETTER EF +0xd5 U+0445 # CYRILLIC SMALL LETTER HA +0xd6 U+0446 # CYRILLIC SMALL LETTER TSE +0xd7 U+0447 # CYRILLIC SMALL LETTER CHE +0xd8 U+0448 # CYRILLIC SMALL LETTER SHA +0xd9 U+0449 # CYRILLIC SMALL LETTER SHCHA +0xda U+044A # CYRILLIC SMALL LETTER HARD SIGN +0xdb U+044B # CYRILLIC SMALL LETTER YERU +0xdc U+044C # CYRILLIC SMALL LETTER SOFT SIGN +0xdd U+044D # CYRILLIC SMALL LETTER E +0xde U+044E # CYRILLIC SMALL LETTER YU +0xdf U+044F # CYRILLIC SMALL LETTER YA diff --git a/ben-cyrillic/files/pre-6x10-font_rus.png b/ben-cyrillic/files/pre-6x10-font_rus.png Binary files differnew file mode 100644 index 0000000..59a7518 --- /dev/null +++ b/ben-cyrillic/files/pre-6x10-font_rus.png diff --git a/ben-cyrillic/files/russian.sh b/ben-cyrillic/files/russian.sh new file mode 100644 index 0000000..95f81b5 --- /dev/null +++ b/ben-cyrillic/files/russian.sh @@ -0,0 +1,11 @@ +#!/bin/sh +setfont2 /usr/share/ben-cyrillic/un-fuzzy-6x10-font_rus.pnm +loadkeys /usr/share/ben-cyrillic/ben_ru_uni.map +loadunimap /usr/share/ben-cyrillic/ben_ru_uni.trans +profile="/etc/profile" +locale="export LC_ALL=ru_RU.UTF-8" +grep "$locale" "$profile" > /dev/null 2>&1 +if [ "$?" -eq "1" ]; then + #presumably first run, need to set the LC_ALL env + echo "$locale" >> "$profile" +fi diff --git a/ben-cyrillic/files/un-fuzzy-6x10-font_rus.pnm b/ben-cyrillic/files/un-fuzzy-6x10-font_rus.pnm Binary files differnew file mode 100644 index 0000000..0f23478 --- /dev/null +++ b/ben-cyrillic/files/un-fuzzy-6x10-font_rus.pnm diff --git a/bsd-games/Makefile b/bsd-games/Makefile index 580f6ab..24e762a 100644 --- a/bsd-games/Makefile +++ b/bsd-games/Makefile @@ -1,5 +1,3 @@ -# -# kyak@freenode/#qi-hardware # # This is free software, licensed under the GNU General Public License v2. # diff --git a/bsd-games/patches/001-tetris.patch b/bsd-games/patches/001-tetris.patch index a23bc16..b193d8a 100644 --- a/bsd-games/patches/001-tetris.patch +++ b/bsd-games/patches/001-tetris.patch @@ -1,6 +1,6 @@ -diff -u bsd-games-2.17/tetris/input.c bsd-games-2.17-p/tetris/input.c ---- bsd-games-2.17/tetris/input.c 2003-12-17 05:47:37.000000000 +0300 -+++ bsd-games-2.17-p/tetris/input.c 2010-07-26 22:04:34.422302192 +0400 +diff -ur bsd-games-2.17-p/tetris/input.c bsd-games-2.17/tetris/input.c +--- bsd-games-2.17-p/tetris/input.c 2010-11-14 21:46:54.909025861 +0300 ++++ bsd-games-2.17/tetris/input.c 2010-11-14 21:48:17.830025444 +0300 @@ -85,7 +85,7 @@ endtv = *tvp; timeout = tvp->tv_sec * 1000 + tvp->tv_usec / 1000; @@ -10,18 +10,18 @@ diff -u bsd-games-2.17/tetris/input.c bsd-games-2.17-p/tetris/input.c again: set[0].fd = STDIN_FILENO; set[0].events = POLLIN; -diff -u bsd-games-2.17/tetris/pathnames.h.in bsd-games-2.17-p/tetris/pathnames.h.in ---- bsd-games-2.17/tetris/pathnames.h.in 2003-12-17 05:47:37.000000000 +0300 -+++ bsd-games-2.17-p/tetris/pathnames.h.in 2010-07-27 11:42:20.386554141 +0400 +diff -ur bsd-games-2.17-p/tetris/pathnames.h.in bsd-games-2.17/tetris/pathnames.h.in +--- bsd-games-2.17-p/tetris/pathnames.h.in 2010-11-14 21:46:54.908027310 +0300 ++++ bsd-games-2.17/tetris/pathnames.h.in 2010-11-14 21:48:17.830025444 +0300 @@ -34,4 +34,4 @@ * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 */ -#define _PATH_SCOREFILE "@tetris_scorefile@" +#define _PATH_SCOREFILE "/usr/share/games/tetris-bsd.scores" -diff -u bsd-games-2.17/tetris/screen.c bsd-games-2.17-p/tetris/screen.c ---- bsd-games-2.17/tetris/screen.c 2004-01-27 23:52:07.000000000 +0300 -+++ bsd-games-2.17-p/tetris/screen.c 2010-07-26 22:04:34.422151495 +0400 +diff -ur bsd-games-2.17-p/tetris/screen.c bsd-games-2.17/tetris/screen.c +--- bsd-games-2.17-p/tetris/screen.c 2010-11-14 21:46:54.908027310 +0300 ++++ bsd-games-2.17/tetris/screen.c 2010-11-14 22:09:58.510150197 +0300 @@ -73,7 +73,7 @@ extern char PC, *BC, *UP; /* tgoto requires globals: ugh! */ static char BCdefault[] = "\b"; @@ -39,9 +39,9 @@ diff -u bsd-games-2.17/tetris/screen.c bsd-games-2.17-p/tetris/screen.c newtt.c_oflag &= ~OXTABS; newtt.c_cc[VMIN] = 1; newtt.c_cc[VTIME] = 0; -diff -u bsd-games-2.17/tetris/shapes.c bsd-games-2.17-p/tetris/shapes.c ---- bsd-games-2.17/tetris/shapes.c 2003-12-17 05:47:37.000000000 +0300 -+++ bsd-games-2.17-p/tetris/shapes.c 2010-07-27 09:30:41.267111585 +0400 +diff -ur bsd-games-2.17-p/tetris/shapes.c bsd-games-2.17/tetris/shapes.c +--- bsd-games-2.17-p/tetris/shapes.c 2010-11-14 21:46:54.908027310 +0300 ++++ bsd-games-2.17/tetris/shapes.c 2010-11-14 21:48:17.831024977 +0300 @@ -83,7 +83,7 @@ const struct shape *shape; int pos; @@ -60,9 +60,9 @@ diff -u bsd-games-2.17/tetris/shapes.c bsd-games-2.17-p/tetris/shapes.c board[pos] = onoff; board[pos + *o++] = onoff; -diff -u bsd-games-2.17/tetris/tetris.c bsd-games-2.17-p/tetris/tetris.c ---- bsd-games-2.17/tetris/tetris.c 2004-01-27 23:52:07.000000000 +0300 -+++ bsd-games-2.17-p/tetris/tetris.c 2010-08-12 12:21:29.685301361 +0400 +diff -ur bsd-games-2.17-p/tetris/tetris.c bsd-games-2.17/tetris/tetris.c +--- bsd-games-2.17-p/tetris/tetris.c 2010-11-14 21:46:54.909025861 +0300 ++++ bsd-games-2.17/tetris/tetris.c 2010-11-14 22:15:43.958150419 +0300 @@ -35,10 +35,10 @@ */ @@ -85,3 +85,12 @@ diff -u bsd-games-2.17/tetris/tetris.c bsd-games-2.17-p/tetris/tetris.c while ((ch = getopt(argc, argv, "k:l:ps")) != -1) switch(ch) { +@@ -194,7 +194,7 @@ + } + + sprintf(key_msg, +-"%s - left %s - rotate %s - right %s - drop %s - pause %s - quit", ++"%s:<- %s:rotate %s:-> %s:drop %s:pause %s:quit", + key_write[0], key_write[1], key_write[2], key_write[3], + key_write[4], key_write[5]); + diff --git a/byobu/Makefile b/byobu/Makefile new file mode 100644 index 0000000..8e2163f --- /dev/null +++ b/byobu/Makefile @@ -0,0 +1,51 @@ +# +# Copyright (C) 2009 Sharim At Work, Ltd. +# Author: Xiangfu Liu <xiangfu@sharism.cc> +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=byobu +PKG_VERSION:=3.6 + +PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz +PKG_SOURCE_URL:=http://launchpad.net/byobu/trunk/3.6/+download/ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/byobu + SECTION:=utils + CATEGORY:=Utilities + TITLE:=a Japanese term for decorative, multi-panel screens that serve as folding room dividers + URL:=https://launchpad.net/byobu +endef + +define Package/byobu/description + Byobu is a Japanese term for decorative, multi-panel screens that serve as folding room dividers. As an open source project, Byobu is an elegant enhancement of the otherwise functional, plain, practical GNU Screen. Byobu includes an enhanced profile and configuration utilities for the GNU screen window manager, such as toggle-able system status notifications. +endef + +define Package/byobu/install + $(INSTALL_DIR) \ + $(1)/usr/bin \ + $(1)/usr/lib/byobu \ + $(1)/usr/share + + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/byobu \ + $(1)/usr/lib/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/share/byobu \ + $(1)/usr/share/ +endef + +$(eval $(call BuildPackage,byobu)) diff --git a/ctronome/Makefile b/ctronome/Makefile new file mode 100644 index 0000000..13b9ca3 --- /dev/null +++ b/ctronome/Makefile @@ -0,0 +1,42 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=ctronome +PKG_VERSION:=0.5.3 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://ctronome.kign.org/source/ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/ctronome + TITLE:=console metronome software + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:= + URL:=http://ctronome.kign.org/ +endef + +define Package/ctronome/description + a very simple yet powerful ;) programmable console metronome software +endef + +define Build/Install +#overwirte the openwrt automatic install +#there is not install in ctronome Makefile +endef + +define Package/ctronome/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/share/ctronome + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ctronome $(1)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/metronome*.wav $(1)/usr/share/ctronome/ +endef + +$(eval $(call BuildPackage,ctronome)) diff --git a/emacs-ja-dic-m/Makefile b/emacs-ja-dic-m/Makefile new file mode 100644 index 0000000..e7be43d --- /dev/null +++ b/emacs-ja-dic-m/Makefile @@ -0,0 +1,59 @@ +# +# Copyright (C) David Kuehling <dvdkhlng TA gmx TOD de> +# +# License GPLv2 or later. +# +# Converts and installs SKKDIC-JISYO-M for use with Emacs' japanese input +# method. + +include $(TOPDIR)/rules.mk + +PKG_NAME:=emacs-ja-dic-m +PKG_VERSION:=1.0 +PKG_RELEASE:=1 +PKG_SOURCE:=SKK-JISYO.M.gz +PKG_SOURCE_URL:=http://openlab.ring.gr.jp/skk/dic/ +PKG_MD5SUM:=f7aa51134b25c5481daca8cb396b3964 +PKG_BUILD_DEPENDS:= emacs/host +PKG_UNPACK = gzip -dc $(DL_DIR)/$(PKG_SOURCE) > $(PKG_BUILD_DIR)/ja-dic +include $(INCLUDE_DIR)/package.mk + +BATCH_RUN_EMACS := cd $(PKG_BUILD_DIR) && emacs -batch --no-site-file --multibyte + +define Package/emacs-ja-dic-m + SUBMENU:=Emacs + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Medium-size dictionary file for Emacs\' japanese input method + URL:=http://openlab.ring.gr.jp/skk/dic.html + DEPENDS:=+emacs +# SUBMENU:=Editors +endef + +define Package/emacs-ja-dic-m/description + Medium-size japanese Kanji dictionary for use with Emacs\' japanese input + method. This dictionary is about a factor of 100 smaller than the ja-dic + dictionary that ships with Emacs. Use it to enable japanese input on + memory-constrained systems. +endef + +define Build/Configure +endef + +define Build/Compile + $(BATCH_RUN_EMACS) -l ja-dic-cnv -f batch-skkdic-convert "ja-dic" + $(BATCH_RUN_EMACS) -f batch-byte-compile "ja-dic.el" +endef + +define Package/emacs-ja-dic-m/install + $(INSTALL_DIR) $(1)/usr/share/emacs/site-lisp/ja-dic + $(INSTALL_DATA) $(PKG_BUILD_DIR)/ja-dic.elc $(1)/usr/share/emacs/site-lisp/ja-dic/ +endef + +$(eval $(call BuildPackage,emacs-ja-dic-m)) + + +# The following comments configure the Emacs editor. Just ignore them. +# Local Variables: +# compile-command: "make -C ~/h/src/qi/openwrt-xburst package/emacs/compile -j2 V=99" +# End: diff --git a/emacs/Makefile b/emacs/Makefile new file mode 100644 index 0000000..166f482 --- /dev/null +++ b/emacs/Makefile @@ -0,0 +1,204 @@ +# +# Copyright (C) David Kuehling <dvdkhlng TA gmx TOD de> +# +# License GPLv2 or later. NO WARRANTY. +# +# OpenWRT package for the complete GNU Emacs editor + +include $(TOPDIR)/rules.mk + +PKG_NAME:=emacs +PKG_VERSION:=23.2 +PKG_RELEASE:=3 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/pub/gnu/emacs/ \ + @GNU/emacs/ + +PKG_MD5SUM:=b6691852dae0bc142b3c12749f6b7ade +PKG_INSTALL:=1 +PKG_FIXUP:=libtool + +PKG_BUILD_DEPENDS:= emacs/host libtool/host + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +define Package/emacs/Default + SUBMENU:=Emacs + SECTION:=utils + CATEGORY:=Utilities + TITLE:=The GNU Emacs Editor a.k.a. \"Emacs OS\" + URL:=http://www.gnu.org/software/emacs/ +# SUBMENU:=Editors +endef + +define Package/emacs/Default/description +GNU Emacs is an extensible, customizable text editor — and more. +At its core is an interpreter for Emacs Lisp, a dialect of the +Lisp programming language with extensions to support text editing. +endef + +define Package/emacs +$(call Package/emacs/Default) + DEPENDS:=+libncurses +emacs-data + TITLE+= (executable) +endef + +define Package/emacs/description +$(call Package/emacs/Default/description) + This package contains the Emacs executable files +endef + +define Package/emacs-data +$(call Package/emacs/Default) + TITLE+= (compiled lisp) +endef + +define Package/emacs-data/description +$(call Package/emacs/Default/description) + This package contains the compiled Lisp files needed to run Emacs. +endef + +define Package/emacs-ja-dic +$(call Package/emacs/Default) + TITLE+= (japanese input dictionary) + DEPENDS:=+emacs +endef + +define Package/emacs-ja-dic/description +$(call Package/emacs/Default/description) + This package contains the japanese dictionary used to input japanese Kanji + via Hiragana->Kanji conversion (\'set-input-method japanese\'). This + dictionary is huge, so huge that emacs won\'t be able to load it on systems + with 32MB or fewer RAM. +endef + +define Package/emacs-el +$(call Package/emacs/Default) + TITLE+= (lisp source) +endef + +define Package/emacs-el/description +$(call Package/emacs/Default/description) + This package contains the Lisp source files of Emacs that can queried via + C-h f in case provided documentation of an Emacs function is insufficient. +endef + +EMACS_STRIPTEASE_ARGS = \ + --without-x \ + --without-xpm \ + --without-jpeg \ + --without-gif \ + --without-png \ + --without-rsvg \ + --without-xft \ + --without-libotf \ + --without-dbus \ + --without-gconf + +HOST_CONFIGURE_ARGS += $(EMACS_STRIPTEASE_ARGS) +CONFIGURE_ARGS += $(EMACS_STRIPTEASE_ARGS) +MAKE_FLAGS += "LD=$(TARGET_CROSS)gcc" + +## Don't try that: lowering PURESIZE makes Emacs' RAM usage explode! Maybe +## something about Elisp garbage collection!? +#TARGET_CPPFLAGS += -DPURESIZE=16 + +## Keep emacs build system from doing all kinds nasty tricks that won't work +## (well) with openwrt and uclibc. Especially keep it from attempting to +## manually configure crt* startup file linking. We won't be able to 'dump' +## during cross-compile anyway. Dumping inside the target system seems not +## possible due to lack of RAM. Note that we also need to sanitize the +## Makefile using 'sed' below. +TARGET_CPPFLAGS += -DCANNOT_DUMP -DNO_REMAP -DORDINARY_LINK + +define Build/Prepare + $(call Build/Prepare/Default) +endef + +define Host/Configure + $(call Host/Configure/Default) +endef + +## On the host, we only compile and install minimum Emacs components used for +## bootstrapping +define Host/Compile + export LD_LIBRARY_PATH=$(STAGING_DIR_HOST)/lib; \ + $(call Host/Compile/Default) +endef + +define Host/Install + $(call Host/Install/Default) + $(INSTALL_BIN) $(HOST_BUILD_DIR)/lib-src/make-docfile $(STAGING_DIR_HOST)/bin/emacs-make-docfile + $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/prefix-args $(STAGING_DIR_HOST)/bin/emacs-prefix-args +endef + +define Build/Configure + $(call Build/Configure/Default) +endef + +define Build/Compile + $(call Build/Compile/Default, -C lib-src -o test-distrib) + ln -sf $(STAGING_DIR_HOST)/bin/emacs-make-docfile $(PKG_BUILD_DIR)/lib-src/make-docfile + ln -sf $(STAGING_DIR_HOST)/bin/emacs-prefix-args $(PKG_BUILD_DIR)/src/prefix-args + sed -ie 's;\(TEMACS_LDFLAGS\|STARTFILES\) =.*;\1 =;' $(PKG_BUILD_DIR)/src/Makefile +# sed -ie 's; /usr/lib/crt[^ ]\+; $(TOOLCHAIN_DIR)/usr/lib/crt;g' $(PKG_BUILD_DIR)/src/Makefile + sed -ie 's; /usr/lib/crt[^ ]\+; ;g' $(PKG_BUILD_DIR)/src/Makefile + sed -ie 's;\(#.*PATH_DUMPLOADSEARCH\).*$$$$;\1 PATH_LOADSEARCH;' $(PKG_BUILD_DIR)/src/epaths.h + $(call Build/Compile/Default, -C src -o lib-src -o prefix-args -o ../lib-src/make-docfile temacs ../etc/DOC) + cp -v $(PKG_BUILD_DIR)/src/temacs $(PKG_BUILD_DIR)/src/emacs + $(call Build/Compile/Default, -C lisp EMACS=$(STAGING_DIR_HOST)/bin/emacs) + $(call Build/Compile/Default, -C leim BUILT-EMACS=$(STAGING_DIR_HOST)/bin/emacs) +endef + +define Build/Install + sed -ie 's;./src/emacs\( --version\);$(STAGING_DIR_HOST)/bin/emacs \1;g' \ + $(PKG_BUILD_DIR)/Makefile + $(call Build/Install/Default,install-arch-indep install-arch-dep install-leim INSTALL_STRIP=-s "MFLAGS=-o test-distrib") + $(INSTALL_DATA) ./files/site-start.el $(PKG_INSTALL_DIR)/usr/share/emacs/$(PKG_VERSION)/site-lisp +endef + +define Package/emacs/install + $(INSTALL_DIR) $(1)/usr + cp -r $(PKG_INSTALL_DIR)/usr/{bin,lib} $(1)/usr +endef + +define Package/emacs-data/install + $(INSTALL_DIR) $(1)/ + (cd $(PKG_INSTALL_DIR)/ && \ + tar -cf - --exclude "*.el.gz" \ + --exclude "images" \ + --exclude "refcards" \ + --exclude "schema" \ + --exclude "NEWS*" \ + --exclude "ja-dic" \ + usr/share) \ + | (cd $(1)/ && tar -xvf -) +endef + +define Package/emacs-ja-dic/install + $(INSTALL_DIR) $(1)/usr + (cd $(PKG_INSTALL_DIR)/usr && tar -cf - \ + --exclude "*.el.gz" share/emacs/$(PKG_VERSION)/leim/ja-dic) \ + | (cd $(1)/usr && tar -xvf -) +endef + +define Package/emacs-el/install + $(INSTALL_DIR) $(1)/usr + (cd $(PKG_INSTALL_DIR)/usr && find share -name "*.el.gz" \ + | tar -cf - -T - --exclude "ja-dic" ) \ + | (cd $(1)/usr && tar -xvf -) +endef + + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,emacs)) +$(eval $(call BuildPackage,emacs-data)) +$(eval $(call BuildPackage,emacs-ja-dic)) +$(eval $(call BuildPackage,emacs-el)) + + +# The following comments configure the Emacs editor. Just ignore them. +# Local Variables: +# compile-command: "make -C ~/h/src/qi/openwrt-xburst package/emacs/compile -j2 V=99" +# End: diff --git a/emacs/files/site-start.el b/emacs/files/site-start.el new file mode 100644 index 0000000..e760ec8 --- /dev/null +++ b/emacs/files/site-start.el @@ -0,0 +1,27 @@ +;; Emacs startup file for OpenWRT Emacs package +;; +;; Copyright (C) 2010 David Kuehling <dvdkhlng TA gmx TOD de> +;; License: GPLv2 or later; NO WARRANTY. +;; + +;; load documentation for internal functions. This is skipped by loadup.el +;; when not dumping so we do it here. +(Snarf-documentation "DOC") + +;; On openwrt 'ls' is provided by busybox. That version of 'ls' does not +;; support the --dired option, make Emacs work around that. +(setq dired-use-ls-dired nil) + +;; Allow us to output international characters to the terminal +(set-terminal-coding-system 'utf-8) + +;; Do not show the menu bar. What use is it without a mouse? +;; (Note that you can still use the menu via <Esc> x menu-bar-open +;; or tmm-menubar +(menu-bar-mode 0) + +;; ugly work-around for load-history entry (require . t-mouse) added by +;; linux.el Not good, as it costs some memory. +(setq load-history + (apply 'nconc (mapcar (lambda (v) (if (stringp (car v)) (list v) nil)) + load-history))) diff --git a/emacs/patches/010-fix-init-env.patch b/emacs/patches/010-fix-init-env.patch new file mode 100644 index 0000000..a03a9c4 --- /dev/null +++ b/emacs/patches/010-fix-init-env.patch @@ -0,0 +1,15 @@ +Index: emacs23.2-openwrt-q/src/emacs.c +=================================================================== +--- emacs23.2-openwrt-q.orig/src/emacs.c 2010-12-18 20:24:35.000000000 +0100 ++++ emacs23.2-openwrt-q/src/emacs.c 2010-12-18 20:28:41.000000000 +0100 +@@ -1735,6 +1735,10 @@ + #endif /* HAVE_NTGUI */ + } + ++ /* syms_of_callproc() resets process-environment to nil; generating it again ++ * here, as workaround (probably only hits us since we're not dumping */ ++ set_initial_environment(); ++ + init_charset (); + + init_editfns (); /* init_process uses Voperating_system_release. */ diff --git a/emacs/patches/010-tune-loadup.patch b/emacs/patches/010-tune-loadup.patch new file mode 100644 index 0000000..0043c43 --- /dev/null +++ b/emacs/patches/010-tune-loadup.patch @@ -0,0 +1,31 @@ +Index: emacs23.2-openwrt-q/lisp/loadup.el +=================================================================== +--- emacs23.2-openwrt-q.orig/lisp/loadup.el 2010-12-18 20:22:56.000000000 +0100 ++++ emacs23.2-openwrt-q/lisp/loadup.el 2010-12-18 20:23:14.000000000 +0100 +@@ -47,6 +47,14 @@ + + ;;; Code: + ++;; This reduces memory usage by a few MB. So far no negative consequences ++;; have been witnessed. ++(setq inhibit-load-charset-map t) ++ ++;; Purify does in fact _safe_ memory (more efficient than normal' heap?) so ++;; do not disable it for now. ++;(setq purify-flag nil) ++ + ;; Add subdirectories to the load-path for files that might get + ;; autoloaded when bootstrapping. + (if (or (equal (nth 3 command-line-args) "bootstrap") +@@ -80,9 +88,10 @@ + (load "emacs-lisp/backquote") + (load "subr") + ++;; not doing garbage collection this often decreases start-up time by 5s + ;; Do it after subr, since both after-load-functions and add-hook are + ;; implemented in subr.el. +-(add-hook 'after-load-functions '(lambda (f) (garbage-collect))) ++;(add-hook 'after-load-functions '(lambda (f) (garbage-collect))) + + ;; We specify .el in case someone compiled version.el by mistake. + (load "version.el") diff --git a/fbida/Makefile b/fbida/Makefile new file mode 100644 index 0000000..c88a093 --- /dev/null +++ b/fbida/Makefile @@ -0,0 +1,57 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=fbida +PKG_VERSION:=2.07 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://dl.bytesex.org/releases/fbida/ +PKG_MD5SUM:=3e05910fb7c1d9b2bd3e272d96db069c + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/fbida + SUBMENU:=fbida + SECTION:=utils + CATEGORY:=Utilities + URL:=http://linux.bytesex.org/fbida/ + DEPENDS:=+libpng +libtiff +libexif +libiconv +dejavu-fonts-ttf +endef + +define Package/fbida/description + The fbida project contains a few applications for viewing and editing images +endef + +define Package/fbi + $(call Package/fbida) + TITLE:=This is a image viewer for the linux framebuffer console. +endef + +define Package/fbgs + $(call Package/fbida) + TITLE:=A wrapper script for viewing ps/pdf files on the framebuffer console using fbi. + DEPENDS:=+fbi +ghostscript +endef + +TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include +TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + + +define Package/fbi/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/{fbi,exiftran} $(1)/usr/bin/ +endef + +define Package/fbgs/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fbgs $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,fbi)) +$(eval $(call BuildPackage,fbgs)) diff --git a/fbida/patches/001-sys_siglist.patch b/fbida/patches/001-sys_siglist.patch new file mode 100644 index 0000000..7c0c337 --- /dev/null +++ b/fbida/patches/001-sys_siglist.patch @@ -0,0 +1,10 @@ +--- fbida-2.07.orig/fbtools.c 2008-10-11 12:49:38.676243745 +0200 ++++ fbida-2.07/fbtools.c 2008-10-11 12:50:08.286262765 +0200 +@@ -519,6 +519,6 @@ + + /* cleanup */ + fb_cleanup(); +- fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]); ++ fprintf(stderr,"Oops: %s\n",strsignal(termsig)); + exit(42); + } diff --git a/fbida/patches/002-fontsize.patch b/fbida/patches/002-fontsize.patch new file mode 100644 index 0000000..1e5f404 --- /dev/null +++ b/fbida/patches/002-fontsize.patch @@ -0,0 +1,21 @@ +diff -ur fbida-2.07_orig/fbi.c fbida-2.07/fbi.c +--- fbida-2.07_orig/fbi.c 2008-06-09 18:53:33.000000000 +0400 ++++ fbida-2.07/fbi.c 2010-10-18 22:22:33.166338378 +0400 +@@ -548,7 +548,7 @@ + L" L - rotate counter-clockwise", + }; + +- shadow_draw_text_box(face, 24, 16, transparency, ++ shadow_draw_text_box(face, 0, 0, transparency, + help, ARRAY_SIZE(help)); + shadow_render(); + } +@@ -1465,7 +1465,7 @@ + + font_init(); + if (NULL == fontname) +- fontname = "monospace:size=16"; ++ fontname = "monospace:size=10"; + face = font_open(fontname); + if (NULL == face) { + fprintf(stderr,"can't open font: %s\n",fontname); diff --git a/fbida/patches/003-fbgs.patch b/fbida/patches/003-fbgs.patch new file mode 100644 index 0000000..b06e084 --- /dev/null +++ b/fbida/patches/003-fbgs.patch @@ -0,0 +1,36 @@ +--- fbida-2.07.orig/fbgs 2010-10-18 20:26:32.264246468 +0400 ++++ fbida-2.07/fbgs 2010-10-18 20:56:04.670332976 +0400 +@@ -1,7 +1,7 @@ +-#!/bin/bash ++#!/bin/sh + + # tmp dir +-DIR="$(mktemp -dtp ${TMPDIR-/var/tmp} fbgs-XXXXXX)" ++DIR="$(mktemp -dtp ${TMPDIR-/tmp} fbgs-XXXXXX)" + test -d "$DIR" || exit 1 + trap "rm -rf $DIR" EXIT + +@@ -33,7 +33,22 @@ + -p) password="$2" + shift; shift + ;; +- -h) echo fixme: help text ++ -h) echo " ++fbgs - poor man's PostScript/pdf viewer for the linux framebuffer con- ++sole ++ ++fbgs [ options ] file ++ ++fbgs is a simple wrapper script which takes a PostScript or pdf file as ++input, renders the pages using ghostscript into a temporary directory ++and finally calls fbi to display them. ++ ++fbps understands all fbi options (they are passed through). Addition- ++ally you can specify -l, -xl or -xxl to get the pages rendered with ++100, 120 or 150 dpi (default is 75). You can use option -p <password> ++if your PDF file requires password. With -c you can ask fbgs to render ++the pages in color. ++" + exit 1 + ;; + -c) device="png16m" diff --git a/fbsize/Makefile b/fbsize/Makefile index c98ce96..5b8bb8e 100644 --- a/fbsize/Makefile +++ b/fbsize/Makefile @@ -1,5 +1,3 @@ -# -# kyak@freenode/#qi-hardware # # This is free software, licensed under the GNU General Public License v2. # diff --git a/fbterm/Makefile b/fbterm/Makefile index e6f8f3e..6b66ebf 100644 --- a/fbterm/Makefile +++ b/fbterm/Makefile @@ -1,5 +1,3 @@ -# -# kyak@freenode/#qi-hardware # # This is free software, licensed under the GNU General Public License v2. # @@ -22,7 +20,7 @@ define Package/fbterm TITLE:=FbTerm, a fast FrameBuffer based TERMinal emulator for linux URL:=http://code.google.com/p/fbterm/ SUBMENU:=Terminal - DEPENDS:=+libiconv +fontconfig +unifont + DEPENDS:=+libiconv +fontconfig +unifont +libstdcpp endef define Package/fbterm/description diff --git a/fbterm/patches/001-invalid-conservion.patch b/fbterm/patches/001-invalid-conservion.patch deleted file mode 100644 index e906455..0000000 --- a/fbterm/patches/001-invalid-conservion.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- fbterm-1.6/src/lib/io.cpp_orig 2010-06-19 19:00:18.037920330 +0400 -+++ fbterm-1.6/src/lib/io.cpp 2010-06-19 19:01:02.622595041 +0400 -@@ -188,7 +188,8 @@ - s8 outbuf[outlen]; - - size_t nconv, left, total = len; -- s8 *outptr, *inptr = buf; -+ s8 *outptr = buf; -+ const char *inptr = buf; - - while (total) { - outptr = outbuf; diff --git a/fn-handle/Makefile b/fn-handle/Makefile deleted file mode 100644 index 2611f01..0000000 --- a/fn-handle/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=fn-handle -PKG_VERSION:=20100316 -PKG_REV:=acacde7b404a544d214f4ee01231bf0193a7155d -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=git://projects.qi-hardware.com/fn-handle.git -PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) - -include $(INCLUDE_DIR)/package.mk - -define Package/fn-handle - SECTION:=utils - CATEGORY:=Utilities - TITLE:=Ben NanoNote PowerOff Daemon - URL:=http://projects.qi-hardware.com/index.php/f/fn-handle/ -endef - -define Build/Configure -endef - -define Package/fn-handle/install - $(INSTALL_DIR) \ - $(1)/etc/init.d \ - $(1)/usr/bin - - $(INSTALL_BIN) \ - $(PKG_BUILD_DIR)/fnkeys \ - $(1)/usr/bin/ - - $(INSTALL_BIN) \ - ./files/$(PKG_NAME).init \ - $(1)/etc/init.d/$(PKG_NAME) -endef - -$(eval $(call BuildPackage,fn-handle)) diff --git a/fn-handle/files/fn-handle.init b/fn-handle/files/fn-handle.init deleted file mode 100755 index 174a76c..0000000 --- a/fn-handle/files/fn-handle.init +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2008 OpenWrt.org -START=40 - -DEVICE_PW="/dev/input/event0" - -start() { - fnkeys $DEVICE_PW & -} - -stop() { - killall fnkeys -} diff --git a/gcal/Makefile b/gcal/Makefile index 35b70ae..d9cad01 100644 --- a/gcal/Makefile +++ b/gcal/Makefile @@ -3,14 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gcal -PKG_VERSION:=3.01 +PKG_VERSION:=3.6 PKG_RELEASE:=1 -#http://www.gnu.org/software/gcal/ -#ftp://ftp.gnu.org/pub/gnu/gcal/gcal-3.01.tar.gz PKG_SOURCE:=gcal-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.gnu.org/pub/gnu/gcal/ -PKG_MD5SUM:=65f3394653829fd77f6862045112ad4f +PKG_MD5SUM:=9c3819ca118d6e3adb6a716858cba7d6 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/gcal/patches/spawn.in.h.patch b/gcal/patches/spawn.in.h.patch new file mode 100644 index 0000000..e9b3042 --- /dev/null +++ b/gcal/patches/spawn.in.h.patch @@ -0,0 +1,16 @@ +--- gcal-3.6/lib/spawn.in.h 2010-03-22 13:31:49.000000000 +0100 ++++ gcal-3.6a/lib/spawn.in.h 2010-10-30 16:57:51.000000000 +0200 +@@ -24,6 +24,11 @@ + /* The include_next requires a split double-inclusion guard. */ + #if @HAVE_SPAWN_H@ + # @INCLUDE_NEXT@ @NEXT_SPAWN_H@ ++#else ++/* At least the sched.h and the signal.h are required ++ from gcal or glibc */ ++#include <sched.h> ++#include <signal.h> + #endif + + #ifndef _GL_SPAWN_H + + diff --git a/gcc-mips/Makefile b/gcc-mips/Makefile new file mode 100644 index 0000000..d2c2d35 --- /dev/null +++ b/gcc-mips/Makefile @@ -0,0 +1,94 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk +PKG_NAME:=gcc +#PKG_VERSION:=$(strip $(subst ",, $(CONFIG_GCC_VERSION)))#")) +PKG_VERSION:=4.3.3 +PKG_RELEASE:=1 +PATCH_DIR=$(TOPDIR)/toolchain/gcc/patches/$(PKG_VERSION) +PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(PKG_VERSION) \ + http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(PKG_VERSION) \ + ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(PKG_VERSION) + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_MD5SUM:=354853e0b2da90c527e35aabb8d6f1e6 +PKG_INSTALL:=1 +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk + +SEP:=, +TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)" +EXTRA_TARGET=$(if $(CONFIG_EXTRA_TARGET_ARCH),--enable-biarch --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-uclibc) + +STRIP:=$(STAGING_DIR_HOST)/bin/sstrip +RSTRIP:= \ + NM="$(TARGET_CROSS)nm" \ + STRIP="$(STRIP)" \ + STRIP_KMOD="$(TARGET_CROSS)strip --strip-debug" \ + $(SCRIPT_DIR)/rstrip.sh + +define Package/gcc-mips + SECTION:=devel + CATEGORY:=Development + TITLE:=gcc-mips + DEPENDS:=+mpfr +binutils +endef + +define Package/gcc-mips/description + build a native toolchain for compiling on target +endef + +define Build/Prepare + $(call Build/Prepare/Default) + ($(CP) ./patches $(PKG_BUILD_DIR); cd $(PKG_BUILD_DIR); patch -Np1 < ./patches/001-cache-amnesia.patch;); + $(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(PKG_BUILD_DIR)/gcc/version.c + $(SED) 's,\(bug_report_url.. = "\).*\(";\),\1<URL:https://dev.openwrt.org/>\2,' $(PKG_BUILD_DIR)/gcc/version.c + (cd $(PKG_BUILD_DIR)/libstdc++-v3; autoconf;); + $(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(PKG_BUILD_DIR)/libstdc++-v3/configure +endef + +define Build/Configure + (cd $(PKG_BUILD_DIR); rm -f config.cache; \ + SHELL="$(BASH)" \ + $(TARGET_CONFIGURE_OPTS) \ + $(PKG_BUILD_DIR)/configure \ + $(TARGET_CONFIGURE_ARGS) \ + --build=$(GNU_HOST_NAME) \ + --host=$(REAL_GNU_TARGET_NAME) \ + --target=$(REAL_GNU_TARGET_NAME) \ + --enable-languages=$(TARGET_LANGUAGES) \ + --enable-shared \ + --disable-__cxa_atexit \ + --enable-target-optspace \ + --with-gnu-ld \ + --disable-nls \ + --disable-libmudflap \ + --disable-multilib \ + --with-gmp=$(STAGING_DIR)/usr \ + --with-mpfr=$(STAGING_DIR)/usr \ + --prefix=/usr \ + $(EXTRA_TARGET) \ + $(SOFT_FLOAT_CONFIG_OPTION) \ + $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \ + ); +endef + +define Build/Compile + export SHELL="$(BASH)"; $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE_ARGS) all install +endef + +define Package/gcc-mips/install + $(INSTALL_DIR) $(1)/usr + cp -r $(PKG_INSTALL_DIR)/usr/{bin,include,lib,libexec} $(1)/usr + cp -rf $(TOOLCHAIN_DIR)/usr/include/* $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)/include + cp -rf $(TOOLCHAIN_DIR)/usr/lib/*.{a,la,o} $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) + cp -rf $(TOOLCHAIN_DIR)/lib/* $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) +endef + +$(eval $(call BuildPackage,gcc-mips)) diff --git a/gcc-mips/patches/001-cache-amnesia.patch b/gcc-mips/patches/001-cache-amnesia.patch new file mode 100644 index 0000000..6dab5df --- /dev/null +++ b/gcc-mips/patches/001-cache-amnesia.patch @@ -0,0 +1,13 @@ +diff --git a/gcc/configure b/gcc/configure +index f7d4161..7f11021 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -12972,7 +12972,7 @@ else + esac + saved_CFLAGS="${CFLAGS}" + CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ +- ${realsrcdir}/configure \ ++ CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \ + --enable-languages=${enable_languages-all} \ + --target=$target_alias --host=$build_alias --build=$build_alias + CFLAGS="${saved_CFLAGS}" diff --git a/gforth/Makefile b/gforth/Makefile index aeb0b74..9e3e474 100644 --- a/gforth/Makefile +++ b/gforth/Makefile @@ -18,7 +18,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gforth PKG_SNAPSHOT_DATE=20100918 PKG_VERSION=0.7.0-$(PKG_SNAPSHOT_DATE) -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_BUILD_DEPENDS:= gforth/host libltdl/host libtool/host libffi PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -30,7 +30,6 @@ PKG_SOURCE_URL:=\ http://mosquito.dyndns.tv/~spock/ #PKG_SOURCE_URL:= file://~/forth/gforth/ PKG_MD5SUM:=5ada9cc3f72fea8ea002bbae4b39d118 -#f912b58c2434a9e1df7d4f8db75636da # Alternate download #1 via CVS: this doesn't work, as CVS is missing the # kernel.fi images needed for boot-strapping :( @@ -277,7 +276,7 @@ define Package/gforth/install # install the correct Gforth kernel image echo "$(INSTALL_DATA) $(PKG_BUILD_DIR)/@kernel_fi@ $(1)/$(GFORTH_SHARE_DIR)/" > $(PKG_BUILD_DIR)/install-kernel.sh.in - $(PKG_BUILD_DIR)/config.status --file $(PKG_BUILD_DIR)/install-kernel.sh + cd $(PKG_BUILD_DIR) && ./config.status --file install-kernel.sh . $(PKG_BUILD_DIR)/install-kernel.sh # install updating script and wrap gforth interpreter binaries so that @@ -299,9 +298,12 @@ define Package/gforth/install # install pre-generated C-interface wrappers (libcc) -for i in $(LIBCC_BUILD_SRC); do \ - libtool --mode=install $(INSTALL_BIN) \ + which libtool; \ + ls -l $(PKG_BUILD_LIBCC_DIR)/.libs; \ + libtool --mode=install $(INSTALL_DATA) \ $(PKG_BUILD_LIBCC_DIR)/`basename $$$$i .fs`.la \ $(1)/$(GFORTH_LIBCC_DIR)/; \ + ls -l $(1)/$(GFORTH_LIBCC_DIR)/; \ done # -libtool --finish $(1)/$(GFORTH_LIBCC_DIR) -rm -f $(1)/$(GFORTH_LIBCC_DIR)/*.a @@ -311,12 +313,17 @@ endef ## installed source code. define Package/gforth/postinst #! /bin/sh -$(GFORTH_BIN_DIR)/gforth-update-image +if [ -z "$$IPKG_OFFLINE_ROOT" ]; then + # only attempt to update image on target, never on host + $(GFORTH_BIN_DIR)/gforth-update-image +fi endef define Package/gforth/prerm #! /bin/sh -rm -f $(GFORTH_LIB_DIR)/gforth.fi +if [ -z "$$IPKG_OFFLINE_ROOT" ]; then + rm -f $(GFORTH_LIB_DIR)/gforth.fi +fi endef $(eval $(call HostBuild)) diff --git a/gmenu2x/Makefile b/gmenu2x/Makefile index cc63502..cebbf48 100644 --- a/gmenu2x/Makefile +++ b/gmenu2x/Makefile @@ -8,9 +8,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gmenu2x -PKG_VERSION:=20100905 -PKG_REV:=0775638dbcbc491d98df3c8932a933d1be2790d6 +PKG_VERSION:=20101122 +PKG_REV:=6773ad7d3a82c349a9edc9881e7c7330b09a931c PKG_RELEASE:=1 +PKG_INSTALL:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=git://projects.qi-hardware.com/gmenu2x.git @@ -18,8 +19,6 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_INSTALL:=1 - PKG_BUILD_DEPENDS:=sparsehash include $(INCLUDE_DIR)/package.mk @@ -34,10 +33,8 @@ TARGET_CPPFLAGS+= \ -I$(STAGING_DIR)/usr/include/SDL \ -I$(STAGING_DIR)/usr/include/google/sparsehash \ -I$(PKG_BUILD_DIR)/src/tinyxml \ + -DLOG_LEVEL=0 -# -I$(STAGING_DIR)/usr/lib/libintl/include \ -# -I$(STAGING_DIR)/usr/libiconv/include -# TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -L$(STAGING_DIR)/usr/lib/SDL \ @@ -66,7 +63,7 @@ define Package/gmenu2x/install $(1)/usr/share/gmenu2x/ $(INSTALL_BIN) \ - $(PKG_BUILD_DIR)/gmenu2x.sh \ + ./files/nanonote/bin/gmenu2x \ $(1)/usr/bin/gmenu2x $(CP) \ @@ -74,11 +71,15 @@ define Package/gmenu2x/install $(1)/usr/share/gmenu2x/ $(CP) \ - ./files/input.conf \ - $(1)/usr/share/gmenu2x/ + $(PKG_BUILD_DIR)/input.conf.nanonote \ + $(1)/usr/share/gmenu2x/input.conf rm -rf \ $(1)/usr/share/gmenu2x/sections/{emulators,games} + + $(CP) \ + ./files/nanonote/gmenu2x/* \ + $(1)/usr/share/gmenu2x/ endef $(eval $(call BuildPackage,gmenu2x)) diff --git a/gmenu2x/files/input.conf b/gmenu2x/files/input.conf deleted file mode 100755 index 52b9408..0000000 --- a/gmenu2x/files/input.conf +++ /dev/null @@ -1,12 +0,0 @@ -a=keyboard,104 #NanoNote H -b=keyboard,13 #NanoNote Enter -x=keyboard,120 #NanoNote X -y=keyboard,121 #NanoNote Y -l=keyboard,108 #NanoNote L -r=keyboard,9 #NanoNote Tab -select=keyboard,283 #Nanonote F2 -start=keyboard,115 #NanoNote S -up=keyboard,273 -down=keyboard,274 -left=keyboard,276 -right=keyboard,275 diff --git a/gmenu2x/files/nanonote/bin/gmenu2x b/gmenu2x/files/nanonote/bin/gmenu2x new file mode 100755 index 0000000..a3cebef --- /dev/null +++ b/gmenu2x/files/nanonote/bin/gmenu2x @@ -0,0 +1,9 @@ +#!/bin/sh + +source /etc/profile + +setfont2 /usr/share/setfont2/un-fuzzy-6x10-font.pnm +clear + +cd /usr/share/gmenu2x +./gmenu2x diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/abook b/gmenu2x/files/nanonote/gmenu2x/sections/applications/abook new file mode 100644 index 0000000..7f7461b --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/abook @@ -0,0 +1,3 @@ +title=abook +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/abook diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/aewan b/gmenu2x/files/nanonote/gmenu2x/sections/applications/aewan new file mode 100644 index 0000000..e85e757 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/aewan @@ -0,0 +1,3 @@ +title=aewan +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/aewan diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/alsamixer b/gmenu2x/files/nanonote/gmenu2x/sections/applications/alsamixer new file mode 100644 index 0000000..40bd82a --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/alsamixer @@ -0,0 +1,4 @@ +title=alsamixer +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/alsamixer +params=-Vall diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/bc b/gmenu2x/files/nanonote/gmenu2x/sections/applications/bc new file mode 100644 index 0000000..fa701cd --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/bc @@ -0,0 +1,3 @@ +title=bc +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/bc diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/calcurse b/gmenu2x/files/nanonote/gmenu2x/sections/applications/calcurse new file mode 100644 index 0000000..9c7085b --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/calcurse @@ -0,0 +1,3 @@ +title=calcurse +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/calcurse diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/centerim b/gmenu2x/files/nanonote/gmenu2x/sections/applications/centerim new file mode 100644 index 0000000..1e5f32d --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/centerim @@ -0,0 +1,3 @@ +title=centerim +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/centerim diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/ctronome b/gmenu2x/files/nanonote/gmenu2x/sections/applications/ctronome new file mode 100644 index 0000000..629f1d1 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/ctronome @@ -0,0 +1,3 @@ +title=ctronome +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/ctronome diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/dgclock b/gmenu2x/files/nanonote/gmenu2x/sections/applications/dgclock new file mode 100644 index 0000000..85216e9 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/dgclock @@ -0,0 +1,4 @@ +title=DGClock +icon=skin:icons/dgclock.png +exec=/usr/bin/dgclock +wrapper=true diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/elinks b/gmenu2x/files/nanonote/gmenu2x/sections/applications/elinks new file mode 100644 index 0000000..34672e5 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/elinks @@ -0,0 +1,3 @@ +title=elinks +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/elinks diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/emacs b/gmenu2x/files/nanonote/gmenu2x/sections/applications/emacs new file mode 100644 index 0000000..38087e4 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/emacs @@ -0,0 +1,3 @@ +title=emacs +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/emacs diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/gmu b/gmenu2x/files/nanonote/gmenu2x/sections/applications/gmu new file mode 100644 index 0000000..0086a18 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/gmu @@ -0,0 +1,3 @@ +title=GMU +icon=skin:icons/gmu.png +exec=/usr/bin/gmu diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/guile b/gmenu2x/files/nanonote/gmenu2x/sections/applications/guile new file mode 100644 index 0000000..f2a1a9f --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/guile @@ -0,0 +1,3 @@ +title=guile +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/guile diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/htop b/gmenu2x/files/nanonote/gmenu2x/sections/applications/htop new file mode 100644 index 0000000..c644dc9 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/htop @@ -0,0 +1,3 @@ +title=htop +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/htop diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/ikog b/gmenu2x/files/nanonote/gmenu2x/sections/applications/ikog new file mode 100644 index 0000000..3a15fd5 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/ikog @@ -0,0 +1,3 @@ +title=ikog.py +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/ikog.py diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/joe b/gmenu2x/files/nanonote/gmenu2x/sections/applications/joe new file mode 100644 index 0000000..8c94e74 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/joe @@ -0,0 +1,3 @@ +title=joe +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/joe diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/lynx b/gmenu2x/files/nanonote/gmenu2x/sections/applications/lynx new file mode 100644 index 0000000..2afd7cb --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/lynx @@ -0,0 +1,4 @@ +title=lynx +icon=skin:icons/utilities-terminal.png +exec=/bin/sh +params=--login -c /usr/bin/lynx diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/mathomatic b/gmenu2x/files/nanonote/gmenu2x/sections/applications/mathomatic new file mode 100644 index 0000000..badcd66 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/mathomatic @@ -0,0 +1,3 @@ +title=mathomatic +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/mathomatic diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/mc b/gmenu2x/files/nanonote/gmenu2x/sections/applications/mc new file mode 100644 index 0000000..de4aa81 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/mc @@ -0,0 +1,3 @@ +title=mc +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/mc diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/mcabber b/gmenu2x/files/nanonote/gmenu2x/sections/applications/mcabber new file mode 100644 index 0000000..64ed599 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/mcabber @@ -0,0 +1,3 @@ +title=mcabber +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/mcabber diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/minicom b/gmenu2x/files/nanonote/gmenu2x/sections/applications/minicom new file mode 100644 index 0000000..73a3727 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/minicom @@ -0,0 +1,3 @@ +title=minicom +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/minicom diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/mutt b/gmenu2x/files/nanonote/gmenu2x/sections/applications/mutt new file mode 100644 index 0000000..b1741a5 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/mutt @@ -0,0 +1,3 @@ +title=mutt +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/mutt diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/nanomap b/gmenu2x/files/nanonote/gmenu2x/sections/applications/nanomap new file mode 100644 index 0000000..3e0d436 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/nanomap @@ -0,0 +1,4 @@ +title=NanoMap +icon=skin:icons/nanomap.png +exec=/usr/bin/NanoMap +params=-qws diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/netsurf b/gmenu2x/files/nanonote/gmenu2x/sections/applications/netsurf new file mode 100644 index 0000000..bd89c18 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/netsurf @@ -0,0 +1,3 @@ +title=netsurf +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/netsurf@BROKEN #don't know how to exit diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/nightsky b/gmenu2x/files/nanonote/gmenu2x/sections/applications/nightsky new file mode 100644 index 0000000..f90eb01 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/nightsky @@ -0,0 +1,3 @@ +title=nightsky +icon=skin:icons/nightsky.png +exec=/usr/bin/nightsky diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/powertop b/gmenu2x/files/nanonote/gmenu2x/sections/applications/powertop new file mode 100644 index 0000000..34c5e04 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/powertop @@ -0,0 +1,3 @@ +title=powertop +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/powertop diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/qc b/gmenu2x/files/nanonote/gmenu2x/sections/applications/qc new file mode 100644 index 0000000..e0d513d --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/qc @@ -0,0 +1,3 @@ +title=qc +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/qc diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/sc b/gmenu2x/files/nanonote/gmenu2x/sections/applications/sc new file mode 100644 index 0000000..c599198 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/sc @@ -0,0 +1,3 @@ +title=sc +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/sc diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/sdcv b/gmenu2x/files/nanonote/gmenu2x/sections/applications/sdcv new file mode 100644 index 0000000..8a3353d --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/sdcv @@ -0,0 +1,4 @@ +title=sdcv +icon=skin:icons/stardict.png +exec=/usr/bin/sdcv +params=--utf8-output
\ No newline at end of file diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/snownews b/gmenu2x/files/nanonote/gmenu2x/sections/applications/snownews new file mode 100644 index 0000000..6859ad9 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/snownews @@ -0,0 +1,3 @@ +title=snownews +icon=skin:icons/leaf_red.png +exec=/usr/bin/snownews diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/stardict b/gmenu2x/files/nanonote/gmenu2x/sections/applications/stardict new file mode 100644 index 0000000..2480776 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/stardict @@ -0,0 +1,3 @@ +title=StarDict +icon=skin:icons/stardict.png +exec=/usr/bin/stardict diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/tunec b/gmenu2x/files/nanonote/gmenu2x/sections/applications/tunec new file mode 100644 index 0000000..24046b6 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/tunec @@ -0,0 +1,3 @@ +title=tunec +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/tunec diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/vim b/gmenu2x/files/nanonote/gmenu2x/sections/applications/vim new file mode 100644 index 0000000..df6e6ef --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/vim @@ -0,0 +1,3 @@ +title=vim +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/vim diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/w3m b/gmenu2x/files/nanonote/gmenu2x/sections/applications/w3m new file mode 100644 index 0000000..895042a --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/w3m @@ -0,0 +1,4 @@ +title=w3m +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/w3m +params=http://en.qi-hardware.com/wiki/Main_Page diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/games/backgammon b/gmenu2x/files/nanonote/gmenu2x/sections/games/backgammon new file mode 100644 index 0000000..cd0393c --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/games/backgammon @@ -0,0 +1,3 @@ +title=backgammon +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/backgammon diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/games/gnuchess b/gmenu2x/files/nanonote/gmenu2x/sections/games/gnuchess new file mode 100644 index 0000000..9416959 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/games/gnuchess @@ -0,0 +1,3 @@ +title=gnuchess +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/gnuchess diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/games/tetris b/gmenu2x/files/nanonote/gmenu2x/sections/games/tetris new file mode 100644 index 0000000..bdee94c --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/games/tetris @@ -0,0 +1,3 @@ +title=tetris +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/tetris diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/games/worm b/gmenu2x/files/nanonote/gmenu2x/sections/games/worm new file mode 100644 index 0000000..3056409 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/games/worm @@ -0,0 +1,3 @@ +title=worm +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/worm diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/terminals/ash b/gmenu2x/files/nanonote/gmenu2x/sections/terminals/ash new file mode 100644 index 0000000..0d2df89 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/terminals/ash @@ -0,0 +1,4 @@ +title=ash(Default) +icon=skin:icons/utilities-terminal.png +exec=/bin/ash +params=--login diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/terminals/bash b/gmenu2x/files/nanonote/gmenu2x/sections/terminals/bash new file mode 100644 index 0000000..899a346 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/terminals/bash @@ -0,0 +1,4 @@ +title=bash +icon=skin:icons/utilities-terminal.png +exec=/bin/bash +params=--login diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/terminals/byobu b/gmenu2x/files/nanonote/gmenu2x/sections/terminals/byobu new file mode 100644 index 0000000..c6dc1e1 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/terminals/byobu @@ -0,0 +1,3 @@ +title=byobu +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/byobu diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/terminals/fbterm b/gmenu2x/files/nanonote/gmenu2x/sections/terminals/fbterm new file mode 100644 index 0000000..34d7b38 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/terminals/fbterm @@ -0,0 +1,3 @@ +title=fbterm +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/fbterm diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/terminals/jfbterm b/gmenu2x/files/nanonote/gmenu2x/sections/terminals/jfbterm new file mode 100644 index 0000000..77c3638 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/terminals/jfbterm @@ -0,0 +1,3 @@ +title=jfbterm +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/jfbterm diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/terminals/nanoterm b/gmenu2x/files/nanonote/gmenu2x/sections/terminals/nanoterm new file mode 100644 index 0000000..80f9347 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/sections/terminals/nanoterm @@ -0,0 +1,3 @@ +title=nanoterm +icon=skin:icons/utilities-terminal.png +exec=/usr/bin/nanoterm diff --git a/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/dgclock.png b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/dgclock.png Binary files differnew file mode 100644 index 0000000..cb0ce42 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/dgclock.png diff --git a/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/duck.png b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/duck.png Binary files differnew file mode 100644 index 0000000..8cf2dbe --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/duck.png diff --git a/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/gmu.png b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/gmu.png Binary files differnew file mode 100644 index 0000000..0128ceb --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/gmu.png diff --git a/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/leaf_red.png b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/leaf_red.png Binary files differnew file mode 100644 index 0000000..803e52f --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/leaf_red.png diff --git a/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/nanomap.png b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/nanomap.png Binary files differnew file mode 100644 index 0000000..c881a08 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/nanomap.png diff --git a/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/nightsky.png b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/nightsky.png Binary files differnew file mode 100644 index 0000000..a47e374 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/nightsky.png diff --git a/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/stardict.png b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/stardict.png Binary files differnew file mode 100644 index 0000000..e7969bc --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/stardict.png diff --git a/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/utilities-terminal.png b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/utilities-terminal.png Binary files differnew file mode 100644 index 0000000..195751e --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/utilities-terminal.png diff --git a/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/vido.png b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/vido.png Binary files differnew file mode 100644 index 0000000..08d1620 --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/skins/Default/icons/vido.png diff --git a/gmenu2x/files/nanonote/gmenu2x/skins/Default/sections/terminal.png b/gmenu2x/files/nanonote/gmenu2x/skins/Default/sections/terminal.png new file mode 120000 index 0000000..ce4b64d --- /dev/null +++ b/gmenu2x/files/nanonote/gmenu2x/skins/Default/sections/terminal.png @@ -0,0 +1 @@ +../icons/utilities-terminal.png
\ No newline at end of file diff --git a/gnuchess/Makefile b/gnuchess/Makefile index 1a221b4..86a60eb 100644 --- a/gnuchess/Makefile +++ b/gnuchess/Makefile @@ -33,8 +33,8 @@ define Build/Configure endef define Package/gnuchess/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/gnuchess $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/gnuchess $(1)/usr/bin/ endef $(eval $(call BuildPackage,gnuchess)) diff --git a/gs/Makefile b/gs/Makefile new file mode 100644 index 0000000..a5cfe76 --- /dev/null +++ b/gs/Makefile @@ -0,0 +1,69 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=ghostscript +PKG_VERSION:=9.00 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://ghostscript.com/releases/ +PKG_MD5SUM:=a402462478b4cdda3e1816899227b845 + +include $(INCLUDE_DIR)/package.mk + +define Package/ghostscript + SECTION:=utils + CATEGORY:=Utilities + TITLE:=interpreter for the PostScript language and for PDF + URL:=http://pages.cs.wisc.edu/~ghost/ + DEPENDS:=+libtiff +libiconv +libpng +fontconfig +libfreetype +endef + +define Package/ghostscript/description + Ghostscript is an interpreter for the PostScript language and for PDF +endef + +define Build/Prepare + $(call Build/Prepare/Default) + mkdir $(PKG_BUILD_DIR)/obj + #(cd $(PKG_BUILD_DIR); ./configure;); + #make -C $(PKG_BUILD_DIR) obj/arch.h obj/genconf obj/echogs + for i in genarch genconf echogs; do \ + gcc -O2 -Wall -Wstrict-prototypes -Wundef -Wmissing-declarations -Wmissing-prototypes -Wwrite-strings -Wno-strict-aliasing -Wdeclaration-after-statement -fno-builtin -fno-common -DHAVE_STDINT_H -DGX_COLOR_INDEX_TYPE="unsigned long long" -I$(PKG_BUILD_DIR)/base -o $(PKG_BUILD_DIR)/obj/$$$$i $(PKG_BUILD_DIR)/base/$$$$i.c; \ + done +endef + +TARGET_CFLAGS+= \ + -I$(STAGING_DIR)/usr/lib/libiconv/include \ + +TARGET_LDFLAGS+= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + -L$(STAGING_DIR)/usr/lib/libiconv/lib + +CONFIGURE_ARGS += \ + --with-system-libtiff \ + --with-libiconv=gnu \ + --without-x \ + --without-jbig2dec \ + --without-jasper + +MAKE_FLAGS += \ + EXTRALIBS="-L$(STAGING_DIR)/usr/lib/libiconv/lib -L$(STAGING_DIR)/usr/lib -lfontconfig -lfreetype -liconv -ldl -Wl,-rpath-link=$(STAGING_DIR)/usr/lib" \ + COMPILE_INITS="0" + +define Package/ghostscript/install + $(INSTALL_DIR) \ + $(1)/usr/bin $(1)/usr/share/$(PKG_NAME)/$(PKG_VERSION) + + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/bin/gs \ + $(1)/usr/bin/gs + + $(CP) $(PKG_BUILD_DIR)/{Resource,lib,iccprofiles} \ + $(1)/usr/share/$(PKG_NAME)/$(PKG_VERSION)/ +endef + +$(eval $(call BuildPackage,ghostscript)) diff --git a/ikog/Makefile b/ikog/Makefile new file mode 100644 index 0000000..41760e3 --- /dev/null +++ b/ikog/Makefile @@ -0,0 +1,37 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=ikog +PKG_VERSION:=1.90 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/ikog + TITLE:=ikog + SECTION:=utils + CATEGORY:=Utilities + DEPNEDS:=python +endef + +define Package/ikog/description + the simple todo list +endef + +define Build/Prepare + ( \ + mkdir $(PKG_BUILD_DIR); \ + cd $(PKG_BUILD_DIR); \ + wget http://www.henspace.co.uk/ikog/app/$(PKG_NAME).py.gz; \ + gzip -d $(PKG_NAME).py.gz; \ + ) +endef + +define Build/Compile +endef + +define Package/ikog/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ikog.py $(1)/usr/bin +endef + +$(eval $(call BuildPackage,ikog))
\ No newline at end of file diff --git a/imgv/Makefile b/imgv/Makefile index d9a072a..a50836e 100644 --- a/imgv/Makefile +++ b/imgv/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=imgv -PKG_VERSION:=0.2.1 -PKG_REV:=8ebb97009538d637f8860192c505b67011b2e781 -PKG_RELEASE:=1 +PKG_VERSION:=0.3.0 +PKG_REV:=933f92b86b355e482ea41d89f72982e8b0bf4475 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=git://projects.qi-hardware.com/imgv.git @@ -24,7 +24,7 @@ define Package/imgv SECTION:=utils CATEGORY:=Utilities TITLE:=SDL-based image viewer - DEPENDS:=+libsdl +libsdl-gfx +libsdl-image +directfb + DEPENDS:=+libsdl +libsdl-gfx +libsdl-image +libsdl-ttf +directfb +libfreetype URL:=http://projects.qi-hardware.com/index.php/p/imgv/ endef diff --git a/jbofihe/Makefile b/jbofihe/Makefile new file mode 100644 index 0000000..9afdeab --- /dev/null +++ b/jbofihe/Makefile @@ -0,0 +1,110 @@ +# +# Copyright (C) 2010 Alan Post <alanpost@sunflowerriver.org> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=jbofihe +PKG_VERSION:=0.38 +PKG_RELEASE:=1 + +PKG_BUILD_DEPENDS:= jbofihe/host lojban-wordlists/host + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.rpcurnow.force9.co.uk/jbofihe/ +PKG_MD5SUM:=7e2cc9149da705c7a774029fb5247248 + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +define Package/jbofihe + TITLE:=Lojban Language Parser + URL:=http://www.rc0.org.uk/jbofihe/ + MAINTAINER:=".alyn.post" <alyn.post@lodockikumazvati.org> + CATEGORY:=Languages + SUBMENU:=Lojban + SECTION:=lang + DEPENDS:=+libc +endef + +define Package/jbofihe/description + A parser for the Lojban language. +endef + +define Host/Configure + ( cd "$(HOST_BUILD_DIR)"; \ + perl config.pl \ + ) +endef + +define Host/Compile + $(call Host/Compile/Default,dfasyn/dfasyn smujajgau uncom) +endef + +define Host/Install + $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin + $(INSTALL_BIN) $(HOST_BUILD_DIR)/smujajgau $(STAGING_DIR_HOST)/bin/ +endef + + +define Build/Configure + ( cd "$(PKG_BUILD_DIR)" && \ + perl config.pl --prefix=/usr \ + ) + ln -s "$(DL_DIR)/lujvo.txt" "$(PKG_BUILD_DIR)" + ln -s "$(DL_DIR)/NORALUJV.txt" "$(PKG_BUILD_DIR)" + ln -s "$(HOST_BUILD_DIR)/uncom" "$(PKG_BUILD_DIR)/uncom_host" + ln -s "$(HOST_BUILD_DIR)/dfasyn/dfasyn" \ + "$(PKG_BUILD_DIR)/dfasyn/dfasyn_host" + ln -s "$(STAGING_DIR_HOST)/bin/smujajgau" \ + "$(PKG_BUILD_DIR)/smujajgau_host" +endef + +define Build/Compile + $(call Build/Compile/Default,all) +endef + +JBOFIHE_BIN_DIR = /usr/bin +JBOFIHE_MAN_DIR = /usr/share/man/man1 +JBOFIHE_LIB_DIR = /usr/lib/$(PKG_NAME) + +define Package/jbofihe/install + $(INSTALL_DIR) \ + $(1)/$(JBOFIHE_MAN_DIR) \ + $(1)/$(JBOFIHE_LIB_DIR) \ + $(1)/$(JBOFIHE_BIN_DIR) + + $(INSTALL_BIN) $(PKG_BUILD_DIR)/cmafihe $(1)/$(JBOFIHE_BIN_DIR) + $(INSTALL_BIN) $(PKG_BUILD_DIR)/jbofihe $(1)/$(JBOFIHE_BIN_DIR) + $(INSTALL_BIN) $(PKG_BUILD_DIR)/jvocuhadju $(1)/$(JBOFIHE_BIN_DIR) + $(INSTALL_BIN) $(PKG_BUILD_DIR)/smujajgau $(1)/$(JBOFIHE_BIN_DIR) + $(INSTALL_BIN) $(PKG_BUILD_DIR)/vlatai $(1)/$(JBOFIHE_BIN_DIR) + + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/cmafihe.1 \ + $(PKG_BUILD_DIR)/jbofihe.1 \ + $(PKG_BUILD_DIR)/jvocuhadju.1 \ + $(PKG_BUILD_DIR)/smujajgau.1 \ + $(PKG_BUILD_DIR)/vlatai.1 \ + $(1)/$(JBOFIHE_MAN_DIR) + + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/smujmaji.dat \ + $(1)/$(JBOFIHE_LIB_DIR) +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,jbofihe)) diff --git a/jbofihe/patches/00-jbofihe_0.38-5.1.diff b/jbofihe/patches/00-jbofihe_0.38-5.1.diff new file mode 100644 index 0000000..36bc078 --- /dev/null +++ b/jbofihe/patches/00-jbofihe_0.38-5.1.diff @@ -0,0 +1,412 @@ +--- jbofihe-0.38.orig/dictaccs.c ++++ jbofihe-0.38/dictaccs.c +@@ -131,8 +131,8 @@ + mmap_base = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fileno(in), 0); + result = (int) mmap_base; + +- if (result < 0) { +- perror("Could not mmap the dictionary data\n"); ++ if (result == -1) { ++ perror("Could not mmap the dictionary data"); + exit(1); + } + +--- jbofihe-0.38.orig/categ.c ++++ jbofihe-0.38/categ.c +@@ -31,6 +31,7 @@ + #include "rpc_tab.h" + #include "functions.h" + #include "stag.h" ++#include <string.h> + + /*++++++++++++++++++++++++++++++ + Look for any cmavo of selma'o JA and back up to where the 'jek' +--- jbofihe-0.38.orig/functions.c ++++ jbofihe-0.38/functions.c +@@ -25,6 +25,7 @@ + #include <assert.h> + #include <stdlib.h> + #include <ctype.h> ++#include <string.h> + #include "functions.h" + #include "nonterm.h" + #include "rpc_tab.h" +--- jbofihe-0.38.orig/Makefile.in ++++ jbofihe-0.38/Makefile.in +@@ -107,10 +107,10 @@ + cat gismu_cmavo.dict places.dat extradict patterns | perl dict2inc.pl > dictdata.c + + stag.c : stag.tab.c +- sed -e 's/YYSTYPE/STAG_YYSTYPE/g;' < stag.tab.c > stag.c ++ cp stag.tab.c stag.c + + stag.h : stag.tab.h +- sed -e 's/YYSTYPE/STAG_YYSTYPE/g;' < stag.tab.h > stag.h ++ cp stag.tab.h stag.h + + stag.tab.c stag.tab.h : stag.y + bison -v -d -p stag_ stag.y +@@ -176,8 +176,8 @@ + dictionary : smujajgau gismu_cmavo.dict + rm -f $(DICTNAME) + ./smujajgau $(DICTNAME) gismu_cmavo.dict +- if [ -r lujvo-list ]; then \ +- perl lujvod.pl < ./lujvo-list > lujvo.dict ;\ ++ if [ -r lujvo.txt ]; then \ ++ perl lujvod.pl < ./lujvo.txt > lujvo.dict ;\ + ./smujajgau $(DICTNAME) lujvo.dict ;\ + fi + if [ -r NORALUJV.txt ]; then \ +@@ -214,7 +214,7 @@ + + clean: + -(cd dfasyn && make clean) +- -rm *.output *.tab.c *_tab.c rpc_full.c *.o \ ++ rm -f *.output *.tab.c *_tab.c rpc_full.c *.o \ + jbofihe cmafihe smujajgau vlatai jvocuhadju \ + *.dict uncom.c uncom.o uncom \ + morf_lex.c morfvlex.c morf_enc.c morf*_dfa.c \ +@@ -222,7 +222,8 @@ + stag.c stag.h stag.tab.c stag.tab.h \ + rpc2x_nc.y rpc2x_act.y rpc2x_full_nc.y rpc2x_full_act.y \ + canonluj.inc version.h \ +- nonterm.c nonterm.h morf_dfa.report morf_lex.err ++ nonterm.c nonterm.h morf_dfa.report morf_lex.err \ ++ bctables.c bctables.report bctest rpc_tab.h cm_scan.c + + # Specify in this perverse way so that the $-Name construction doesn't get replaced on checkout! + +--- jbofihe-0.38.orig/output2elide.pl ++++ jbofihe-0.38/output2elide.pl +@@ -31,7 +31,7 @@ + + while (<>) { + # Read rules +- if (/^rule\s+([0-9]+)\s+subscript/) { ++ if (/^\s+([0-9]+)\s+/) { + $losubscript = $1 unless (defined $losubscript); + $hisubscript = $1; + } +@@ -67,7 +67,7 @@ + next; + } + +- if (/^\s+([^ \t]+)\s+shift, and go to state ([0-9]+)/) { ++ if (/^\s+([^ \t\$]+)\s+shift, and go to state ([0-9]+)/) { + $code = $codes{$1}; + if (!defined $code) { + print STDERR "No code for $1 in state $state\n"; +--- jbofihe-0.38.orig/cm_translate.c ++++ jbofihe-0.38/cm_translate.c +@@ -117,8 +117,8 @@ + mmap_base = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fileno(in), 0); + result = (int) mmap_base; + +- if (result < 0) { +- perror("Could not mmap the dictionary data\n"); ++ if (result == -1) { ++ perror("Could not mmap the dictionary data"); + exit(1); + } + +--- jbofihe-0.38.orig/morf.c ++++ jbofihe-0.38/morf.c +@@ -32,6 +32,8 @@ + * + *********************************************************************/ + ++#include <stdlib.h> ++ + #ifdef TEST_MORF + #include <stdio.h> + #include <string.h> +--- jbofihe-0.38.orig/lex2.c ++++ jbofihe-0.38/lex2.c +@@ -539,7 +539,7 @@ + } + + done_this_block: +- ++ continue; + } + + } +--- jbofihe-0.38.orig/output2table.pl ++++ jbofihe-0.38/output2table.pl +@@ -26,7 +26,7 @@ + $prefix = shift || die "No prefix specified"; + + while (<>) { +- last if (/^Grammar/); ++ last if (/^ Number, Line, Rule/); + } + + @lhs = (); +@@ -40,11 +40,11 @@ + chomp; + last if (/^\s*$/); + +- m{^rule ([0-9]+) +([a-zA-Z0-9_]+) \-\>[ \t](.*)$} || die "Unmatched rule [$_];"; ++ m{^\s+([0-9]+)\s+([0-9]+)\s+([a-zA-Z0-9_]+) \-\>[ \t](.*)$} || die "Unmatched rule [$_];"; + + $number = $1; +- $lhs = $2; +- $rhs = $3; ++ $lhs = $3; ++ $rhs = $4; + if ($rhs =~ m{/\* empty \*/}) { + @r = (); + } else { +--- jbofihe-0.38.orig/uncom.l ++++ jbofihe-0.38/uncom.l +@@ -30,13 +30,10 @@ + *********************************************************************/ + + %{ +-#ifndef yywrap +-#define yywrap() 1 +-#endif +- + static int depth = 0; + %} + ++%option noyywrap + %x COMMENT + + %% +--- jbofihe-0.38.orig/dfasyn/Makefile ++++ jbofihe-0.38/dfasyn/Makefile +@@ -43,5 +43,5 @@ + scan.o : scan.c parse.h n2d.h + + clean: +- rm dfasyn *.o scan.c parse.c parse.h parse.output ++ rm -f dfasyn *.o scan.c parse.c parse.h parse.output + +--- jbofihe-0.38.orig/dfasyn/parse.y ++++ jbofihe-0.38/dfasyn/parse.y +@@ -94,7 +94,7 @@ + | STRING { add_tok_to_abbrev(curabbrev, $1); } + ; + +-token : STRING { (void) lookup_token($1, CREATE_MUST_NOT_EXIST); } ++token : STRING { (void) lookup_token($1, CREATE_MUST_NOT_EXIST); } ; + + instance_decl_seq : /* empty */ | instance_decl_seq instance_decl ; + +--- jbofihe-0.38.orig/debian/dirs ++++ jbofihe-0.38/debian/dirs +@@ -0,0 +1 @@ ++usr/bin +--- jbofihe-0.38.orig/debian/docs ++++ jbofihe-0.38/debian/docs +@@ -0,0 +1,4 @@ ++NEWS ++README ++README.PLIST ++contrib/emacs_functions +--- jbofihe-0.38.orig/debian/control ++++ jbofihe-0.38/debian/control +@@ -0,0 +1,19 @@ ++Source: jbofihe ++Section: misc ++Priority: optional ++Maintainer: Theodore Reed <treed@surreality.us> ++Build-Depends: debhelper (>> 3.0.0), lojban-common (>= 1.4), flex, bison ++Standards-Version: 3.6.1 ++ ++Package: jbofihe ++Architecture: any ++Depends: ${shlibs:Depends} ++Description: A parser for the lojban language ++ jbofihe is a command-line driven program with the following functions: ++ . ++ * Checking grammatical correctness of Lojban text ++ * Displaying successfully analysed text with nesting of grammatical ++ constructs shown (either inline or as a tree) ++ * Displaying approximate word-for-word English translations of the Lojban ++ words, with some limited 'part-of-speech' adjustment of the English forms. ++ * Showing which sumti fill each of the places of each selbri +--- jbofihe-0.38.orig/debian/changelog ++++ jbofihe-0.38/debian/changelog +@@ -0,0 +1,67 @@ ++jbofihe (0.38-5.1) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Applied patch by Peter Green (except for the -Werror changes) to fix build ++ error. (closes: #521952) ++ ++ -- Michael Banck <mbanck@debian.org> Sun, 29 Nov 2009 00:34:26 +0100 ++ ++jbofihe (0.38-5) unstable; urgency=low ++ ++ * s/lujvo-list/lujvo.txt/ in the rules file and Makefile.in to match a ++ change in the lojban-common package. ++ * Update build-depends to lojban-common 1.4 to reflect this change. ++ ++ -- Theodore Reed <treed@surreality.us> Sat, 14 May 2005 20:56:37 -0700 ++ ++jbofihe (0.38-4) unstable; urgency=low ++ ++ * New maintainer. (closes: #221307) ++ * Change build depends to flex. Unsure why flex-old was needed. ++ * Similarly with bison. Not sure why bison-1.35 was needed. ++ * Apply mmap patch. (closes: #276677) ++ * Apply FTBFS fix patch. (closes: #258923, 189911) ++ ++ -- Theodore Reed <treed@surreality.us> Mon, 11 Apr 2005 20:06:21 -0700 ++ ++jbofihe (0.38-3.1) unstable; urgency=low ++ ++ * NMU. ++ * Change build depends to flex-old and bison-1.35 (closes: #189911). ++ ++ -- Matthias Klose <doko@debian.org> Mon, 17 Nov 2003 20:12:52 +0100 ++ ++jbofihe (0.38-3) unstable; urgency=low ++ ++ * Change build-deps to lock to bison 1.75-1.79. ++ * Bison changed something again! *grr* ++ ++ -- JP Sugarbroad <taral@taral.net> Wed, 30 Oct 2002 11:17:20 -0600 ++ ++jbofihe (0.38-2) unstable; urgency=low ++ ++ * Change build-dep to reflect necessary bison version. ++ * Someone please tell the bison people to stop changing the -v output! ++ ++ -- JP Sugarbroad <taral@taral.net> Thu, 14 Mar 2002 11:45:14 -0600 ++ ++jbofihe (0.38-1) unstable; urgency=low ++ ++ * Update to latest version. (closes: #119777) ++ ++ -- JP Sugarbroad <taral@taral.net> Thu, 25 Oct 2001 14:18:31 -0500 ++ ++jbofihe (0.36b-1) unstable; urgency=low ++ ++ * New maintainer. ++ * Update to latest version. ++ * Regenerate dictionary on build (closes: #102247) ++ * lojban-common's been around for ages (closes: #94456) ++ ++ -- JP Sugarbroad <taral@taral.net> Mon, 25 Jun 2001 17:43:14 -0500 ++ ++jbofihe (0.36-1) unstable; urgency=low ++ ++ * Initial Release. ++ ++ -- John Leuner <jewel@debian.org> Fri, 30 Mar 2001 05:31:14 +0000 +--- jbofihe-0.38.orig/debian/copyright ++++ jbofihe-0.38/debian/copyright +@@ -0,0 +1,26 @@ ++This package was (re-)debianized by JP Sugarbroad <taral@taral.net> on ++Mon, 25 Jun 2001 17:38:09 -0500. ++ ++It was downloaded from http://go.to/jbofihe/ ++ ++Upstream Author: <jbofihe@go.to> ++ ++Copyright: ++ ++ This package is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; version 2 dated June, 1991. ++ ++ This package is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this package; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ 02111-1307, USA. ++ ++On Debian GNU/Linux systems, the complete text of the GNU General ++Public License can be found in `/usr/share/common-licenses/GPL'. ++ +--- jbofihe-0.38.orig/debian/rules ++++ jbofihe-0.38/debian/rules +@@ -0,0 +1,81 @@ ++#!/usr/bin/make -f ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++ ++# This is the debhelper compatability version to use. ++export DH_COMPAT=3 ++ ++configure: configure-stamp ++configure-stamp: ++ dh_testdir ++ ++ mkdir -p bin ++ ln -sf /usr/bin/bison-1.35 bin/bison ++ PATH=`pwd`/bin:$$PATH \ ++ perl config.pl --prefix=/usr ++ ++ touch configure-stamp ++ ++build: configure-stamp build-stamp ++build-stamp: ++ dh_testdir ++ ++ ln -sf /usr/share/lojban/lujvo.txt . ++ ln -sf /usr/share/lojban/NORALUJV.txt . ++ ++ #work arround an issue with including multiple bision parsers in one ++ #C source file ++ PATH=`pwd`/bin:$$PATH $(MAKE) stag.h ++ sed -i s/YYTOKENTYPE/STAGYYTOKENTYPE/ stag.h ++ sed -i s/yytokentype/stagyytokentype/ stag.h ++ ++ PATH=`pwd`/bin:$$PATH $(MAKE) all ++ touch build-stamp ++ ++clean: ++ dh_testdir ++ dh_testroot ++ rm -f build-stamp configure-stamp ++ rm -rf bin ++ ++ -$(MAKE) clean ++ rm -rf Makefile smujmaji.dat lujvo.txt NORALUJV.txt n2d ++ ++ dh_clean ++ ++install: DH_OPTIONS= ++install: build ++ dh_testdir ++ dh_testroot ++ dh_clean -k ++ dh_installdirs ++ ++ PATH=`pwd`/bin:$$PATH \ ++ $(MAKE) install \ ++ PREFIX=$(CURDIR)/debian/jbofihe/usr \ ++ MANDIR=$(CURDIR)/debian/jbofihe/usr/share/man/man1 ++ ++binary-indep:; ++# Nothing to do ++ ++binary-arch: build install ++ dh_testdir ++ dh_testroot ++ dh_installdocs ++# dh_installman ++ dh_installchangelogs ++ dh_strip ++ dh_link ++ dh_compress ++ dh_fixperms ++ dh_installdeb ++ dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary install configure ++ ++# vim:noet:nosta:nolist: diff --git a/jbofihe/patches/01-url.patch b/jbofihe/patches/01-url.patch new file mode 100644 index 0000000..b89ca23 --- /dev/null +++ b/jbofihe/patches/01-url.patch @@ -0,0 +1,84 @@ +diff -urN --exclude=.svn --exclude=RCS --exclude=CVS jbofihe-0.38.orig/cmafihe.1 jbofihe-0.38.openwrt/cmafihe.1 +--- jbofihe-0.38.orig/cmafihe.1 2001-09-15 16:10:37.000000000 -0600 ++++ jbofihe-0.38/cmafihe.1 2010-10-05 15:12:06.000000000 -0600 +@@ -70,7 +70,7 @@ + .B http://www.lojban.org/ + Home page of the Lojban community + .TP +-.B http://www.rrbcurnow.freeuk.com/lojban/ ++.B http://www.rc0.org.uk/lojban/ + My Lojban page. + .SH AUTHOR + Richard Curnow +diff -urN --exclude=.svn --exclude=RCS --exclude=CVS jbofihe-0.38.orig/jbofihe.1 jbofihe-0.38.openwrt/jbofihe.1 +--- jbofihe-0.38.orig/jbofihe.1 2001-09-15 16:10:39.000000000 -0600 ++++ jbofihe-0.38.openwrt/jbofihe.1 2010-10-05 15:12:10.000000000 -0600 +@@ -162,7 +162,7 @@ + .B http://go.to/jbofihe + Home page for the jbofihe project + .TP +-.B http://www.rrbcurnow.freeuk.com/lojban/ ++.B http://www.rc0.org.uk/lojban/ + My Lojban page. + .TP + .B http://www.lojban.org/ +diff -urN --exclude=.svn --exclude=RCS --exclude=CVS jbofihe-0.38.orig/jvocuhadju.1 jbofihe-0.38.openwrt/jvocuhadju.1 +--- jbofihe-0.38.orig/jvocuhadju.1 2001-09-15 16:10:39.000000000 -0600 ++++ jbofihe-0.38.openwrt/jvocuhadju.1 2010-10-05 15:12:14.000000000 -0600 +@@ -59,7 +59,7 @@ + .B http://www.lojban.org/ + Home page of the Lojban community + .TP +-.B http://www.rrbcurnow.freeuk.com/lojban/ ++.B http://www.rc0.org.uk/lojban/ + My Lojban page. + .SH AUTHOR + Richard Curnow +diff -urN --exclude=.svn --exclude=RCS --exclude=CVS jbofihe-0.38.orig/README jbofihe-0.38.openwrt/README +--- jbofihe-0.38.orig/README 2001-09-15 16:10:36.000000000 -0600 ++++ jbofihe-0.38.openwrt/README 2010-10-05 15:12:31.000000000 -0600 +@@ -9,7 +9,7 @@ + or http://go.to/jbofihe + + My page for Lojban-related things generally is : +- http://www.rrbcurnow.freeuk.com/lojban ++ http://www.rc0.org.uk/lojban/ + + ================ + WHAT IS JBOFIHE? +diff -urN --exclude=.svn --exclude=RCS --exclude=CVS jbofihe-0.38.orig/README.DOS jbofihe-0.38.openwrt/README.DOS +--- jbofihe-0.38.orig/README.DOS 2001-09-15 16:10:36.000000000 -0600 ++++ jbofihe-0.38.openwrt/README.DOS 2010-10-05 15:12:38.000000000 -0600 +@@ -10,7 +10,7 @@ + or http://go.to/jbofihe + + My page for Lojban-related things generally is : +- http://www.rrbcurnow.freeuk.com/lojban ++ http://www.rc0.org.uk/lojban/ + + ================ + WHAT IS JBOFIHE? +diff -urN --exclude=.svn --exclude=RCS --exclude=CVS jbofihe-0.38.orig/smujajgau.1 jbofihe-0.38.openwrt/smujajgau.1 +--- jbofihe-0.38.orig/smujajgau.1 2001-09-15 16:10:42.000000000 -0600 ++++ jbofihe-0.38.openwrt/smujajgau.1 2010-10-05 15:11:53.000000000 -0600 +@@ -197,7 +197,7 @@ + .B http://go.to/jbofihe + Home page for the jbofihe project + .TP +-.B http://www.rrbcurnow.freeuk.com/lojban/ ++.B http://www.rc0.org.uk/lojban/ + My Lojban page. + .TP + .B http://www.lojban.org/ +diff -urN --exclude=.svn --exclude=RCS --exclude=CVS jbofihe-0.38.orig/vlatai.1 jbofihe-0.38.openwrt/vlatai.1 +--- jbofihe-0.38.orig/vlatai.1 2001-09-15 16:10:43.000000000 -0600 ++++ jbofihe-0.38.openwrt/vlatai.1 2010-10-05 15:12:45.000000000 -0600 +@@ -37,7 +37,7 @@ + .B http://www.lojban.org/ + Home page of the Lojban community + .TP +-.B http://www.rrbcurnow.freeuk.com/lojban/ ++.B http://www.rc0.org.uk/lojban/ + My Lojban page. + .SH AUTHOR + Richard Curnow diff --git a/jbofihe/patches/02-dfysyn.patch b/jbofihe/patches/02-dfysyn.patch new file mode 100644 index 0000000..a77cbe1 --- /dev/null +++ b/jbofihe/patches/02-dfysyn.patch @@ -0,0 +1,23 @@ +--- jbofihe-0.38.orig/Makefile.in 2010-10-07 18:32:18.000000000 -0600 ++++ jbofihe-0.38/Makefile.in 2010-10-07 18:32:39.000000000 -0600 +@@ -148,16 +148,16 @@ + morf_enc.c : mk_enctab.pl + perl mk_enctab.pl > morf_enc.c 2>morf_enc.err + +-morf_dfa.c : morf_nfa.in dfasyn/dfasyn +- dfasyn/dfasyn -v -r morf_dfa.report morf_nfa.in -o morf_dfa.c ++morf_dfa.c : morf_nfa.in ++ dfasyn/dfasyn_host -v -r morf_dfa.report morf_nfa.in -o morf_dfa.c + + bctest : bccheck.c bctables.c + $(CC) $(CFLAGS) -o bctest -DTEST=1 bccheck.c + + bccheck.o : bccheck.c bctables.c + +-bctables.c : bctables.in dfasyn/dfasyn +- dfasyn/dfasyn -v -r bctables.report < bctables.in > bctables.c ++bctables.c : bctables.in ++ dfasyn/dfasyn_host -v -r bctables.report < bctables.in > bctables.c + + dfasyn/dfasyn: + (cd dfasyn && make all) diff --git a/jbofihe/patches/03-smujajgau.patch b/jbofihe/patches/03-smujajgau.patch new file mode 100644 index 0000000..fb94191 --- /dev/null +++ b/jbofihe/patches/03-smujajgau.patch @@ -0,0 +1,32 @@ +--- jbofihe-0.38.orig/Makefile.in 2001-09-15 16:10:36.000000000 -0600 ++++ jbofihe-0.38/Makefile.in 2010-10-06 16:58:31.000000000 -0600 +@@ -173,23 +173,23 @@ + perl mkdict.pl > gismu_cmavo.dict + + +-dictionary : smujajgau gismu_cmavo.dict ++dictionary : gismu_cmavo.dict + rm -f $(DICTNAME) +- ./smujajgau $(DICTNAME) gismu_cmavo.dict ++ ./smujajgau_host $(DICTNAME) gismu_cmavo.dict + if [ -r lujvo.txt ]; then \ + perl lujvod.pl < ./lujvo.txt > lujvo.dict ;\ +- ./smujajgau $(DICTNAME) lujvo.dict ;\ ++ ./smujajgau_host $(DICTNAME) lujvo.dict ;\ + fi + if [ -r NORALUJV.txt ]; then \ + perl noralujv.pl > noralujv.dict ;\ +- ./smujajgau $(DICTNAME) noralujv.dict ;\ ++ ./smujajgau_host $(DICTNAME) noralujv.dict ;\ + fi +- ./smujajgau $(DICTNAME) extradict places.dat patterns ++ ./smujajgau_host $(DICTNAME) extradict places.dat patterns + + dictupdate : $(DICTNAME) + + $(DICTNAME) : extradict places.dat patterns +- ./smujajgau $(DICTNAME) extradict places.dat patterns ++ ./smujajgau_host $(DICTNAME) extradict places.dat patterns + + cmafihe : $(CM_OBJS) + $(CC) $(CFLAGS) $(CMAFIHE_LDOPTS) -o cmafihe $(CM_OBJS) diff --git a/jbofihe/patches/04-uncom.patch b/jbofihe/patches/04-uncom.patch new file mode 100644 index 0000000..72c553d --- /dev/null +++ b/jbofihe/patches/04-uncom.patch @@ -0,0 +1,24 @@ +--- jbofihe-0.38.orig/Makefile.in 2001-09-15 16:10:36.000000000 -0600 ++++ jbofihe-0.38/Makefile.in 2010-10-06 16:58:31.000000000 -0600 +@@ -64,8 +64,8 @@ + %.s : %.c + $(CC) $(CFLAGS) -S $< + +-rpc2x_nc.y : rpc2x.y uncom +- ./uncom < rpc2x.y > rpc2x_nc.y ++rpc2x_nc.y : rpc2x.y ++ ./uncom_host < rpc2x.y > rpc2x_nc.y + + rpc2x_act.y nonterm.h nonterm.c : rpc2x_nc.y + perl ./action.perl < rpc2x_nc.y > rpc2x_act.y +@@ -78,8 +78,8 @@ + perl add_trace_to_tabc.pl < rpc2x_act.tab.c > rpc_tab.c + + # Create grammar that will only recognize text with all elidable cmavo present +-rpc2x_full_nc.y : rpc2x.y terminator.pl uncom +- perl terminator.pl < rpc2x.y | ./uncom > rpc2x_full_nc.y ++rpc2x_full_nc.y : rpc2x.y terminator.pl ++ perl terminator.pl < rpc2x.y | ./uncom_host > rpc2x_full_nc.y + + rpc2x_full_act.y : rpc2x_full_nc.y + perl ./action.perl -nononterm < rpc2x_full_nc.y > rpc2x_full_act.y diff --git a/jbofihe/patches/05-cflags.patch b/jbofihe/patches/05-cflags.patch new file mode 100644 index 0000000..05ed099 --- /dev/null +++ b/jbofihe/patches/05-cflags.patch @@ -0,0 +1,11 @@ +--- jbofihe-0.38.orig/Makefile.in 2001-09-15 16:10:36.000000000 -0600 ++++ jbofihe-0.38/Makefile.in 2010-10-06 16:58:31.000000000 -0600 +@@ -30,7 +30,7 @@ + CMAFIHE_LDOPTS=@@CMAFIHE_LDOPTS@@ + + CC=gcc +-CFLAGS= @@OPTDEBUG@@ @@DEFINES@@ -DDEFAULT_DICTIONARY=\"$(DICTIONARY)\" ++CFLAGS+= @@OPTDEBUG@@ @@DEFINES@@ -DDEFAULT_DICTIONARY=\"$(DICTIONARY)\" + + OBJS2 = main.o lex1.o lex2.o cmavotab.o rpc_tab.o functions.o \ + categ.o nonterm.o tree.o translate.o latex.o \ diff --git a/jbofihe/patches/06-config.patch b/jbofihe/patches/06-config.patch new file mode 100644 index 0000000..461d03a --- /dev/null +++ b/jbofihe/patches/06-config.patch @@ -0,0 +1,11 @@ +--- jbofihe-0.38.orig/config.pl 2001-09-15 16:10:37.000000000 -0600 ++++ jbofihe-0.38/config.pl 2010-10-07 23:28:56.000000000 -0600 +@@ -62,7 +62,7 @@ + $cmafihe_ldopts=""; + } + +-$optdebug = $debug ? " -g -Wall" : " -O2"; ++$optdebug = $debug ? " -g -Wall" : ""; + if ($profile) { + $optdebug .= " -pg"; + } diff --git a/jfbterm/Makefile b/jfbterm/Makefile index ccf7a7d..e494fc5 100644 --- a/jfbterm/Makefile +++ b/jfbterm/Makefile @@ -1,5 +1,3 @@ -# -# kyak@freenode/#qi-hardware # # This is free software, licensed under the GNU General Public License v2. # diff --git a/qijoe/Makefile b/joe-full/Makefile index 8449edc..9f4cdb0 100644 --- a/qijoe/Makefile +++ b/joe-full/Makefile @@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=qijoe +PKG_NAME:=joe-full PKG_VERSION:=3.7 PKG_RELEASE:=3 @@ -24,7 +24,7 @@ PKG_BUILD_DIR=$(BUILD_DIR)/joe-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -define Package/qijoe +define Package/joe-full SECTION:=utils CATEGORY:=Utilities DEPENDS:=+libncurses @@ -33,12 +33,12 @@ define Package/qijoe SUBMENU:=Editors endef -define Package/qijoe/description +define Package/joe-full/description Joe is world-famous Wordstar like text editor, that also features Emacs and Pico emulation endef -define Package/qijoe/install +define Package/joe-full/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/joe $(1)/usr/bin/ for i in jmacs jstar rjoe jpico; do \ @@ -46,4 +46,4 @@ define Package/qijoe/install done endef -$(eval $(call BuildPackage,qijoe)) +$(eval $(call BuildPackage,joe-full)) diff --git a/qijoe/patches/001-mathaway.patch b/joe-full/patches/001-mathaway.patch index 99fc930..99fc930 100644 --- a/qijoe/patches/001-mathaway.patch +++ b/joe-full/patches/001-mathaway.patch diff --git a/qijoe/patches/002-builtinrc.patch b/joe-full/patches/002-builtinrc.patch index ceb531f..ceb531f 100644 --- a/qijoe/patches/002-builtinrc.patch +++ b/joe-full/patches/002-builtinrc.patch diff --git a/kbd/Makefile b/kbd/Makefile index 0d9296f..734a275 100644 --- a/kbd/Makefile +++ b/kbd/Makefile @@ -62,7 +62,6 @@ define Package/kbd-console-maps/install $(INSTALL_DIR) $(1)/usr/share/kbd/keymaps/i386/include $(CP) $(PKG_BUILD_DIR)/data/keymaps/i386/qwerty/* $(1)/usr/share/kbd/keymaps/i386/qwerty/ $(CP) $(PKG_BUILD_DIR)/data/keymaps/i386/include/* $(1)/usr/share/kbd/keymaps/i386/include/ - $(CP) $(FILES_DIR)/ben_ru_uni.map.gz $(1)/usr/share/kbd/keymaps/ endef $(eval $(call BuildPackage,kbd)) diff --git a/kbd/files/ben_ru_uni.map.gz b/kbd/files/ben_ru_uni.map.gz Binary files differdeleted file mode 100644 index b228691..0000000 --- a/kbd/files/ben_ru_uni.map.gz +++ /dev/null diff --git a/keymouse/Makefile b/keymouse/Makefile new file mode 100644 index 0000000..5020cf1 --- /dev/null +++ b/keymouse/Makefile @@ -0,0 +1,43 @@ +# Copyright (C) 2010 tuxbrain.com +# +# This is free software, licensed under the GNU General Public License v2. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=keymouse +PKG_VERSION:=1.0 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://download2.berlios.de/keymouse +PKG_CAT:=bzcat +PKG_BUILD_DEPENDS:=libX11 + +include $(INCLUDE_DIR)/package.mk + +define Package/keymouse + TITLE:=Just a simple mouse emulator + SECTION:=utils + CATEGORY:=Utilities + URL:=http://keymouse.berlios.de +endef +PKG_BUILD_DIR:=$(BUILD_DIR)/keymouse-$(PKG_VERSION) + +define Package/keymouse/description + Just a simple mouse emulator (for Linux) that can be controlled with keyboard. Useful on laptop with broken touch pad or in absence of external mouse device.Requires uinput kernel module +endef + +define Build/Configure + (cd "$(PKG_BUILD_DIR)"; ./autogen.sh ); + $(call Build/Configure/Default) + +endef +define Package/keymouse/install + $(INSTALL_DIR) $(1)/usr/bin $(1)/etc $(1)/etc/init.d + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/keymouse $(1)/usr/bin/ + $(INSTALL_DATA) $(FILES_DIR)/keymouse.cfg $(1)/etc/ + $(INSTALL_BIN) $(FILES_DIR)/keymouse.init $(1)/etc/init.d/keymouse +endef + +$(eval $(call BuildPackage,keymouse)) diff --git a/keymouse/files/keymouse.cfg b/keymouse/files/keymouse.cfg new file mode 100644 index 0000000..50c2d8d --- /dev/null +++ b/keymouse/files/keymouse.cfg @@ -0,0 +1,37 @@ +# Keymouse (C) 2008 Francesco Piccinno <stack.box@gmail.com> - BSD License +# Example configuration + +# Global options +device=/dev/input/event1 +udevice=/dev/uinput +debug=0 +#dump=1 +dump=0 +touchscreen=0 + +max accel=200 +max modes=6 + +# 0 no notify 1 blocknum notify 2 exec notify +notify=0 +notify exec= + +# Mapping (see /usr/include/linux/input.h for keycode or use dump option) +modes=100,29,56 +bkeys=103,108,106,105,88,87,25 + +# Actions +# <action>=mod1:mod2 + +up=103:0: +down=108:0: +right=106:0: +left=105:0: +rup=87:0: +rdown=88:0: +#lup=42:2: +#ldown=56:1: +click=88:1: +rclick=87:1: +3click=25:2: +lock=25:1: diff --git a/keymouse/files/keymouse.init b/keymouse/files/keymouse.init new file mode 100755 index 0000000..ce93d17 --- /dev/null +++ b/keymouse/files/keymouse.init @@ -0,0 +1,7 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2008 OpenWrt.org +START=43 + +start() { + start-stop-daemon -b -S -x /usr/bin/keymouse -- /etc/keymouse.cfg 0 +} diff --git a/keymouse/patches/001_including_missing_headers.patch b/keymouse/patches/001_including_missing_headers.patch new file mode 100644 index 0000000..bcc6a1f --- /dev/null +++ b/keymouse/patches/001_including_missing_headers.patch @@ -0,0 +1,80 @@ +diff -crB keymouse-1.0/src/app.cpp keymouse-1.0.mod/src/app.cpp +*** keymouse-1.0/src/app.cpp 2008-03-30 15:41:44.000000000 +0200 +--- keymouse-1.0.mod/src/app.cpp 2010-06-14 13:34:31.565636052 +0200 +*************** +*** 8,14 **** + #include <sys/stat.h> + #include <fcntl.h> + #include "app.h" +! + using namespace std; + + App::App(const char *file) : m_config(file), m_dev(NULL), m_ordModes(), m_exiting(false) +--- 8,15 ---- + #include <sys/stat.h> + #include <fcntl.h> + #include "app.h" +! #include <cstdlib> +! #include <cstring> + using namespace std; + + App::App(const char *file) : m_config(file), m_dev(NULL), m_ordModes(), m_exiting(false) +diff -crB keymouse-1.0/src/configfile.cpp keymouse-1.0.mod/src/configfile.cpp +*** keymouse-1.0/src/configfile.cpp 2008-03-08 21:09:36.000000000 +0100 +--- keymouse-1.0.mod/src/configfile.cpp 2010-06-14 13:36:22.096885603 +0200 +*************** +*** 7,12 **** +--- 7,14 ---- + #include <fstream> + #include <iostream> + #include "configfile.h" ++ #include <cstdlib> ++ #include <cstring> + + ConfigFile::ConfigFile(const char *file) : m_values(), m_file(file) + { +Sólo en keymouse-1.0.mod/src: .deps +diff -crB keymouse-1.0/src/keymouse.cpp keymouse-1.0.mod/src/keymouse.cpp +*** keymouse-1.0/src/keymouse.cpp 2008-03-10 20:18:37.000000000 +0100 +--- keymouse-1.0.mod/src/keymouse.cpp 2010-06-14 13:36:55.096884176 +0200 +*************** +*** 10,15 **** +--- 10,17 ---- + + #include <signal.h> + #include "app.h" ++ #include <cstdlib> ++ #include <cstring> + + using namespace std; + +diff -crB keymouse-1.0/src/logger.cpp keymouse-1.0.mod/src/logger.cpp +*** keymouse-1.0/src/logger.cpp 2008-03-08 21:09:36.000000000 +0100 +--- keymouse-1.0.mod/src/logger.cpp 2010-06-14 13:52:26.245635574 +0200 +*************** +*** 6,11 **** +--- 6,15 ---- + + #include "logger.h" + #include <iostream> ++ #include <cstdlib> ++ #include <cstring> ++ #include <cstdarg> ++ #include <cstdio> + + using namespace std; + +diff -crB keymouse-1.0/src/shortcut.cpp keymouse-1.0.mod/src/shortcut.cpp +*** keymouse-1.0/src/shortcut.cpp 2008-03-08 21:09:36.000000000 +0100 +--- keymouse-1.0.mod/src/shortcut.cpp 2010-06-14 13:53:28.896884710 +0200 +*************** +*** 6,11 **** +--- 6,13 ---- + + #include "shortcut.h" + #include <linux/input.h> ++ #include <cstdlib> ++ #include <cstring> + + bool Shortcut::locked = false; + diff --git a/kinyin/Makefile b/kinyin/Makefile new file mode 100644 index 0000000..a27db04 --- /dev/null +++ b/kinyin/Makefile @@ -0,0 +1,40 @@ +# +# Copyright (C) 2010 Sharism.cc +# Author: Xiangfu Liu <xiangfu@sharism.cc> +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=kinyin +PKG_VERSION:=0.43 +PKG_RELEASE:=1 + +PKG_SOURCE:=95926-$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://qt-apps.org/CONTENT/content-files/ + +include $(INCLUDE_DIR)/package.mk +$(call include_mk,qmake.mk) + +define Package/kinyin + SECTION:=utils + CATEGORY:=Utilities + TITLE:=kinyin + URL:=http://qt-apps.org/content/show.php/kinyin?content=95926 + DEPENDS:=+qt4 +qt4-gui +dejavu-fonts-ttf @BROKEN +endef + +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Build/Configure + cd $(PKG_BUILD_DIR)/qt4 && \ + $(call Build/Configure/Qmake,qt4/kinyin) +endef + +define Package/kinyin/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/kinyin $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,kinyin)) diff --git a/libcss/Makefile b/libcss/Makefile new file mode 100644 index 0000000..206566e --- /dev/null +++ b/libcss/Makefile @@ -0,0 +1,47 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=libcss +PKG_VERSION:=0.0.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.gz +PKG_SOURCE_URL:=http://www.netsurf-browser.org/projects/releases/ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/libcss + SECTION:=libs + CATEGORY:=Libraries + TITLE:=LibCSS is a CSS parser and selection engine, written in C + URL:=http://www.netsurf-browser.org/projects/libcss/ + DEPENDS:=+libparserutils +libwapcaplet +endef + +define Package/libcss/description + LibCSS is a CSS parser and selection engine, written in C. It aims to parse the forward compatible CSS grammar. It was developed as part of the NetSurf project +endef + +define Build/Compile + rm -rf $(PKG_INSTALL_DIR) + $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE_FLAGS) \ + WARNFLAGS="" \ + COMPONENT_TYPE=lib-shared \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install +endef + +define Build/InstallDev + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/local/include/* $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/* $(1)/usr/lib/ +endef + +define Package/libcss/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/libcss.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libcss)) diff --git a/libgc/Makefile b/libgc/Makefile index a7568e2..8f96b4f 100644 --- a/libgc/Makefile +++ b/libgc/Makefile @@ -8,10 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gc -PKG_VERSION:=7.1 +PKG_VERSION:=7.2alpha4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/ +PKG_MD5SUM:=0a6785ebb61c6e2b50c3952c3bbf9ea1 PKG_INSTALL:=1 @@ -22,7 +23,6 @@ define Package/gc SECTION:=libs CATEGORY:=Libraries URL:=http://www.hpl.hp.com/personal/Hans_Boehm/gc/ - DEPENDS:=@BROKEN endef define Package/gc/description @@ -31,6 +31,8 @@ endef TARGET_CFLAGS+="-I./include" +TARGET_LDFLAGS+=-lpthread + define Build/Configure $(call Build/Configure/Default, \ --disable-gcj-support \ @@ -57,9 +59,9 @@ endef define Package/gc/install $(INSTALL_DIR) \ - $(1)/usr/lib \ + $(1)/usr/lib $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/lib{cord,gc}.la \ + $(PKG_INSTALL_DIR)/usr/lib/lib{cord,gc}.so* \ $(1)/usr/lib/ endef diff --git a/libgc/patches/001-os_dep.patch b/libgc/patches/001-os_dep.patch new file mode 100644 index 0000000..42fc131 --- /dev/null +++ b/libgc/patches/001-os_dep.patch @@ -0,0 +1,19 @@ +--- gc-7.2alpha4.orig/os_dep.c 2010-09-25 17:47:19.651870610 +0400 ++++ gc-7.2alpha4/os_dep.c 2010-09-25 21:40:13.382745526 +0400 +@@ -1211,7 +1211,7 @@ + { + pthread_attr_t attr; + size_t size; +- ++/* + if (pthread_getattr_np(pthread_self(), &attr) != 0) { + WARN("pthread_getattr_np failed\n", 0); + return GC_UNIMPLEMENTED; +@@ -1219,6 +1219,7 @@ + if (pthread_attr_getstack(&attr, &(b -> mem_base), &size) != 0) { + ABORT("pthread_attr_getstack failed"); + } ++ */ + pthread_attr_destroy(&attr); + # ifdef STACK_GROWS_DOWN + b -> mem_base = (char *)(b -> mem_base) + size; diff --git a/libhubbub/Makefile b/libhubbub/Makefile new file mode 100644 index 0000000..89466cb --- /dev/null +++ b/libhubbub/Makefile @@ -0,0 +1,46 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=libhubbub +PKG_VERSION:=0.0.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=hubbub-$(PKG_VERSION)-src.tar.gz +PKG_SOURCE_URL:=http://www.netsurf-browser.org/projects/releases/ +PKG_BUILD_DIR:=$(BUILD_DIR)/hubbub-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/libhubbub + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Hubbub is an HTML5 compliant parsing library + URL:=http://www.netsurf-browser.org/projects/hubbub/ + DEPENDS:=+libparserutils +endef + +define Package/libhubbub/description + Hubbub is an HTML5 compliant parsing library, written in C. It was developed as part of the NetSurf project and is available for use by other software under the MIT licence. +endef + +define Build/Compile + rm -rf $(PKG_INSTALL_DIR) + $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE_FLAGS) \ + COMPONENT_TYPE=lib-shared \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install +endef + +define Build/InstallDev + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/local/include/* $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/* $(1)/usr/lib/ +endef + +define Package/libhubbub/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/libhubbub.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libhubbub)) diff --git a/libmpdclient/Makefile b/libmpdclient/Makefile new file mode 100644 index 0000000..496b262 --- /dev/null +++ b/libmpdclient/Makefile @@ -0,0 +1,67 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libmpdclient +PKG_VERSION:=2.3 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://sourceforge.net/projects/musicpd/files/libmpdclient/$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/musicpd/libmpdclient/$(PKG_VERSION)/ +PKG_MD5SUM:=d14bad30c9c117aa6b211ad9f96cfbe0 + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/libmpdclient + TITLE:=libmpdclient + SECTION:=libs + CATEGORY:=Libraries + URL:=http://mpd.wikia.com/wiki/ClientLib:libmpdclient + DEPENDS:= +endef + +define Package/libmpdclient/description + A stable, documented, asynchronous API library for interfacing MPD in the C, C++ & Objective C languages. +endef + +TARGET_CFLAGS+="-std=gnu99" + +#TARGET_LDFLAGS+=-lpthread + +define Build/Configure + $(call Build/Configure/Default) +endef + +define Build/InstallDev + $(INSTALL_DIR) \ + $(1)/usr/include \ + $(1)/usr/lib \ + $(1)/usr/lib/pkgconfig + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/* \ + $(1)/usr/lib/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/include/* \ + $(1)/usr/include/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig \ + $(1)/usr/lib/ +endef + +define Package/libmpdclient/install + $(INSTALL_DIR) \ + $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libmpdclient.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libmpdclient)) diff --git a/libnsfb/Makefile b/libnsfb/Makefile new file mode 100644 index 0000000..8cb0daf --- /dev/null +++ b/libnsfb/Makefile @@ -0,0 +1,56 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=libnsfb +PKG_REV:=10618 +PKG_VERSION:=r$(PKG_REV) +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=svn://svn.netsurf-browser.org/trunk/libnsfb +PKG_SOURCE_PROTO:=svn +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/libnsfb + SECTION:=libs + CATEGORY:=Libraries + TITLE:=LibNSFB is a framebuffer abstraction library, written in C + URL:=http://www.netsurf-browser.org/projects/libcss/ +endef + +define Package/libnsfb/description + The overall idea of the library is to provide a generic abstraction to a linear section of memory which corresponds to a visible array of pixel elements on a display device. Different colour depths are supported and the library provides routines for tasks such as drawing onto the framebuffer and rectangle copy operations. +endef + +define Build/Compile + rm -rf $(PKG_INSTALL_DIR) + $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE_FLAGS) \ + WARNFLAGS="" \ + COMPONENT_TYPE=lib-shared \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install +endef + +define Build/InstallDev + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/local/include/* $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/* $(1)/usr/lib/ + $(SED) \ + 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ + $(1)/usr/lib/pkgconfig/libnsfb.pc + $(SED) \ + 's/xcb\|xcb-icccm\|xcb-image\|xcb-keysyms//g' \ + $(1)/usr/lib/pkgconfig/libnsfb.pc +endef + +define Package/libnsfb/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/libnsfb.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libnsfb)) diff --git a/libnsfb/patches/001-libnsfb.patch b/libnsfb/patches/001-libnsfb.patch new file mode 100644 index 0000000..5ee9133 --- /dev/null +++ b/libnsfb/patches/001-libnsfb.patch @@ -0,0 +1,10 @@ +diff -ur libnsfb.orig/src/surface/Makefile libnsfb/src/surface/Makefile +--- libnsfb.orig/src/surface/Makefile 2010-11-20 13:13:46.000000000 +0300 ++++ libnsfb/src/surface/Makefile 2010-11-20 13:42:01.000000000 +0300 +@@ -1,4 +1,4 @@ + # Sources +-DIR_SOURCES := surface.c sdl.c vnc.c able.c ram.c linux.c x.c ++DIR_SOURCES := surface.c sdl.c ram.c linux.c + + include build/makefiles/Makefile.subdir +Только в libnsfb/src/surface: Makefile~ diff --git a/libparserutils/Makefile b/libparserutils/Makefile new file mode 100644 index 0000000..0824a55 --- /dev/null +++ b/libparserutils/Makefile @@ -0,0 +1,46 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=libparserutils +PKG_VERSION:=0.0.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.gz +PKG_SOURCE_URL:=http://www.netsurf-browser.org/projects/releases/ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/libparserutils + SECTION:=libs + CATEGORY:=Libraries + TITLE:=LibParserUtils has some built-in charset converters + URL:=http://www.netsurf-browser.org/projects/libparserutils/ + DEPENDS:= +endef + +define Package/libparserutils/description + LibParserUtils has the following built-in charset converters. UTF-8, UTF-16 (platform-native endian), ISO-8859-n, Windows-125n, US-ASCII. +endef + +define Build/Compile + rm -rf $(PKG_INSTALL_DIR) + $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE_FLAGS) \ + COMPONENT_TYPE=lib-shared \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install +endef + +define Build/InstallDev + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/local/include/* $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/* $(1)/usr/lib/ +endef + +define Package/libparserutils/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/libparserutils.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libparserutils)) diff --git a/libwapcaplet/Makefile b/libwapcaplet/Makefile new file mode 100644 index 0000000..a2a040b --- /dev/null +++ b/libwapcaplet/Makefile @@ -0,0 +1,45 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=libwapcaplet +PKG_VERSION:=0.0.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.gz +PKG_SOURCE_URL:=http://www.netsurf-browser.org/projects/releases/ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/libwapcaplet + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Libwapcaplet is a string internment library, written in C + URL:=http://www.netsurf-browser.org/projects/libwapcaplet/ +endef + +define Package/libwapcaplet/description + LibWapcaplet is a string internment library, written in C. It provides reference counted string interment and rapid string comparison functionality. It was developed as part of the NetSurf project. +endef + +define Build/Compile + rm -rf $(PKG_INSTALL_DIR) + $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE_FLAGS) \ + COMPONENT_TYPE=lib-shared \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install +endef + +define Build/InstallDev + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/local/include/* $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/* $(1)/usr/lib/ +endef + +define Package/libwapcaplet/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/libwapcaplet.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libwapcaplet)) diff --git a/links/Makefile b/links/Makefile index a031b88..c8d93d4 100644 --- a/links/Makefile +++ b/links/Makefile @@ -33,6 +33,11 @@ define Package/links/description Text and graphics WWW browser endef +define Build/Prepare + $(call Build/Prepare/Default) + $(CP) $(FILES_DIR)/directfb-config $(PKG_BUILD_DIR) +endef + CONFIGURE_ARGS += --enable-graphics \ --enable-debuglevel=0 \ --without-gpm \ @@ -43,12 +48,8 @@ CONFIGURE_ARGS += --enable-graphics \ --without-fb CONFIGURE_VARS += \ - DIRECTFB_CONFIG="$(STAGING_DIR)/root-xburst/usr/bin/directfb-config --prefix=$(STAGING_DIR)/usr" - -define Build/Configure - (cd $(PKG_BUILD_DIR); autoreconf -fi ); - $(call Build/Configure/Default) -endef + DIRECTFB_CONFIG="$(PKG_BUILD_DIR)/directfb-config $(STAGING_DIR)" +#DIRECTFB_CONFIG="$(STAGING_DIR)/root-xburst/usr/bin/directfb-config" define Package/links/install $(INSTALL_DIR) $(1)/usr/bin diff --git a/links/files/directfb-config b/links/files/directfb-config new file mode 100755 index 0000000..6b4417b --- /dev/null +++ b/links/files/directfb-config @@ -0,0 +1,315 @@ +#!/bin/sh + +prefix=$1/usr +exec_prefix=$1/usr +exec_prefix_set=no +moduledir=${exec_prefix}/lib/directfb-1.4-0 + +usage() +{ + cat <<EOF +Usage: directfb-config [OPTIONS] [LIBRARIES] +Options: + [--prefix[=DIR]] + [--exec-prefix[=DIR]] + [--version] + [--libs] + [--cflags] + +For static linking: + [--input=<driver>[,<driver>]...] (default: none) + [--graphics=<driver>[,<driver>]...] (default: none) + [--system=<system>[,<system>]...] (default: 'fbdev') + [--wm=<wm>[,<wm>]...] (default: 'default') + [--font=<impl>[,<impl>]...] (default: none) + [--imageprovider=<impl>[,<impl>]...] (default: none) + [--videoprovider=<impl>[,<impl>]...] (default: none) + [--fusionsound] + [--voodoo] + +Example for static linking: + directfb-config --libs --graphics=matrox,r200 + --input=linux_input --font=ft2 + --imageprovider=jpeg,png,gif +EOF + exit $2 +} + +if test $# -eq 0; then + usage 1 1>&2 +fi + +lib_directfb=yes +lib_avifile=no + +while test $# -gt 1; do + case "$2" in + -*=*) optarg=`echo "$2" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $2 in + --prefix=*) + prefix=$optarg + if test $exec_prefix_set = no ; then + exec_prefix=$optarg + fi + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --version) + echo 1.4.2 + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + directfb) + lib_directfb=yes + ;; + avifile) + lib_avifile=yes + ;; + --input=*) + if test -z "$optarg"; then + usage 2 1>&2 + fi + + for i in `echo $optarg | sed 's/,/ /g'`; do + echo_input="$echo_input $moduledir/inputdrivers/libdirectfb_$i.o" + done + + echo_static=yes + ;; + --graphics=*) + if test -z "$optarg"; then + usage 2 1>&2 + fi + + for i in `echo $optarg | sed 's/,/ /g'`; do + echo_graphics="$echo_graphics $moduledir/gfxdrivers/libdirectfb_$i.o" + done + + echo_static=yes + ;; + --font=*) + if test -z "$optarg"; then + usage 2 1>&2 + fi + + for i in `echo $optarg | sed 's/,/ /g'`; do + echo_font="$echo_font $moduledir/interfaces/IDirectFBFont/libidirectfbfont_$i.o" + case $i in + ft2) + echo_font="$echo_font -lfreetype" + ;; + esac + done + + echo_static=yes + ;; + --system=*) + if test -z "$optarg"; then + usage 2 1>&2 + fi + + for i in `echo $optarg | sed 's/,/ /g'`; do + echo_system="$echo_system $moduledir/systems/libdirectfb_$i.o" + case $i in + fbdev) + echo_system="$echo_system " + ;; + sdl) + echo_system="$echo_system " + ;; + esac + done + + echo_static=yes + ;; + --wm=*) + if test -z "$optarg"; then + usage 2 1>&2 + fi + + for i in `echo $optarg | sed 's/,/ /g'`; do + echo_wm="$echo_wm $moduledir/wm/libidirectfb_$i.o" + case $i in + unique) + echo_wm="$echo_wm -luniquewm" + ;; + esac + done + + echo_static=yes + ;; + --imageprovider=*) + if test -z "$optarg"; then + usage 2 1>&2 + fi + + for i in `echo $optarg | sed 's/,/ /g'`; do + echo_imageprovider="$echo_imageprovider $moduledir/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_$i.o" + case $i in + imlib2) + echo_imageprovider="$echo_imageprovider -lImlib2 -lttf -lm -lXext -lX11" + ;; + jpeg) + echo_imageprovider="$echo_imageprovider -ljpeg" + ;; + png) + echo_imageprovider="$echo_imageprovider -lpng -lz -lm" + ;; + gif) + ;; + esac + done + + echo_static=yes + ;; + --videoprovider=*) + if test -z "$optarg"; then + usage 2 1>&2 + fi + + for i in `echo $optarg | sed 's/,/ /g'`; do + echo_videoprovider="$echo_videoprovider $moduledir/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_$i.o" + case $i in + libmpeg3) + echo_videoprovider="$echo_videoprovider -lmpeg3" + ;; + swf) + echo_videoprovider="$echo_videoprovider -ljpeg -lz" + ;; + openquicktime) + echo_videoprovider="$echo_videoprovider -lopenquicktime -lz -lglib -lm" + ;; + esac + done + + echo_static=yes + ;; + --fusionsound) + echo_fusionsound="-Wl,-uIFusionSound_default -lifusionsound" + echo_static=yes + ;; + --voodoo) + echo_voodoo=yes + echo_static=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_cflags" = "yes"; then + if test ${prefix}/include/directfb != /usr/include ; then + cflags="-I${SYSROOT}${prefix}/include/directfb" + fi + echo $cflags -D_REENTRANT +fi + +if test -n "$echo_static"; then + echo -static + + if test -z "$echo_system"; then + echo $moduledir/systems/libdirectfb_fbdev.o + fi + + if test -z "$echo_wm"; then + echo $moduledir/wm/libdirectfbwm_default.o + fi +fi + + +if test -n "$echo_font"; then + echo $echo_font +fi + +if test -n "$echo_imageprovider"; then + echo $echo_imageprovider +fi + +if test -n "$echo_videoprovider"; then + echo $echo_videoprovider +fi + + +if test -n "$echo_input"; then + echo $echo_input +fi + +if test -n "$echo_graphics"; then + echo $echo_graphics +fi + +if test -n "$echo_system"; then + echo $echo_system +fi + +if test -n "$echo_wm"; then + echo $echo_wm +fi + +if test -n "$echo_fusionsound"; then + echo -L${SYSROOT}$moduledir/interfaces/IFusionSound $echo_fusionsound +fi + + +print_voodoo () +{ + echo $moduledir/interfaces/$1/lib$2_dispatcher.o $moduledir/interfaces/$1/lib$2_requestor.o +} + +if test -n "$echo_voodoo"; then + print_voodoo IDirectFB idirectfb + print_voodoo IDirectFBDataBuffer idirectfbdatabuffer + print_voodoo IDirectFBDisplayLayer idirectfbdisplaylayer + print_voodoo IDirectFBEventBuffer idirectfbeventbuffer + print_voodoo IDirectFBFont idirectfbfont + print_voodoo IDirectFBImageProvider idirectfbimageprovider + print_voodoo IDirectFBInputDevice idirectfbinputdevice + print_voodoo IDirectFBPalette idirectfbpalette + print_voodoo IDirectFBScreen idirectfbscreen + print_voodoo IDirectFBSurface idirectfbsurface + print_voodoo IDirectFBWindow idirectfbwindow + echo -lvoodoo +fi + +if test "$echo_libs" = "yes"; then + libs=-L${SYSROOT}${exec_prefix}/lib + + if test "$lib_directfb" = "yes"; then + libs="$libs -ldirectfb -lfusion -ldirect -lpthread" + + if test -n "$echo_static"; then + libs="$libs -ldl -lz" + fi + fi + + if test "$lib_avifile" = "yes"; then + libs="$libs @AVIFILE_LIBS@" + fi + + echo $libs +fi diff --git a/lojban-wordlists/Makefile b/lojban-wordlists/Makefile new file mode 100644 index 0000000..a224ea0 --- /dev/null +++ b/lojban-wordlists/Makefile @@ -0,0 +1,125 @@ +# +# Copyright (C) 2010 Alan Post <alanpost@sunflowerriver.org> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=lojban-wordlists +PKG_VERSION:=20050628 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://www.lojban.org/publications + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +define Package/lojban-wordlists + TITLE:=Lojban word lists + URL:=http://www.lojban.org/ + MAINTAINER:=".alyn.post" <alyn.post@lodockikumazvati.org> + CATEGORY:=Languages + SUBMENU:=Lojban + SECTION:=lang +endef + +define Package/jbofihe/description + cmavo, gismu, lujvo, and rafsi, wordlists for Lojban. +endef + +CMAVO:=cmavo.txt +GISMU:=gismu.txt +LUJVO:=lujvo.txt +NORALUJV:=NORALUJV.txt +RAFSI:=rafsi.txt + +define Download/cmavo + FILE:=$(CMAVO) + URL:=$(PKG_SOURCE_URL)/wordlists + MD5SUM:=d5b434ac9f3f75879ecb0d1fbcf86d47 +endef + +define Download/gismu + FILE:=$(GISMU) + URL:=$(PKG_SOURCE_URL)/wordlists + MD5SUM:=4edb4480ad5c26cfd1bfd492f6f95de1 +endef + +define Download/lujvo + FILE:=$(LUJVO) + URL:=$(PKG_SOURCE_URL)/wordlists + MD5SUM:=dbd82f42f4156a2a1801e2a5ec1e551e +endef + +define Download/noralujv + FILE:=$(NORALUJV) + URL:=$(PKG_SOURCE_URL)/draft-dictionary + MD5SUM:=d750de398740a2ba701422a466ddbeab +endef + +define Download/rafsi + FILE:=$(RAFSI) + URL:=$(PKG_SOURCE_URL)/wordlists + MD5SUM:=e4ec80a41f3016a561a904dfa1fbbd8d +endef + +define Download/default + $(eval $(call Download,cmavo)) + $(eval $(call Download,gismu)) + $(eval $(call Download,lujvo)) + $(eval $(call Download,noralujv)) + $(eval $(call Download,rafsi)) +endef + +define Host/Configure +endef + +define Host/Compile +endef + +define Host/Install + $(INSTALL_DIR) \ + $(STAGING_DIR_HOST)/usr/share/lojban + + $(INSTALL_DATA) \ + $(DL_DIR)/NORALUJV.txt \ + $(DL_DIR)/cmavo.txt \ + $(DL_DIR)/gismu.txt \ + $(DL_DIR)/lujvo.txt \ + $(DL_DIR)/rafsi.txt \ + $(STAGING_DIR_HOST)/usr/share/lojban +endef + +define Build/Configure +endef + +define Build/Compile +endef + +define Package/lojban-wordlists/install + $(INSTALL_DIR) \ + $(1)/usr/share/lojban + + $(INSTALL_DATA) \ + $(DL_DIR)/NORALUJV.txt \ + $(DL_DIR)/cmavo.txt \ + $(DL_DIR)/gismu.txt \ + $(DL_DIR)/lujvo.txt \ + $(DL_DIR)/rafsi.txt \ + $(1)/usr/share/lojban +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,lojban-wordlists)) diff --git a/lynx/Makefile b/lynx/Makefile index 4c1ddbe..159072e 100644 --- a/lynx/Makefile +++ b/lynx/Makefile @@ -8,15 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lynx -PKG_VERSION:=2.8.7rel.1 +PKG_VERSION:=2.8.8dev.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://lynx.isc.org/current +PKG_MD5SUM:=289255204d23c2c3e8094b50a8638dfc -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)2-8-7 - -PKG_INSTALL:=1 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)2-8-8 include $(INCLUDE_DIR)/package.mk @@ -24,7 +23,7 @@ define Package/lynx TITLE:=lynx SECTION:=network CATEGORY:=Network - DEPENDS:=+libncurses +zlib + DEPENDS:=+libncursesw +zlib +libopenssl URL:=http://lynx.isc.org endef @@ -32,11 +31,22 @@ define Package/lynx/description text console browser endef -CONFIGURE_ARGS += --with-zlib +CONFIGURE_ARGS += --with-zlib --with-ssl \ + --with-screen=ncursesw \ + --enable-widec \ + --enable-locale-charset \ + --disable-color-style \ + --enable-charset-choice \ + --enable-cjk \ + --enable-japanese-utf8 \ + --enable-nsl-fork + +CONFIGURE_VARS += cf_cv_ncurses_header="ncursesw/curses.h" \ + ac_cv_path_NCURSES_CONFIG="" define Package/lynx/install $(INSTALL_DIR) $(1)/usr/bin $(1)/etc - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lynx $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lynx $(1)/usr/bin/ $(INSTALL_DATA) ./files/etc/lynx.cfg $(1)/etc/ $(INSTALL_DATA) ./files/etc/lynx.lss $(1)/etc/ endef diff --git a/lynx/files/etc/lynx.cfg b/lynx/files/etc/lynx.cfg index e69de29..e9487f0 100644 --- a/lynx/files/etc/lynx.cfg +++ b/lynx/files/etc/lynx.cfg @@ -0,0 +1,3 @@ +LOCALE_CHARSET:TRUE +ASSUME_CHARSET:utf-8 +ASSUME_LOCAL_CHARSET:utf-8 diff --git a/makfa/Makefile b/makfa/Makefile index aaabc8d..506e3b5 100644 --- a/makfa/Makefile +++ b/makfa/Makefile @@ -1,8 +1,18 @@ # -# Copyright (C) 2010 qi-hardware.com +# Copyright (C) 2010 Alan Post <alanpost@sunflowerriver.org> # -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # include $(TOPDIR)/rules.mk @@ -21,10 +31,17 @@ PKG_SOURCE_VERSION:=$(PKG_REV) include $(INCLUDE_DIR)/package.mk define Package/makfa - SECTION:=education - CATEGORY:=Education TITLE:=Lojban Dictionary URL:=http://gittub.com/lojban/makfa-cli + MAINTAINER:=".alyn.post" <alyn.post@lodockikumazvati.org> + CATEGORY:=Languages + SUBMENU:=Lojban + SECTION:=lang + DEPENDS:=+python +endef + +define Package/jbofihe/description + A Lojban dictionary. endef define Build/Configure @@ -34,7 +51,7 @@ endef # on the host machine and copy it into the package. # define Build/Compile - $(PYTHON) $(PKG_BUILD_DIR)/makfa update en $(PKG_BUILD_DIR)/makfa.dump + python $(PKG_BUILD_DIR)/makfa update en $(PKG_BUILD_DIR)/makfa.dump endef define Package/makfa/install @@ -51,4 +68,8 @@ define Package/makfa/install $(1)/usr/share/$(PKG_NAME)/ endef +$(eval $(call RequireCommand,python, \ + Please install Python 2.x \ +)) + $(eval $(call BuildPackage,makfa)) diff --git a/mandoc/Makefile b/mandoc/Makefile index e2c87e7..c489d56 100644 --- a/mandoc/Makefile +++ b/mandoc/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mandoc -PKG_VERSION:=1.10.4 -PKG_RELEASE:=2 +PKG_VERSION:=1.10.6 +PKG_RELEASE:=1 -PKG_SOURCE:=mdocml-1.10.4.tar.gz +PKG_SOURCE:=mdocml-1.10.6.tar.gz PKG_SOURCE_URL:=http://mdocml.bsd.lv/snapshots/ -PKG_MD5SUM:=f23e40cd64f4312b0c4e2d72e7999298 +PKG_MD5SUM:=4b4dd6c50806c0d520d57318ebd3f412 PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/mdocml-$(PKG_VERSION) @@ -16,15 +16,16 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/mdocml-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk define Package/mandoc - SECTION:=utils - CATEGORY:=Utilities - TITLE:=mandoc - URL:=http://mdocml.bsd.lv/ + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Manual pages formatter. + URL:=http://mdocml.bsd.lv/ + DEPENDS:=@BROKEN endef -define Package/mandoc/demandocription +define Package/mandoc/description mandoc (mdocml) is convertor for roff sources (mainly for manula pages) - to text, html or postscript. Use: "mandoc ma_page.1 |less" + to text, html or postscript. Use: "mandoc man_page.1 |less" endef define Package/mandoc/install diff --git a/mathomatic/Makefile b/mathomatic/Makefile index b3a38dd..85e8734 100644 --- a/mathomatic/Makefile +++ b/mathomatic/Makefile @@ -1,43 +1,43 @@ -# $Id: Makefile 2010-07-02 00:29:07Z Jirka $ - include $(TOPDIR)/rules.mk PKG_NAME:=mathomatic -PKG_VERSION:=15.1.4 -PKG_RELEASE:=3 -#http://mathomatic.org/mathomatic-15.1.4.tar.bz2 +PKG_VERSION:=15.3.4 +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.panix.com/~gesslein -PKG_MD5SUM:=a844d982bcfe120bf7987e90495f8f1e +PKG_SOURCE:=mathomatic-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://mathomatic.org +PKG_MD5SUM:=cbffaca1634cc50e227dfbcdb0c644dd PKG_CAT:=bzip2 -cd -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/mathomatic-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk define Package/mathomatic - SECTION:=utils - CATEGORY:=Utilities - TITLE:=Calc - URL:=http://www.panix.com/~gesslein/ - DEPENDS:=+libreadline + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Small computer algebra system. + URL:=http://www.mathomatic.org + DEPENDS:=+libreadline +libncurses endef define Package/mathomatic/description - Computer algebra system. + Computer algebra system. endef define Build/Configure $(call Build/Compile/Default, \ - READLINE=1\ - HANDHELD=1\ + READLINE=1\ + HANDHELD=1\ ) endef define Package/mathomatic/install $(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/mathomatic $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/m4/rmath $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/m4/functions.m4 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/m4/matho $(1)/usr/bin/ endef $(eval $(call BuildPackage,mathomatic)) diff --git a/moc/Makefile b/moc/Makefile new file mode 100644 index 0000000..4ac78b9 --- /dev/null +++ b/moc/Makefile @@ -0,0 +1,60 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +# +# Don't forget: +# +# ./scripts/feeds update +# ./scripts/feeds install iconv libcurl alsa-utils libvorbis usbutils libmad libflac libid3tag +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=moc +PKG_VERSION:=2.4.4 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=ftp://ftp.daper.net/pub/soft/moc/stable/ +PKG_MD5SUM:=647c770a5542a4ae5437386807a89796 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/moc + SECTION:=sound + CATEGORY:=Sound + DEPENDS:=+libcurl +BUILD_PATENTED:libmad +libvorbis +libncurses +libiconv +alsa-utils +libid3tag +libflac + TITLE:=Music On Console +endef + +define Package/moc/description + MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use. +endef + +TARGET_CFLAGS+= \ + -I$(STAGING_DIR)/usr/lib/libiconv/include \ + +TARGET_LDFLAGS+= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + -L$(STAGING_DIR)/usr/lib/libiconv/lib + +CONFIGURE_ARGS += \ + --without-mp3 \ + --enable-shared \ + --disable-static \ + --disable-debug + +define Package/moc/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mocp $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/lib/moc/decoder_plugins + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/moc/decoder_plugins/*.so $(1)/usr/lib/moc/decoder_plugins +endef + +$(eval $(call BuildPackage,moc)) diff --git a/mpfr/Makefile b/mpfr/Makefile new file mode 100644 index 0000000..136b60c --- /dev/null +++ b/mpfr/Makefile @@ -0,0 +1,51 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=mpfr +PKG_VERSION:=2.4.1 + +PKG_SOURCE_URL:=http://www.mpfr.org/mpfr-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_MD5SUM:=c5ee0a8ce82ad55fe29ac57edd35d09e +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk +PKG_INSTALL=1 +define Package/mpfr + TITLE:=mpfr + SECTION:=libs + CATEGORY:=Libraries + URL:=http://www.mpfr.org + DEPENDS:=+libgmp +endef + +CONFIGURE_ARGS += \ + --enable-static \ + --enable-shared + +define Build/InstallDev + $(INSTALL_DIR) \ + $(1)/usr/include \ + $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/* \ + $(1)/usr/lib/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/include/* \ + $(1)/usr/include/ +endef + +define Package/mpfr/install + $(INSTALL_DIR) \ + $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libmpfr.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,mpfr)) diff --git a/mpfr/patches/001-no_tests.patch b/mpfr/patches/001-no_tests.patch new file mode 100644 index 0000000..e1a6f05 --- /dev/null +++ b/mpfr/patches/001-no_tests.patch @@ -0,0 +1,24 @@ +diff -urN mpfr-2.4.1/Makefile.am mpfr-2.4.1.new/Makefile.am +--- mpfr-2.4.1/Makefile.am 2009-02-20 10:43:17.000000000 +0100 ++++ mpfr-2.4.1.new/Makefile.am 2009-08-20 14:59:00.000000000 +0200 +@@ -1,7 +1,7 @@ + AUTOMAKE_OPTIONS = gnu ansi2knr + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = tests ++SUBDIRS = + EXTRA_DIST = BUGS FAQ.html PATCHES VERSION get_patches.sh round_raw_generic.c gen_inverse.h jyn_asympt.c + + include_HEADERS = mpfr.h mpf2mpfr.h +diff -urN mpfr-2.4.1/Makefile.in mpfr-2.4.1.new/Makefile.in +--- mpfr-2.4.1/Makefile.in 2009-02-25 17:18:06.000000000 +0100 ++++ mpfr-2.4.1.new/Makefile.in 2009-08-20 14:58:32.000000000 +0200 +@@ -295,7 +295,7 @@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = gnu ansi2knr + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = tests ++SUBDIRS = + EXTRA_DIST = BUGS FAQ.html PATCHES VERSION get_patches.sh round_raw_generic.c gen_inverse.h jyn_asympt.c + include_HEADERS = mpfr.h mpf2mpfr.h + lib_LTLIBRARIES = libmpfr.la diff --git a/mplayer/Makefile b/mplayer/Makefile new file mode 100644 index 0000000..c10fb9e --- /dev/null +++ b/mplayer/Makefile @@ -0,0 +1,61 @@ +# +# OpenWrt +# +# This is free software, licensed under the GNU General Public License v2. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=MPlayer +PKG_VERSION:=1.0rc3 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.mplayerhq.hu/MPlayer/releases/ +PKG_MD5SUM:=0191ddb9c21620779838e53a4cca5ac1 + +include $(INCLUDE_DIR)/package.mk + +define Package/MPlayer + SECTION:=multimedia + CATEGORY:=Multimedia + TITLE:=MPlayer, the movie player + URL:=http://www.mplayerhq.hu + DEPENDS:=+libjpeg +libpng +directfb +zlib +libsdl +libfreetype +fontconfig +libiconv +libmad @BUILD_PATENTED +endef + +define Package/MPlayer/description + MPlayer is a movie player which runs on many systems. +endef + +CONFIGURE_ARGS := --target=mips \ + --disable-mencoder \ + --disable-pthreads \ + --enable-cross-compile \ + --prefix=/usr \ + --with-sdl-config=$(STAGING_DIR)/usr/bin/sdl-config \ + --with-freetype-config=$(STAGING_DIR)/host/bin/freetype-config \ + --enable-rpath \ + --extra-cflags="-I$(STAGING_DIR)/usr/include/directfb \ + -I$(STAGING_DIR)/usr/lib/libiconv/include" \ + --extra-ldflags="-L$(STAGING_DIR)/usr/lib/libiconv/lib" \ + --host-cc=gcc \ + --enable-fbdev \ + --confdir=/usr/share/mplayer \ + --enable-menu + +define Package/MPlayer/install + $(INSTALL_DIR) \ + $(1)/usr/bin \ + $(1)/usr/share/mplayer + + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/mplayer \ + $(1)/usr/bin/mplayer + $(INSTALL_DATA) \ + $(FILES_DIR)/input.conf \ + $(1)/usr/share/mplayer + +endef + +$(eval $(call BuildPackage,MPlayer)) diff --git a/mplayer/README b/mplayer/README new file mode 100644 index 0000000..f9702c8 --- /dev/null +++ b/mplayer/README @@ -0,0 +1,7 @@ +1. prepare your avi files for Ben: + +for i in $(echo "*.avi"); do /usr/bin/mencoder -o "$i.mpg" -vf scale=320:-2 -of mpeg -ovc lavc -lavcopts vcodec=mpeg1video:vpass=1:vbitrate=200 -ofps 24000/1001 -oac lavc -lavcopts acodec=mp2:abitrate=64 "$i" && /usr/bin/mencoder -o "$i.mpg" -vf scale=320:-2 -of mpeg -ovc lavc -lavcopts vcodec=mpeg1video:vpass=2:vbitrate=200 -ofps 24000/1001 -oac lavc -lavcopts acodec=mp2:abitrate=64 "$i"; done + +2. play your files with Ben: + +mplayer -vo sdl -ac mad file.mpg diff --git a/mplayer/files/input.conf b/mplayer/files/input.conf new file mode 100644 index 0000000..b332778 --- /dev/null +++ b/mplayer/files/input.conf @@ -0,0 +1,2 @@ +F12 volume -1 +F11 volume 1 diff --git a/mupdf/Makefile b/mupdf/Makefile index 9a819c5..21fae1d 100644 --- a/mupdf/Makefile +++ b/mupdf/Makefile @@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk define Package/mupdf/Default URL:=http://mupdf.com - DEPENDS:=+jbig2dec +openjpeg +zlib +libfreetype + DEPENDS:=+jbig2dec +openjpeg +zlib +libfreetype +libjpeg endef define Package/mupdf diff --git a/nanonote-example-files/Makefile b/nanonote-example-files/Makefile new file mode 100644 index 0000000..26b21ff --- /dev/null +++ b/nanonote-example-files/Makefile @@ -0,0 +1,26 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=nanonote-example-files +PKG_VERSION:=1.0 + +include $(INCLUDE_DIR)/package.mk + +define Package/nanonote-example-files + TITLE:=nanonote-example-files + SECTION:=utils + CATEGORY:=Utilities +endef + +define Package/nanonote-example-files/description + Example Music files, etc. +endef + +define Build/Compile +endef + +define Package/nanonote-example-files/install + $(INSTALL_DIR) $(1)/root/ + $(CP) ./files/* $(1)/root/ +endef + +$(eval $(call BuildPackage,nanonote-example-files))
\ No newline at end of file diff --git a/nanonote-example-files/files/Music/Camille_Saint-Saens_-_introduction_et_rondo_capriccioso,_op._28.ogg b/nanonote-example-files/files/Music/Camille_Saint-Saens_-_introduction_et_rondo_capriccioso,_op._28.ogg Binary files differnew file mode 100644 index 0000000..5e375c8 --- /dev/null +++ b/nanonote-example-files/files/Music/Camille_Saint-Saens_-_introduction_et_rondo_capriccioso,_op._28.ogg diff --git a/nanonote-example-files/files/Music/README b/nanonote-example-files/files/Music/README new file mode 100644 index 0000000..da49a15 --- /dev/null +++ b/nanonote-example-files/files/Music/README @@ -0,0 +1,2 @@ +the Music files can found at: + http://commons.wikimedia.org/wiki/File:Camille_Saint-Saens_-_introduction_et_rondo_capriccioso,_op._28.ogg diff --git a/nanoterm/Makefile b/nanoterm/Makefile new file mode 100644 index 0000000..2b80aab --- /dev/null +++ b/nanoterm/Makefile @@ -0,0 +1,41 @@ +# +# Copyright (C) 2009 Qi Hardware Inc. +# Author: Xiangfu Liu <xiangfu@sharism.cc> +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=nanoterm +PKG_VERSION:=0.2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/nterm/nanoterm/0.2/ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/nanoterm + SECTION:=utils + CATEGORY:=Utilities + SUBMENU:=Terminal + TITLE:=terminal emulator + URL:=http://nterm.sourceforge.net/ +endef + +define Package/nanoterm/description + Nanoterm is a terminal emulator with i minimal font for the Linux framebuffer +endef + +define Package/nanoterm/install + $(INSTALL_DIR) \ + $(1)/usr/bin \ + + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/nanoterm \ + $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,nanoterm))
\ No newline at end of file diff --git a/nanoterm/patches/001-change-DISTDIR-to-DESTDIR.patch b/nanoterm/patches/001-change-DISTDIR-to-DESTDIR.patch new file mode 100644 index 0000000..ce34efb --- /dev/null +++ b/nanoterm/patches/001-change-DISTDIR-to-DESTDIR.patch @@ -0,0 +1,18 @@ +diff --git a/Makefile b/Makefile +index 08ac50e..8fb6d34 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,11 +12,11 @@ distclean: clean + rm -f aclocal.m4 autoconf.h autoconf.mk config.log config.status + + install: all +- install -D -m 0755 -s --strip-program=$(STRIP) src/nanoterm $(DISTDIR)$(bindir)/nanoterm ++ install -D -m 0755 -s --strip-program=$(STRIP) src/nanoterm $(DESTDIR)$(bindir)/nanoterm + + ipkg: + rm -Rf ipkg-tmp + mkdir -p ipkg-tmp/CONTROL + cp dist/ipkg.control ipkg-tmp/CONTROL/control +- $(MAKE) DISTDIR=ipkg-tmp install ++ $(MAKE) DESTDIR=ipkg-tmp install + ipkg-build -o root -g root ipkg-tmp diff --git a/ncmpc/Makefile b/ncmpc/Makefile index 46fef70..2966a8c 100644 --- a/ncmpc/Makefile +++ b/ncmpc/Makefile @@ -9,20 +9,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ncmpc -PKG_VERSION:=0.11.1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://hem.bredband.net/kaw/ncmpc/files/ +PKG_VERSION:=0.18 +PKG_RELEASE:=1 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://downloads.sourceforge.net/musicpd/ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL:=1 - include $(INCLUDE_DIR)/package.mk TARGET_CFLAGS+= \ -I$(STAGING_DIR)/usr/lib/libintl/include \ - -I$(STAGING_DIR)/usr/libiconv/include + -I$(STAGING_DIR)/usr/libiconv/include \ + -std=gnu99 TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ @@ -33,8 +32,8 @@ define Package/ncmpc TITLE:=ncmpc SECTION:=sound CATEGORY:=Sound - DEPENDS:=+libncurses +libintl +libiconv - URL:=http://hem.bredband.net/kaw/ncmpc/index.html + DEPENDS:=+libncurses +libintl +libiconv +libmpdclient + URL:=http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki endef define Package/ncmpc/description @@ -43,7 +42,7 @@ endef define Package/ncmpc/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ncmpc $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ncmpc $(1)/usr/bin/ endef $(eval $(call BuildPackage,ncmpc)) diff --git a/ncursesw/Makefile b/ncursesw/Makefile new file mode 100644 index 0000000..79bc263 --- /dev/null +++ b/ncursesw/Makefile @@ -0,0 +1,79 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=ncurses +PKG_VERSION:=5.7 +PKG_RELEASE:=3 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@GNU/ncurses +PKG_MD5SUM:=cce05daf61a64501ef6cd8da1f727ec6 + +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/libncursesw + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Terminal handling library (Unicode) + URL:=http://www.gnu.org/software/ncurses/ + DEPENDS:=libncurses + VARIANT:=libncursesw +endef + +TARGET_CFLAGS += $(FPIC) + +CONFIGURE_ARGS += \ + --enable-echo \ + --enable-const \ + --enable-overwrite \ + --disable-rpath \ + --without-ada \ + --without-cxx \ + --without-cxx-binding \ + --without-debug \ + --without-profile \ + --without-progs \ + --with-normal \ + --with-shared \ + --with-terminfo-dirs=/usr/share/terminfo \ + --with-default-terminfo-dir=/usr/share/terminfo \ + --enable-widec \ + --with-build-cppflags=-D_GNU_SOURCE + +MAKE_FLAGS += \ + BUILD_CC="$(HOSTCC)" \ + HOSTCC="$(HOSTCC)" \ + HOSTCCFLAGS="" \ + libs + +define Build/Install/Default + $(MAKE_VARS) \ + $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ + $(MAKE_INSTALL_FLAGS) \ + $(1) install.libs install.data; +endef + +define Package/libncursesw/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.so* $(1)/usr/lib/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/ncursesw/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ncursesw/ + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.{a,so*} $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libncursesw)) diff --git a/ncursesw/patches/100-ncurses-5.6-20080112-urxvt.patch b/ncursesw/patches/100-ncurses-5.6-20080112-urxvt.patch new file mode 100644 index 0000000..39e60ba --- /dev/null +++ b/ncursesw/patches/100-ncurses-5.6-20080112-urxvt.patch @@ -0,0 +1,175 @@ +--- a/misc/terminfo.src ++++ b/misc/terminfo.src +@@ -3965,6 +3965,172 @@ rxvt-cygwin-native|rxvt terminal emulato + rxvt-16color|xterm with 16 colors like aixterm, + ncv#32, use=ibm+16color, use=rxvt, + ++# rxvt-unicode ++# http://cvs.schmorp.de/rxvt-unicode/doc/etc/rxvt-unicode.terminfo?revision=1.20 ++# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997 ++# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997 ++# Updated: Marc Lehmann <pcg@goof.com>, 17 Feb 2005 ++rxvt-unicode|rxvt-unicode terminal (X Window System), ++ am, ++ bce, ++ eo, ++ km, ++ msgr, ++ xenl, ++ hs, ++ cols#80, ++ it#8, ++ lines#24, ++ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG, ++ bel=^G, ++ blink=\E[5m, ++ bold=\E[1m, ++ civis=\E[?25l, ++ clear=\E[H\E[2J, ++ cnorm=\E[?25h, ++ cr=^M, ++ csr=\E[%i%p1%d;%p2%dr, ++ cub=\E[%p1%dD, ++ cub1=^H, ++ cud=\E[%p1%dB, ++ cud1=^J, ++ cuf=\E[%p1%dC, ++ cuf1=\E[C, ++ cup=\E[%i%p1%d;%p2%dH, ++ cuu=\E[%p1%dA, ++ cuu1=\E[A, ++ cvvis=\E[?25h, ++ dch=\E[%p1%dP, ++ dch1=\E[P, ++ dl=\E[%p1%dM, ++ dl1=\E[M, ++ ed=\E[J, ++ el=\E[K, ++ el1=\E[1K, ++ flash=\E[?5h$<20/>\E[?5l, ++ home=\E[H, ++ hpa=\E[%i%p1%dG, ++ ht=^I, ++ hts=\EH, ++ ich=\E[%p1%d@, ++ ich1=\E[@, ++ il=\E[%p1%dL, ++ il1=\E[L, ++ ind=^J, ++ is1=\E[?47l\E=\E[?1l, ++ is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, ++ kDC=\E[3$, ++ kIC=\E2$, ++ kEND=\E[8$, ++ kHOM=\E[7$, ++ kLFT=\E[d, ++ kNXT=\E[6$, ++ kPRV=\E[5$, ++ kRIT=\E[c, ++ kbs=\177, ++ ka1=\EOw, ++ ka3=\EOy, ++ kb2=\EOu, ++ kc1=\EOq, ++ kc3=\EOs, ++ kcbt=\E[Z, ++ kcub1=\E[D, ++ kcud1=\E[B, ++ kcuf1=\E[C, ++ kcuu1=\E[A, ++ kdch1=\E[3~, ++ kel=\E[8\^, ++ kend=\E[8~, ++ kent=\EOM, ++ kf1=\E[11~, ++ kf10=\E[21~, ++ kf11=\E[23~, ++ kf12=\E[24~, ++ kf13=\E[25~, ++ kf14=\E[26~, ++ kf15=\E[28~, ++ kf16=\E[29~, ++ kf17=\E[31~, ++ kf18=\E[32~, ++ kf19=\E[33~, ++ kf2=\E[12~, ++ kf20=\E[34~, ++ kf3=\E[13~, ++ kf4=\E[14~, ++ kf5=\E[15~, ++ kf6=\E[17~, ++ kf7=\E[18~, ++ kf8=\E[19~, ++ kf9=\E[20~, ++ kfnd=\E[1~, ++ khome=\E[7~, ++ kich1=\E[2~, ++ kmous=\E[M, ++ knp=\E[6~, ++ kpp=\E[5~, ++ kslt=\E[4~, ++ rc=\E8, ++ rev=\E[7m, ++ ri=\EM, ++ rmso=\E[27m, ++ rmul=\E[24m, ++ rs1=\Ec, ++ rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>, ++ sgr0=\E[m\017, ++ enacs=, ++ smacs=\E(0, ++ rmacs=\E(B, ++ smso=\E[7m, ++ smul=\E[4m, ++ tbc=\E[3g, ++ vpa=\E[%i%p1%dd, ++ colors#88, ++ pairs#256, ++ btns#5, ++ lm#0, ++ ccc, ++ npc, ++ mc5i, ++ ncv#0, ++ mir, ++ xon, ++ bw, ++ ech=\E[%p1%dX, ++ mc0=\E[i, ++ mc4=\E[4i, ++ mc5=\E[5i, ++ sitm=\E[3m, ++ ritm=\E[23m, ++ smam=\E[?7h, ++ rmam=\E[?7l, ++ smir=\E[4h, ++ rmir=\E[4l, ++ smcup=\E[?1049h, ++ rmcup=\E[r\E[?1049l, ++ smkx=\E=, ++ rmkx=\E>, ++ indn=\E[%p1%dS, ++ rin=\E[%p1%dT, ++ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, ++ op=\E[39;49m, ++ setaf=\E[38;5;%p1%dm, ++ setab=\E[48;5;%p1%dm, ++ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, ++ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, ++ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, ++ sc=\E7, ++ s0ds=\E(B, ++ s1ds=\E(0, ++ s2ds=\E*B, ++ s3ds=\E+B, ++ u6=\E[%i%d;%dR, ++ u7=\E[6n, ++ u8=\E[?1;2c, ++ u9=\E[c, ++ tsl=\E]2;, ++ fsl=\007, ++ dsl=\E]2;\007, ++ + # mrxvt 0.5.3 + # + # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff --git a/ncursesw/patches/101-ncurses-5.6-20080628-kbs.patch b/ncursesw/patches/101-ncurses-5.6-20080628-kbs.patch new file mode 100644 index 0000000..3b3abd7 --- /dev/null +++ b/ncursesw/patches/101-ncurses-5.6-20080628-kbs.patch @@ -0,0 +1,52 @@ +--- a/misc/terminfo.src ++++ b/misc/terminfo.src +@@ -3054,6 +3054,7 @@ xterm-xfree86|xterm terminal emulator (X + # This version reflects the current xterm features. + xterm-new|modern xterm terminal emulator, + npc, ++ kbs=\177, + indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, + kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE, + kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, +@@ -3818,6 +3819,7 @@ mlterm+pcfkeys|fragment for PC-style fke + rxvt-basic|rxvt terminal base (X Window System), + OTbs, am, bce, eo, mir, msgr, xenl, xon, + cols#80, it#8, lines#24, ++ kbs=\177, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l, + clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M, +@@ -3828,7 +3830,7 @@ rxvt-basic|rxvt terminal base (X Window + enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H, ht=^I, + hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, + ind=^J, is1=\E[?47l\E=\E[?1l, +- is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H, ++ is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, + kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, + rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, + rmul=\E[24m, +@@ -4541,6 +4543,7 @@ eterm|gnu emacs term.el terminal emulati + screen|VT 100/ANSI X3.64 virtual terminal, + OTbs, OTpt, am, km, mir, msgr, xenl, G0, + colors#8, cols#80, it#8, lines#24, pairs#64, ++ kbs=\177, + acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, + clear=\E[H\E[J, cnorm=\E[34h\E[?25h, cr=^M, +@@ -4550,7 +4553,7 @@ screen|VT 100/ANSI X3.64 virtual termina + cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, + dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, + flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, +- il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcbt=\E[Z, ++ il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kcbt=\E[Z, + kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, + kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, +@@ -4655,6 +4658,7 @@ screen.xterm-r6|screen customized for X1 + # on Solaris because Sun's curses implementation gets confused. + screen.teraterm|disable ncv in teraterm, + ncv#127, ++ kbs=^H, + acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376, + use=screen+fkeys, use=screen, + # Other terminals diff --git a/ncursesw/patches/500-cross.patch b/ncursesw/patches/500-cross.patch new file mode 100644 index 0000000..ace6252 --- /dev/null +++ b/ncursesw/patches/500-cross.patch @@ -0,0 +1,11 @@ +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -4298,7 +4298,7 @@ CF_EOF + EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS" + fi + CF_SHARED_SONAME +- MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' ++ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,$(LDFLAGS) -lc -o $[@]' + ;; + openbsd[[2-9]].*) + if test "$DFT_LWR_MODEL" = "shared" ; then diff --git a/ncursesw/patches/900-terminfo.patch b/ncursesw/patches/900-terminfo.patch new file mode 100644 index 0000000..7aab3db --- /dev/null +++ b/ncursesw/patches/900-terminfo.patch @@ -0,0 +1,20 @@ +--- a/misc/terminfo.src ++++ b/misc/terminfo.src +@@ -3707,12 +3707,11 @@ konsole-xf3x|KDE console window with key + # The value for kbs reflects local customization rather than the settings used + # for XFree86 xterm. + konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, +- kend=\EOF, khome=\EOH, use=konsole+pcfkeys, +- use=konsole-vt100, +-# Konsole does not implement shifted cursor-keys. +-konsole+pcfkeys|konsole subset of xterm+pcfkeys, +- kLFT@, kRIT@, kcbt=\E[Z, kind@, kri@, kDN@, kUP@, use=xterm+pcc2, +- use=xterm+pcf0, ++ kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, ++ kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, ++ kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~, ++ kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS, ++ khome=\EOH, use=konsole-vt100, + # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but + # it is still useful for deriving the other entries. + konsole-vt100|KDE console window with vt100 (sic) keyboard, diff --git a/ne/Makefile b/ne/Makefile index a7e99ae..dea6a78 100644 --- a/ne/Makefile +++ b/ne/Makefile @@ -1,5 +1,3 @@ -# -# kyak@freenode/#qi-hardware # # This is free software, licensed under the GNU General Public License v2. # diff --git a/nethack/Makefile b/nethack/Makefile new file mode 100644 index 0000000..e843bd4 --- /dev/null +++ b/nethack/Makefile @@ -0,0 +1,73 @@ +# +# Copyright (C) 2009 Qi Hardware Inc. +# Author: Xiangfu Liu <xiangfu@sharism.cc> +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=nethack +PKG_VERSION:=343 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tgz +PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/nethack/nethack/3.4.3/ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-3.4.3 + +include $(INCLUDE_DIR)/package.mk + +define Package/nethack + SECTION:=games + CATEGORY:=Games + DEPENDS:=nethack + TITLE:=single player dungeon exploration game + DEPENDS:=+libncurses +endef + +define Package/nethack/description + NetHack is a single player dungeon exploration game +endef + +TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include +TARGET_LDFLAGS+= -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Build/Prepare + $(call Build/Prepare/Default) + (mkdir -p $(PKG_BUILD_DIR)/jemarch-bin; \ + cd $(PKG_BUILD_DIR)/; \ + wget http://www.jemarch.net/downloads/nanonote/nethack-3.4.3-nanonote-bin.tar.gz; \ + tar xf nethack-3.4.3-nanonote-bin.tar.gz -C jemarch-bin/; \ + ) +endef + +define Build/Compile + (cd $(PKG_BUILD_DIR)/sys/unix; \ + sh setup.sh; \ + cd ../../; \ + export CFLAGS="${TARGET_CFLAGS}";\ + export LDFLAGS="${TARGET_LDFLAGS}";\ + export PREFIX="${PKG_INSTALL_DIR}";\ + make;\ + ) +endef + +define Package/nethack/install + $(INSTALL_DIR) \ + $(1)/usr/bin \ + $(1)/usr/lib/nethackdir + + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/src/nethack \ + $(1)/usr/lib/nethackdir/ + + $(CP) \ + $(PKG_BUILD_DIR)/jemarch-bin/nethack-3.4.3-nanonote-bin/lib/nethackdir/* + $(1)/usr/lib/nethackdir/ + + $(CP) \ + $(PKG_BUILD_DIR)/src/nethack \ + $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,nethack)) diff --git a/nethack/patches/001-nethack-3.4.3-nanonote.patch b/nethack/patches/001-nethack-3.4.3-nanonote.patch new file mode 100644 index 0000000..2c2da25 --- /dev/null +++ b/nethack/patches/001-nethack-3.4.3-nanonote.patch @@ -0,0 +1,197 @@ +diff --git a/include/config.h b/include/config.h +index 3efbfa2..4c69b32 100644 +--- a/include/config.h ++++ b/include/config.h +@@ -169,11 +169,11 @@ + + #ifdef UNIX + /* path and file name extension for compression program */ +-#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */ +-#define COMPRESS_EXTENSION ".Z" /* compress's extension */ ++// #define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */ ++// #define COMPRESS_EXTENSION ".Z" /* compress's extension */ + /* An example of one alternative you might want to use: */ +-/* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */ +-/* #define COMPRESS_EXTENSION ".gz" */ /* normal gzip extension */ ++#define COMPRESS "/bin/gzip" ++#define COMPRESS_EXTENSION ".gz" + #endif + + #ifndef COMPRESS +diff --git a/include/unixconf.h b/include/unixconf.h +index fe1b006..6038e6c 100644 +--- a/include/unixconf.h ++++ b/include/unixconf.h +@@ -37,7 +37,7 @@ + #define NETWORK /* if running on a networked system */ + /* e.g. Suns sharing a playground through NFS */ + /* #define SUNOS4 */ /* SunOS 4.x */ +-/* #define LINUX */ /* Another Unix clone */ ++#define LINUX /* Another Unix clone */ + /* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */ + /* #define GENIX */ /* Yet Another Unix Clone */ + /* #define HISX */ /* Bull Unix for XPS Machines */ +@@ -132,7 +132,7 @@ + * "extra output" method is used, but not all systems provide access to + * a fine-grained timer. + */ +-/* #define TIMED_DELAY */ /* usleep() */ ++#define TIMED_DELAY /* usleep() */ + #endif + + /* +diff --git a/sys/share/unixtty.c b/sys/share/unixtty.c +index 05b76b4..37484fa 100644 +--- a/sys/share/unixtty.c ++++ b/sys/share/unixtty.c +@@ -38,7 +38,7 @@ + # ifdef LINUX + # include <sys/ioctl.h> + # undef delay_output /* curses redefines this */ +-# include <curses.h> ++# include <ncurses.h> + # endif + # define kill_sym c_cc[VKILL] + # define erase_sym c_cc[VERASE] +diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src +index 29ad99a..3f640a3 100644 +--- a/sys/unix/Makefile.src ++++ b/sys/unix/Makefile.src +@@ -76,6 +76,8 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o unixunix.o unixres.o + # + # For cross-compiling, eg. with gcc on Linux (see also CXX further down): + # CC = arm-linux-gcc ++CC = mipsel-openwrt-linux-uclibc-gcc ++LD = mipsel-openwrt-linux-uclibc-ld + # + # + # if you're debugging and want gcc to check as much as possible, use: +@@ -151,18 +153,18 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome + # flags for debugging: + # CFLAGS = -g -I../include + +-CFLAGS = -O -I../include +-LFLAGS = ++CFLAGS += -O2 -I../include ++LFLAGS += ${LDFLAGS} + + # The Qt and Be window systems are written in C++, while the rest of + # NetHack is standard C. If using Qt, uncomment the LINK line here to get + # the C++ libraries linked in. + CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include +-CXX=g++ ++CXX=mipsel-openwrt-linux-uclibc-g++ + #LINK=g++ + # For cross-compiling, eg. with gcc on Linux (see also CC further up): + #CXX=arm-linux-g++ +-#LINK=arm-linux-gcc ++LINK=mipsel-openwrt-linux-uclibc-g++ + + # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired + # combination of windowing systems. Also set windowing systems in config.h. +@@ -230,8 +232,8 @@ WINOBJ = $(WINTTYOBJ) + # WINTTYLIB = -ltermcap + # WINTTYLIB = -lcurses + # WINTTYLIB = -lcurses16 +-# WINTTYLIB = -lncurses +-WINTTYLIB = -ltermlib ++WINTTYLIB = -lncurses ++# WINTTYLIB = -ltermlib + # + # libraries for X11 + # If USE_XPM is defined in config.h, you will also need -lXpm here. +diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top +index 2f11c35..c6b7af0 100644 +--- a/sys/unix/Makefile.top ++++ b/sys/unix/Makefile.top +@@ -14,7 +14,6 @@ + # MAKE = make + + # make NetHack +-PREFIX = /usr + GAME = nethack + # GAME = nethack.prg + GAMEUID = games +@@ -35,9 +34,9 @@ DIRPERM = 0755 + # therefore there should not be anything in GAMEDIR that you want to keep + # (if there is, you'll have to do the installation by hand or modify the + # instructions) +-GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir ++GAMEDIR = $(PREFIX)/lib/$(GAME)dir + VARDIR = $(GAMEDIR) +-SHELLDIR = $(PREFIX)/games ++SHELLDIR = $(PREFIX) + + # per discussion in Install.X11 and Install.Qt + VARDATND = +@@ -238,7 +237,7 @@ install: $(GAME) recover $(VARDAT) dungeon spec_levs + -mkdir -p $(GAMEDIR) $(VARDIR) $(VARDIR)/save + -rmdir ./-p + -$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save +- $(CHGRP) $(GAMEGRP) $(GAMEDIR) $(VARDIR) $(VARDIR)/save ++ -$(CHGRP) $(GAMEGRP) $(GAMEDIR) $(VARDIR) $(VARDIR)/save + chmod $(DIRPERM) $(GAMEDIR) $(VARDIR) $(VARDIR)/save + # set up the game files + ( $(MAKE) dofiles ) +diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl +index e2936a8..69369cf 100644 +--- a/sys/unix/Makefile.utl ++++ b/sys/unix/Makefile.utl +@@ -27,6 +27,8 @@ + # + # For HP/UX 10.20 with GCC: + # CC = gcc -D_POSIX_SOURCE ++CC = mipsel-openwrt-linux-uclibc-gcc ++CXX = mipsel-openwrt-linux-uclibc-g++ + # + # if your make doesn't define a default SHELL properly, you may need + # the line below (Atari users will need a bourne work-alike) +@@ -95,7 +97,7 @@ LFLAGS = + LIBS = + + # If you are cross-compiling, you must use this: +-#OBJDIR = . ++OBJDIR = . + # otherwise, you can save a little bit of disk space with this: + OBJDIR = ../src + +@@ -175,7 +177,7 @@ YACCDIST = + # dependencies for makedefs + # + makedefs: $(MAKEOBJS) +- $(CC) $(LFLAGS) -o makedefs $(MAKEOBJS) ++ gcc $(LFLAGS) -o makedefs -I../include makedefs.c ../src/monst.c ../src/objects.c + + makedefs.o: makedefs.c $(CONFIG_H) ../include/permonst.h \ + ../include/objclass.h ../include/monsym.h \ +@@ -210,7 +212,7 @@ panic.o: panic.c $(CONFIG_H) + # dependencies for lev_comp + # + lev_comp: $(SPLEVOBJS) +- $(CC) $(LFLAGS) -o lev_comp $(SPLEVOBJS) $(LIBS) ++ gcc -o lev_comp lev_yacc.c lev_lex.c lev_main.c $(CALLOC) $(CNAMING) -I../include + + lev_yacc.o: lev_yacc.c $(HACK_H) ../include/sp_lev.h + lev_main.o: lev_main.c $(HACK_H) ../include/sp_lev.h ../include/tcap.h \ +@@ -243,7 +245,7 @@ lintlev: + # dependencies for dgn_comp + # + dgn_comp: $(DGNCOMPOBJS) +- $(CC) $(LFLAGS) -o dgn_comp $(DGNCOMPOBJS) $(LIBS) ++ gcc $(LFLAGS) -o dgn_comp dgn_yacc.c dgn_lex.c dgn_main.c $(CALLOC) -I../include $(LIBS) + + dgn_yacc.o: dgn_yacc.c $(CONFIG_H) ../include/dgn_file.h ../include/date.h + dgn_main.o: dgn_main.c $(CONFIG_H) ../include/dlb.h +diff --git a/sys/unix/nethack.sh b/sys/unix/nethack.sh +index 600e1da..ca7e7f4 100644 +--- a/sys/unix/nethack.sh ++++ b/sys/unix/nethack.sh +@@ -1,7 +1,7 @@ + #!/bin/sh + # SCCS Id: @(#)nethack.sh 3.4 1990/02/26 + +-HACKDIR=/usr/games/lib/nethackdir ++HACKDIR=`pwd`/lib/nethackdir + export HACKDIR + HACK=$HACKDIR/nethack + MAXNROFPLAYERS=4 diff --git a/netsurf/Makefile b/netsurf/Makefile new file mode 100644 index 0000000..2dc40de --- /dev/null +++ b/netsurf/Makefile @@ -0,0 +1,55 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. + +include $(TOPDIR)/rules.mk + +PKG_NAME:=netsurf +PKG_VERSION:=r10948 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.netsurf-browser.org/downloads/development/ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/netsurf + SUBMENU:=Web + SECTION:=network + CATEGORY:=Network + TITLE:=netsurf + URL:=http://www.netsurf-browser.org/ + DEPENDS:=+libsdl +libcss +libhubbub +libparserutils +libnsfb +libxml2 +libcurl +libfreetype +endef + +define Package/netsurf/description + NetSurf is a free, open source web browser. It is written in C and released under the GNU Public Licence version 2. NetSurf has its own layout and rendering engine entirely written from scratch. It is small and capable of handling many of the web standards in use today. +endef + +MAKE_FLAGS += "TARGET=framebuffer" \ + "PREFIX=/usr" + +TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/SDL +TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Build/Prepare + $(call Build/Prepare/Default) + $(CP) $(FILES_DIR)/Makefile.config $(PKG_BUILD_DIR) +endef + +define Package/netsurf/install + $(INSTALL_DIR) \ + $(1)/usr/bin $(1)/usr/share/netsurf + + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/netsurf \ + $(1)/usr/bin/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/netsurf/* \ + $(1)/usr/share/netsurf/ +endef + +$(eval $(call BuildPackage,netsurf)) diff --git a/netsurf/files/Makefile.config b/netsurf/files/Makefile.config new file mode 100644 index 0000000..1ae1e7c --- /dev/null +++ b/netsurf/files/Makefile.config @@ -0,0 +1,29 @@ +# +# NetSurf build configuration example +# +# +# To configure NetSurf's build options create a Makefile.config file. This is +# an example Makefile.config. +# +# To see the available config options, look at Makefile.defaults + + +# For example, by default, NetSurf builds with BMP support. If you +# wish to disable this, then uncomment the following line. + +override NETSURF_USE_BMP := NO +override NETSURF_USE_GIF := NO +override NETSURF_USE_MNG := NO +override NETSURF_FB_FONTLIB := freetype + + # freetype compiled in font locations +override NETSURF_FB_FONT_SANS_SERIF := /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +override NETSURF_FB_FONT_SANS_SERIF_BOLD := /usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf +override NETSURF_FB_FONT_SANS_SERIF_ITALIC := /usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf +override NETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD := /usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf +override NETSURF_FB_FONT_SERIF := /usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf +override NETSURF_FB_FONT_SERIF_BOLD := /usr/share/fonts/ttf-dejavu/DejaVuSerif-Bold.ttf +override NETSURF_FB_FONT_MONOSPACE := /usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf +override NETSURF_FB_FONT_MONOSPACE_BOLD := /usr/share/fonts/ttf-dejavu/DejaVuSansMono-Bold.ttf +override NETSURF_FB_FONT_CURSIVE := /usr/share/fonts/msttcorefonts/Comic_Sans_MS.ttf +override NETSURF_FB_FONT_FANTASY := /usr/share/fonts/msttcorefonts/Impact.ttf diff --git a/nightsky/Makefile b/nightsky/Makefile index 1fef628..610d369 100644 --- a/nightsky/Makefile +++ b/nightsky/Makefile @@ -54,4 +54,9 @@ define Package/nightsky/install endef +define Package/nightsky/postinst +#! /bin/sh +cp $${IPKG_INSTROOT}/usr/share/nightsky/example-nightsky.yml $${IPKG_INSTROOT}/root/.nightsky.yml +endef + $(eval $(call BuildPackage,nightsky)) diff --git a/nlove/Makefile b/nlove/Makefile index 6328b0a..fb5deb7 100755 --- a/nlove/Makefile +++ b/nlove/Makefile @@ -1,12 +1,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nlove -PKG_VERSION:=0.0.2 +PKG_REV:=464 +PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://dl.dropbox.com/u/440010/nlove/ -PKG_CAT:=zcat +PKG_SOURCE_URL:=https://bitbucket.org/bartbes/nlove +PKG_SOURCE_PROTO:=hg +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -16,7 +19,7 @@ define Package/nlove SECTION:=games CATEGORY:=Games TITLE:=LÖVE - DEPENDS:=+libphysfs +libsdl +libsdl-image +libsdl-gfx +libsdl-mixer +lua + DEPENDS:=+libphysfs +libsdl +libsdl-image +libsdl-gfx +libsdl-mixer +lua +libvorbisidec URL:=http://bartbes.ath.cx/ endef @@ -25,40 +28,19 @@ define Package/nlove/description endef define Build/Configure - (cd $(PKG_BUILD_DIR);\ - IN_OPENWRT=1 \ - AR="$(TARGET_CROSS)ar" \ - AS="$(TARGET_CC) -c $(TARGET_CFLAGS) $(TARGET_COPTS)" \ - LD="$(TARGET_CROSS)ld" \ - NM="$(TARGET_CROSS)nm" \ - CC="$(TARGET_CC)" \ - GCC="$(TARGET_CC)" \ - CXX="$(TARGET_CROSS)g++" \ - RANLIB="$(TARGET_CROSS)ranlib" \ - STRIP="$(TARGET_CROSS)strip" \ - OBJCOPY="$(TARGET_CROSS)objcopy" \ - OBJDUMP="$(TARGET_CROSS)objdump" \ - TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \ - TARGET_CFLAGS="$(TARGET_CFLAGS) $(TARGET_COPTS)" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ - STAGING_DIR="$(STAGING_DIR)" \ - CFLAGS="-fhonour-copts -std=gnu99" \ - CXXFLAGS="-fhonour-copts" \ - cmake . -DCMAKE_CXX_FLAGS=-g);$ endef define Build/Compile - (cd $(PKG_BUILD_DIR); \ - CFLAGS="-fhonour-copts --std=gnu99" \ - CXXFLAGS="-fhonour-copts --std=gnu99" \ - make);$ + (cd $(PKG_BUILD_DIR);\ + STAGING_DIR="$(STAGING_DIR)" \ + CFLAGS="-fhonour-copts -std=gnu99" \ + PLATFORM="NanoNote" \ + platform/nlove/build.sh);$ endef define Package/nlove/install - $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/liblove.so $(1)/usr/lib/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/nlove $(1)/usr/bin/ endef diff --git a/nlove/patches/001-c99.patch b/nlove/patches/001-c99.patch new file mode 100644 index 0000000..9103164 --- /dev/null +++ b/nlove/patches/001-c99.patch @@ -0,0 +1,10 @@ +--- nlove/src/common/runtime.h 2010-08-10 13:31:20.000000000 +0200 ++++ nlovem/src/common/runtime.h 2010-08-10 13:42:15.000000000 +0200 +@@ -25,6 +25,7 @@ + #include "types.h" + + // Lua ++#define __STDC_VERSION__ 199901L + extern "C" { + #include <lua.h> + #include <lualib.h> diff --git a/nlove/patches/001-cmake.patch b/nlove/patches/001-cmake.patch deleted file mode 100644 index a0c4967..0000000 --- a/nlove/patches/001-cmake.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- sdltest-2.2.0/CMakeLists.txt 2010-08-04 11:50:25.000000000 +0200 -+++ sdltest-2.2.0m/CMakeLists.txt 2010-08-04 12:23:43.000000000 +0200 -@@ -1,13 +1,13 @@ - cmake_minimum_required (VERSION 2.8) - --set(PHYSFS_INCLUDE /usr/include/) --set(PHYSFS_LIBRARY physfs) --set(LUA_INCLUDE /usr/include/lua5.1) --set(LUA_LIBRARY lua5.1) --set(SDL_INCLUDE /usr/include/SDL) --set(SDL_LIBRARY SDL SDL_image SDL_gfx SDL_mixer) --set(FREETYPE_INCLUDE /usr/include/freetype2) --set(FREETYPE_LIBRARY freetype) -+set(PHYSFS_INCLUDE $ENV{STAGING_DIR}/usr/include/) -+set(PHYSFS_LIBRARY $ENV{STAGING_DIR}/usr/lib/libphysfs.so) -+set(LUA_INCLUDE $ENV{STAGING_DIR}/usr/include/lua) -+set(LUA_LIBRARY $ENV{STAGING_DIR}/usr/lib/liblua.so crypt) -+set(SDL_INCLUDE $ENV{STAGING_DIR}/usr/include/SDL) -+set(SDL_LIBRARY $ENV{STAGING_DIR}/usr/lib/libSDL.so $ENV{STAGING_DIR}/usr/lib/libSDL_image.so $ENV{STAGING_DIR}/usr/lib/libSDL_gfx.so $ENV{STAGING_DIR}/usr/lib/libSDL_mixer.so) -+set(FREETYPE_INCLUDE $ENV{STAGING_DIR}/usr/include/freetype2) -+set(FREETYPE_LIBRARY $ENV{STAGING_DIR}/usr/lib/libfreetype.so) - - include_directories(${PHYSFS_INCLUDE} ${LUA_INCLUDE} ${SDL_INCLUDE} $(FREETYPE_INCLUDE}) - include_directories(".") diff --git a/nlove/patches/002-deviceconfig.patch b/nlove/patches/002-deviceconfig.patch deleted file mode 100644 index 20c85bb..0000000 --- a/nlove/patches/002-deviceconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- sdltest-2.1.0/common/config.h 2010-08-04 11:41:07.000000000 +0200 -+++ sdltest-2.1.0m/common/config.h 2010-08-10 15:09:02.000000000 +0200 -@@ -35,6 +35,8 @@ - # define LOVE_MACOS 1 - #endif - -+#define LOVE_LINUX 1 -+ - // Endianness. - #if defined(__i386__) || defined(__i386) - # define LOVE_LITTLE_ENDIAN 1 -@@ -43,6 +45,8 @@ - # define LOVE_BIG_ENDIAN 1 - #endif - -+#define LOVE_LITTLE_ENDIAN 1 -+ - // Warnings. - #ifndef _CRT_SECURE_NO_WARNINGS - # define _CRT_SECURE_NO_WARNINGS diff --git a/nlove/patches/003-c99.patch b/nlove/patches/003-c99.patch deleted file mode 100644 index 9d0042a..0000000 --- a/nlove/patches/003-c99.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- sdltest-2.1.0/common/runtime.h 2010-08-10 13:31:20.000000000 +0200 -+++ sdltest-2.1.0m/common/runtime.h 2010-08-10 13:42:15.000000000 +0200 -@@ -25,6 +25,7 @@ - #include "types.h" - - // Lua -+#define __STDC_VERSION__ 199901L - extern "C" { - #include <lua.h> - #include <lualib.h> diff --git a/nupdf/Makefile b/nupdf/Makefile new file mode 100644 index 0000000..d6b4f2d --- /dev/null +++ b/nupdf/Makefile @@ -0,0 +1,58 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=nupdf +PKG_RELEASE:=1 +PKG_REV:=15 +PKG_VERSION:=r$(PKG_REV) +PKG_SOURCE_URL:=http://nupdf.googlecode.com/svn/trunk/ +PKG_SOURCE_PROTO:=svn +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(INCLUDE_DIR)/package.mk + +define Package/nupdf + SECTION:=utils + CATEGORY:=Utilities + TITLE:=relatively fast pdf reader in SDL + URL:=http://code.google.com/p/nupdf/ + DEPENDS:=+libsdl +endef + +define Package/nupdf/description + nupdf is a relatively fast pdf reader; it uses the mupdf library to render pages/handle files, and SDL for the UI +endef + +TARGET_CFLAGS += \ + -I$(STAGING_DIR)/usr/include + +TARGET_LDFLAGS += \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + -ldl -lSDL -lmupdf -lfitz -lfitzdraw \ + -lcmaps -lfonts -lfreetype -lpthread \ + -lm -ljpeg -lz + +define Build/Compile + $(TARGET_CC) $(PKG_BUILD_DIR)/*.c -o $(PKG_BUILD_DIR)/nupdf $(TARGET_CFLAGS) -L$(PKG_BUILD_DIR) $(TARGET_LDFLAGS) +endef + +define Package/nupdf/install + $(INSTALL_DIR) \ + $(1)/usr/bin $(1)/usr/share/nupdf + + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/nupdf $(1)/usr/share/nupdf/nupdf.bin + + $(INSTALL_BIN) \ + $(FILES_DIR)/nupdf.sh $(1)/usr/bin/nupdf + + $(CP) \ + $(PKG_BUILD_DIR)/{data,config} $(1)/usr/share/nupdf +endef + +$(eval $(call BuildPackage,nupdf)) diff --git a/nupdf/files/nupdf.sh b/nupdf/files/nupdf.sh new file mode 100644 index 0000000..25b6d1a --- /dev/null +++ b/nupdf/files/nupdf.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ "${1#/}" = "$1" ]; +then + f=`pwd`/$1; +else + f=$1; +fi; + +cd /usr/share/nupdf +./nupdf.bin "$f" diff --git a/nupdf/patches/001-r15-bracket.patch b/nupdf/patches/001-r15-bracket.patch new file mode 100644 index 0000000..a0d6634 --- /dev/null +++ b/nupdf/patches/001-r15-bracket.patch @@ -0,0 +1,11 @@ +--- nupdf-15.orig/main.c 2010-10-22 16:44:51.033676255 +0400 ++++ nupdf-r15/main.c 2010-10-22 17:13:33.777676124 +0400 +@@ -457,7 +457,7 @@ + strcpy(arrows[i], ""); + } + +- ++ } + sprintf(settingstext, "\t\t\tSettings\t%s\n\n" + "Jump to page %i\t%s\n\n" + "Return\t%s" diff --git a/octave/Makefile b/octave/Makefile new file mode 100644 index 0000000..e24d0fe --- /dev/null +++ b/octave/Makefile @@ -0,0 +1,108 @@ +# +# Copyright (C) 2011 David Kuehling <dvdkhlng TA gmx TOD de> +# +# License GPLv2 or later. NO WARRANTY. +# +# OpenWRT package for the GNU Octave + +include $(TOPDIR)/rules.mk + +PKG_NAME:=octave +PKG_VERSION:=3.2.4 +PKG_RELEASE:=1 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://ftp.octave.org/pub/octave/ +PKG_MD5SUM:=90c39fa9e241ad2e978bcee4682a2ba9 +PKG_INSTALL:=1 +PKG_FIXUP:=libtool + +PKG_BUILD_DEPENDS:= libtool/host @INSTALL_GFORTRAN + +#include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +# todo: graphicsmagick package from multimedia feed is not complete. We need +# the Magick++ library and the Magick++-config script installed. +define Package/octave/Default + SUBMENU:=Octave + SECTION:=lang + CATEGORY:=Languages + DEPENDS:= +libltdl +zlib +libpcre +libncurses +libreadline +libgfortran \ + +octave-data +#+fftw3 +#+GraphicsMagick + + TITLE:=GNU Octave + URL:=http://www.gnu.org/software/octave/ + SUBMENU:=Octave +endef + +define Package/octave/Default/description +GNU Octave is a high-level language, primarily intended for numerical +computations. It provides a convenient command line interface for solving +linear and nonlinear problems numerically, and for performing other numerical +experiments using a language that is mostly compatible with Matlab. It may +also be used as a batch-oriented language. +endef + +define Package/octave +$(call Package/octave/Default) + DEPENDS:=+octave-data + TITLE+= (executable) +endef + +define Package/octave/description +$(call Package/octave/Default/description) + This package contains the Octave executable files +endef + +define Package/octave-data +$(call Package/octave/Default) + TITLE+= (function files) +endef + +define Package/octave-data/description +$(call Package/octave/Default/description) + This package contains the platform-independant .m-files. +endef + +# fftw contains a lots of code. not much use for soft-float anyways. try to +# keep memory low and go without fftw (using smaller fftpack instead). +# todo: verify how much RAM that actually safes +# todo : need -enable-rpath? +CONFIGURE_ARGS += --without-x --without-fftw +#MAKE_FLAGS += "LD=$(TARGET_CROSS)gcc -nostdlib" + +define Build/Configure + $(call Build/Configure/Default) +endef + +define Build/Compile + $(call Build/Compile/Default,-j2) +endef + +define Build/Install + $(call Build/Install/Default) +# $(INSTALL_DATA) ./files/... $(PKG_INSTALL_DIR)/usr/share/octave/ +endef + +define Package/octave/install + $(INSTALL_DIR) $(1)/usr + cp -r $(PKG_INSTALL_DIR)/usr/{bin,lib} $(1)/usr +endef + +define Package/octave-data/install + $(INSTALL_DIR) $(1)/ + (cd $(PKG_INSTALL_DIR)/ && tar -cf - usr/share) \ + | (cd $(1)/ && tar -xvf -) +endef + +#$(eval $(call HostBuild)) +$(eval $(call BuildPackage,octave)) +$(eval $(call BuildPackage,octave-data)) + + +# The following comments configure the Emacs editor. Just ignore them. +# Local Variables: +# compile-command: "make -C ~/h/src/qi/openwrt-xburst package/octave/compile -j2 V=99" +# End: diff --git a/octave/patches/010-configure.patch b/octave/patches/010-configure.patch new file mode 100644 index 0000000..e824986 --- /dev/null +++ b/octave/patches/010-configure.patch @@ -0,0 +1,2822 @@ +Index: octave-3.2.4/aclocal.m4 +=================================================================== +--- octave-3.2.4.orig/aclocal.m4 2011-01-02 13:17:05.000000000 +0100 ++++ octave-3.2.4/aclocal.m4 2011-01-02 13:25:56.000000000 +0100 +@@ -109,7 +109,8 @@ + struct tm t; + char *q = strptime ("09/13", "%m/%d/%y", &t); + return q ? 1 : 0; +-]])], [octave_cv_strptime_broken=no], [octave_cv_strptime_broken=yes])]) ++]])], [octave_cv_strptime_broken=no], [octave_cv_strptime_broken=yes], ++[octave_cv_strptime_broken=yes])]) + if test $octave_cv_strptime_broken = yes; then + AC_DEFINE(OCTAVE_HAVE_BROKEN_STRPTIME, 1, [Define if strptime is broken on your system]) + fi +@@ -1386,7 +1387,8 @@ + ]])], + [AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_FAST_INT_OPS,1,[Define if signed integers use two's complement])], +-[AC_MSG_RESULT([no])]) ++[AC_MSG_RESULT([no])], ++[AC_MSG_RESULT([guessing no])]) + AC_LANG_POP(C++)]) + dnl + dnl Check to see if the compiler and the linker can handle the flags +Index: octave-3.2.4/configure +=================================================================== +--- octave-3.2.4.orig/configure 2011-01-02 13:17:12.000000000 +0100 ++++ octave-3.2.4/configure 2011-01-02 13:26:05.000000000 +0100 +@@ -1,12 +1,14 @@ + #! /bin/sh + # From configure.in Revision: 1.603 . + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64. ++# Generated by GNU Autoconf 2.67. ++# + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software + # Foundation, Inc. + # ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## -------------------- ## +@@ -315,7 +317,7 @@ + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -355,19 +357,19 @@ + fi # as_fn_arith + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -525,10 +527,11 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +-exec 7<&0 </dev/null 6>&1 ++test -n "$DJDIR" || exec 7<&0 </dev/null ++exec 6>&1 + + # Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +@@ -937,8 +940,9 @@ + fi + + case $ac_option in +- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *) ac_optarg=yes ;; ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. +@@ -983,7 +987,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1009,7 +1013,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1213,7 +1217,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1229,7 +1233,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1259,8 +1263,8 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) as_fn_error "unrecognized option: \`$ac_option' +-Try \`$0 --help' for more information." ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" + ;; + + *=*) +@@ -1268,7 +1272,7 @@ + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) +- as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; +@@ -1286,13 +1290,13 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- as_fn_error "missing argument to $ac_option" ++ as_fn_error $? "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1315,7 +1319,7 @@ + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1329,8 +1333,8 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used." >&2 ++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1345,9 +1349,9 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- as_fn_error "working directory cannot be determined" ++ as_fn_error $? "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- as_fn_error "pwd does not report name of working directory" ++ as_fn_error $? "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1386,11 +1390,11 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1430,7 +1434,7 @@ + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking...' messages ++ -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files +@@ -1549,7 +1553,7 @@ + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a + nonstandard directory <lib dir> + LIBS libraries to pass to the linker, e.g. -l<library> +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if + you have headers in a nonstandard directory <include dir> + CPP C preprocessor + CXX C++ compiler command +@@ -1641,9 +1645,9 @@ + if $ac_init_version; then + cat <<\_ACEOF + configure +-generated by GNU Autoconf 2.64 ++generated by GNU Autoconf 2.67 + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1688,7 +1692,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile + +@@ -1713,7 +1717,7 @@ + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : +@@ -1725,7 +1729,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp + +@@ -1737,10 +1741,10 @@ + ac_fn_c_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + fi + eval ac_res=\$$3 +@@ -1776,7 +1780,7 @@ + else + ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 + $as_echo "$ac_header_preproc" >&6; } + +@@ -1803,7 +1807,7 @@ + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=\$ac_header_compiler" +@@ -1854,7 +1858,7 @@ + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_run + +@@ -1867,7 +1871,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2063,7 +2067,7 @@ + + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_compute_int + +@@ -2101,7 +2105,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_compile + +@@ -2126,7 +2130,7 @@ + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : +@@ -2138,7 +2142,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_cpp + +@@ -2184,7 +2188,7 @@ + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_link + +@@ -2230,7 +2234,7 @@ + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_link + +@@ -2242,7 +2246,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2309,10 +2313,10 @@ + ac_fn_cxx_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + fi + eval ac_res=\$$3 +@@ -2348,7 +2352,7 @@ + else + ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 + $as_echo "$ac_header_preproc" >&6; } + +@@ -2375,7 +2379,7 @@ + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=\$ac_header_compiler" +@@ -2422,7 +2426,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_f77_try_compile + +@@ -2468,7 +2472,7 @@ + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_f77_try_link + +@@ -2510,7 +2514,7 @@ + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_f77_try_run + +@@ -2523,7 +2527,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=no" +@@ -2622,19 +2626,22 @@ + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_run + +-# ac_fn_cxx_check_decl LINENO SYMBOL VAR +-# -------------------------------------- +-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. ++# ac_fn_cxx_check_decl LINENO SYMBOL VAR INCLUDES ++# ----------------------------------------------- ++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR ++# accordingly. + ac_fn_cxx_check_decl () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 +-$as_echo_n "checking whether $2 is declared... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ as_decl_name=`echo $2|sed 's/ *(.*//'` ++ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 ++$as_echo_n "checking whether $as_decl_name is declared... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2651,8 +2658,12 @@ + int + main () + { +-#ifndef $2 +- (void) $2; ++#ifndef $as_decl_name ++#ifdef __cplusplus ++ (void) $as_decl_use; ++#else ++ (void) $as_decl_name; ++#endif + #endif + + ; +@@ -2681,7 +2692,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2748,15 +2759,18 @@ + + } # ac_fn_cxx_check_func + +-# ac_fn_c_check_decl LINENO SYMBOL VAR +-# ------------------------------------ +-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. ++# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES ++# --------------------------------------------- ++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR ++# accordingly. + ac_fn_c_check_decl () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 +-$as_echo_n "checking whether $2 is declared... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ as_decl_name=`echo $2|sed 's/ *(.*//'` ++ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 ++$as_echo_n "checking whether $as_decl_name is declared... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2773,8 +2787,12 @@ + int + main () + { +-#ifndef $2 +- (void) $2; ++#ifndef $as_decl_name ++#ifdef __cplusplus ++ (void) $as_decl_use; ++#else ++ (void) $as_decl_name; ++#endif + #endif + + ; +@@ -2804,7 +2822,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 + $as_echo_n "checking for $2.$3... " >&6; } +-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$4+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2872,7 +2890,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + $ $0 $@ + +@@ -2982,11 +3000,9 @@ + { + echo + +- cat <<\_ASBOX +-## ---------------- ## ++ $as_echo "## ---------------- ## + ## Cache variables. ## +-## ---------------- ## +-_ASBOX ++## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, + ( +@@ -3020,11 +3036,9 @@ + ) + echo + +- cat <<\_ASBOX +-## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## +-## ----------------- ## +-_ASBOX ++## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do +@@ -3037,11 +3051,9 @@ + echo + + if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## ++ $as_echo "## ------------------- ## + ## File substitutions. ## +-## ------------------- ## +-_ASBOX ++## ------------------- ##" + echo + for ac_var in $ac_subst_files + do +@@ -3055,11 +3067,9 @@ + fi + + if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## ++ $as_echo "## ----------- ## + ## confdefs.h. ## +-## ----------- ## +-_ASBOX ++## ----------- ##" + echo + cat confdefs.h + echo +@@ -3114,7 +3124,12 @@ + ac_site_file1=NONE + ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in #(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac + elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +@@ -3125,18 +3140,22 @@ + for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do + test "x$ac_site_file" = xNONE && continue +- if test -r "$ac_site_file"; then ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +@@ -3205,7 +3224,7 @@ + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 + $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + fi + ## -------------------- ## + ## Main body of script. ## +@@ -3226,16 +3245,22 @@ + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- for ac_t in install-sh install.sh shtool; do +- if test -f "$ac_dir/$ac_t"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/$ac_t -c" +- break 2 +- fi +- done ++ if test -f "$ac_dir/install-sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install-sh -c" ++ break ++ elif test -f "$ac_dir/install.sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install.sh -c" ++ break ++ elif test -f "$ac_dir/shtool"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break ++ fi + done + if test -z "$ac_aux_dir"; then +- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -3249,7 +3274,7 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 ++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +@@ -3260,16 +3285,16 @@ + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -3294,7 +3319,7 @@ + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +@@ -3302,7 +3327,7 @@ + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -3651,8 +3676,8 @@ + + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "no acceptable C compiler found in \$PATH +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5 ; } + + # Provide some information about the compiler. + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +@@ -3673,32 +3698,30 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <stdio.h> ++ + int + main () + { +-FILE *f = fopen ("conftest.out", "w"); +- return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: +@@ -3760,62 +3783,28 @@ + else + ac_file='' + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } + if test -z "$ac_file"; then : +- $as_echo "$as_me: failed program was:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "C compiler cannot create executables +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5 ; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } +- fi +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } + if { { ac_try="$ac_link" +@@ -3845,16 +3834,75 @@ + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5 ; } + fi +-rm -f conftest$ac_cv_exeext ++rm -f conftest conftest$ac_cv_exeext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdio.h> ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details" "$LINENO" 5 ; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } + if test "${ac_cv_objext+set}" = set; then : +@@ -3897,8 +3945,8 @@ + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +@@ -4161,7 +4209,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -4177,11 +4225,11 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -4220,7 +4268,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -4236,18 +4284,18 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -4308,7 +4356,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP +@@ -4374,7 +4422,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -4506,8 +4554,7 @@ + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -4596,7 +4643,7 @@ + esac + ;; + no) +- as_fn_error "You are required to define a path separation character" "$LINENO" 5 ++ as_fn_error $? "You are required to define a path separation character" "$LINENO" 5 + ;; + *) + sepchar=$with_sepchar +@@ -4743,9 +4790,8 @@ + if test "$ac_cv_type_void_p" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (void *) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (void *) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_void_p=0 + fi +@@ -4777,9 +4823,8 @@ + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (int) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (int) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_int=0 + fi +@@ -4811,9 +4856,8 @@ + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (long) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (long) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_long=0 + fi +@@ -5001,8 +5045,8 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -5166,7 +5210,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -5182,11 +5226,11 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -5225,7 +5269,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -5241,18 +5285,18 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -5269,7 +5313,7 @@ + + case "$gxx_version" in + 1.* | 2.[0123456789].* | 3.[01234].*) +- as_fn_error "g++ version $gxx_version will probably fail to compile Octave ++ as_fn_error $? "g++ version $gxx_version will probably fail to compile Octave + " "$LINENO" 5 + ;; + esac +@@ -5760,8 +5804,8 @@ + + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "no acceptable C compiler found in \$PATH +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5 ; } + + # Provide some information about the compiler. + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +@@ -5782,8 +5826,8 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -6042,7 +6086,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -6058,11 +6102,11 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -6101,7 +6145,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -6117,18 +6161,18 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -6670,7 +6714,7 @@ + have_x=disabled + else + case $x_includes,$x_libraries in #( +- *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( ++ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +@@ -6688,7 +6732,7 @@ + @echo libdir='${LIBDIR}' + _ACEOF + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then +- # GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++ # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done +@@ -6774,7 +6818,7 @@ + fi + done + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + fi # $ac_x_includes = no + + if test "$ac_x_libraries" = no; then +@@ -7045,7 +7089,7 @@ + ac_safe=`echo "-mieee-fp" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -mieee-fp" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -mieee-fp... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7110,7 +7154,7 @@ + ac_safe=`echo "-mieee-fp" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -mieee-fp" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -mieee-fp... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7177,7 +7221,7 @@ + ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -mieee" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -mieee... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7236,7 +7280,7 @@ + ac_safe=`echo "-ieee" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -ieee" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -ieee... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7296,7 +7340,7 @@ + ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -mieee" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -mieee... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7355,7 +7399,7 @@ + ac_safe=`echo "-ieee" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -ieee" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -ieee... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7416,7 +7460,7 @@ + ac_safe=`echo "-mminimal-toc" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -mminimal-toc" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -mminimal-toc... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7472,7 +7516,7 @@ + ac_safe=`echo "-mminimal-toc" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -mminimal-toc" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -mminimal-toc... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -8064,7 +8108,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$zlib_lib''_gzclearerr" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzclearerr in -l$zlib_lib" >&5 + $as_echo_n "checking for gzclearerr in -l$zlib_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8099,8 +8143,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + for ac_header in zlib.h + do : +@@ -8150,7 +8193,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$hdf5_lib''_H5Pcreate" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Pcreate in -l$hdf5_lib" >&5 + $as_echo_n "checking for H5Pcreate in -l$hdf5_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8185,8 +8228,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + for ac_header in hdf5.h + do : +@@ -8202,7 +8244,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$hdf5_lib''_H5Gget_num_objs" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Gget_num_objs in -l$hdf5_lib" >&5 + $as_echo_n "checking for H5Gget_num_objs in -l$hdf5_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8237,8 +8279,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether HDF5 library has required API" >&5 +@@ -8514,8 +8555,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -8523,7 +8563,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$glpk_lib''_glp_lpx_simplex" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glp_lpx_simplex in -l$glpk_lib" >&5 + $as_echo_n "checking for glp_lpx_simplex in -l$glpk_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8558,8 +8598,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + GLPK_LIBS="-l$glpk_lib" + +@@ -8570,7 +8609,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$glpk_lib''__glp_lpx_simplex" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _glp_lpx_simplex in -l$glpk_lib" >&5 + $as_echo_n "checking for _glp_lpx_simplex in -l$glpk_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8605,8 +8644,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + GLPK_LIBS="-l$glpk_lib" + fi +@@ -8655,7 +8693,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$curl_lib''_curl_easy_escape" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_escape in -l$curl_lib" >&5 + $as_echo_n "checking for curl_easy_escape in -l$curl_lib... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8690,8 +8728,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + + for ac_header in curl/curl.h + do : +@@ -8936,8 +8973,7 @@ + #endif + + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -8951,8 +8987,7 @@ + #endif + + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -9324,8 +9359,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -9336,8 +9370,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -9699,7 +9732,7 @@ + ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_f77_compiler_gnu + if test -n "$ac_tool_prefix"; then +- for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +@@ -9743,7 +9776,7 @@ + fi + if test -z "$F77"; then + ac_ct_F77=$F77 +- for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -9818,8 +9851,8 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -10122,7 +10155,7 @@ + ;; + # Ignore these flags. + -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \ +- |-LANG:=* | -LIST:* | -LNO:*) ++ |-LANG:=* | -LIST:* | -LNO:* | -link) + ;; + -lkernel32) + test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" +@@ -10316,8 +10349,8 @@ + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "linking to Fortran libraries from C fails +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "linking to Fortran libraries from C fails ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -10478,8 +10511,8 @@ + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compile a simple Fortran program +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compile a simple Fortran program ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +@@ -10572,7 +10605,7 @@ + ac_safe=`echo "-mieee-fp" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -mieee-fp" >&5 + $as_echo_n "checking whether ${F77-g77} accepts -mieee-fp... " >&6; } +- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -10627,7 +10660,7 @@ + ac_safe=`echo "-mieee" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -mieee" >&5 + $as_echo_n "checking whether ${F77-g77} accepts -mieee... " >&6; } +- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -10678,7 +10711,7 @@ + ac_safe=`echo "-ieee" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -ieee" >&5 + $as_echo_n "checking whether ${F77-g77} accepts -ieee... " >&6; } +- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -10728,7 +10761,7 @@ + ac_safe=`echo "-fpe1" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -fpe1" >&5 + $as_echo_n "checking whether ${F77-g77} accepts -fpe1... " >&6; } +- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -10797,7 +10830,7 @@ + $as_echo "$as_me: WARNING: Fortran compiler or wrapper script for f2c that functions" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: as a Fortran compiler installed and in your path." >&5 + $as_echo "$as_me: WARNING: as a Fortran compiler installed and in your path." >&2;} +- as_fn_error "See the file INSTALL for more information." "$LINENO" 5 ++ as_fn_error $? "See the file INSTALL for more information." "$LINENO" 5 + fi + + XTRA_CRUFT_SH_LDFLAGS= +@@ -10816,7 +10849,7 @@ + ac_safe=`echo "-ffloat-store" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${F77-g77} accepts -ffloat-store" >&5 + $as_echo_n "checking whether ${F77-g77} accepts -ffloat-store... " >&6; } +- if { as_var=octave_cv_f77_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_f77_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -11117,8 +11150,7 @@ + save_LIBS="$LIBS"; LIBS="$LIBS" + as_ac_var=`$as_echo "ac_cv_func_$sgemm" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$sgemm" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + acx_blas_ok=yes + fi + +@@ -11175,7 +11207,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_f77blas_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lf77blas" >&5 + $as_echo_n "checking for $sgemm in -lf77blas... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11218,8 +11250,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5 + $as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; } + if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then : +@@ -11324,7 +11355,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_blas_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lblas" >&5 + $as_echo_n "checking for $sgemm in -lblas... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11367,12 +11398,11 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + as_ac_Lib=`$as_echo "ac_cv_lib_dgemm_$dgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dgemm in -ldgemm" >&5 + $as_echo_n "checking for $dgemm in -ldgemm... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11415,12 +11445,11 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + as_ac_Lib=`$as_echo "ac_cv_lib_sgemm_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lsgemm" >&5 + $as_echo_n "checking for $sgemm in -lsgemm... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11463,8 +11492,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas" + fi + +@@ -11479,7 +11507,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_cxml_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lcxml" >&5 + $as_echo_n "checking for $sgemm in -lcxml... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11522,8 +11550,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes;BLAS_LIBS="-lcxml" + fi + +@@ -11534,7 +11561,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_dxml_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -ldxml" >&5 + $as_echo_n "checking for $sgemm in -ldxml... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11577,8 +11604,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes;BLAS_LIBS="-ldxml" + fi + +@@ -11635,7 +11661,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_sunperf_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lsunperf" >&5 + $as_echo_n "checking for $sgemm in -lsunperf... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11678,8 +11704,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BLAS_LIBS="-lsunperf -lsunmath" + acx_blas_ok=yes + fi +@@ -11694,7 +11719,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_scs_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lscs" >&5 + $as_echo_n "checking for $sgemm in -lscs... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11737,8 +11762,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes; BLAS_LIBS="-lscs" + fi + +@@ -11749,7 +11773,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_complib.sgimath_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lcomplib.sgimath" >&5 + $as_echo_n "checking for $sgemm in -lcomplib.sgimath... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11792,8 +11816,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath" + fi + +@@ -11804,7 +11827,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_blas_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lblas" >&5 + $as_echo_n "checking for $sgemm in -lblas... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11847,12 +11870,11 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + as_ac_Lib=`$as_echo "ac_cv_lib_essl_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lessl" >&5 + $as_echo_n "checking for $sgemm in -lessl... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11895,8 +11917,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes; BLAS_LIBS="-lessl -lblas" + fi + +@@ -11909,7 +11930,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_blas_$sgemm" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lblas" >&5 + $as_echo_n "checking for $sgemm in -lblas... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11952,8 +11973,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_blas_ok=yes; BLAS_LIBS="-lblas" + fi + +@@ -11996,8 +12016,8 @@ + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5 ; } + else + cat > conftest.$ac_ext <<_ACEOF + program main +@@ -12031,8 +12051,8 @@ + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5 ; } + else + cat > conftest.$ac_ext <<_ACEOF + program main +@@ -12064,8 +12084,8 @@ + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5 ; } + else + cat > conftest.$ac_ext <<_ACEOF + program main +@@ -12096,8 +12116,8 @@ + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5 ; } + else + cat > conftest.$ac_ext <<_ACEOF + program main +@@ -12128,8 +12148,8 @@ + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5 ; } + else + cat > conftest.$ac_ext <<_ACEOF + program main +@@ -12160,8 +12180,8 @@ + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot run test program while cross compiling ++See \`config.log' for more details" "$LINENO" 5 ; } + else + cat > conftest.$ac_ext <<_ACEOF + program main +@@ -12312,8 +12332,7 @@ + save_LIBS="$LIBS"; LIBS="$LIBS $BLAS_LIBS $FLIBS" + as_ac_var=`$as_echo "ac_cv_func_$cheev" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$cheev" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + acx_lapack_ok=yes + fi + +@@ -12327,7 +12346,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $cheev in -l$lapack" >&5 + $as_echo_n "checking for $cheev in -l$lapack... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -12370,8 +12389,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + acx_lapack_ok=yes; LAPACK_LIBS="-l$lapack" + fi + +@@ -12441,7 +12459,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_qrupdate_$sqr1up" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sqr1up in -lqrupdate" >&5 + $as_echo_n "checking for $sqr1up in -lqrupdate... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -12484,8 +12502,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + QRUPDATE_LIBS="-lqrupdate"; with_qrupdate=yes + fi + +@@ -12521,8 +12538,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -12667,8 +12683,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -12941,8 +12956,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -13034,8 +13048,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -13125,8 +13138,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -13277,8 +13289,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -13369,9 +13380,10 @@ + warn_arpack="arpack not found. This will result in a lack of the eigs function." + if test "$with_arpack" = yes; then + with_arpack=no +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for F77_FUNC(dseupd,DSEUPD) in -larpack" >&5 ++ as_ac_Lib=`$as_echo "ac_cv_lib_arpack_F77_FUNC(dseupd,DSEUPD)" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for F77_FUNC(dseupd,DSEUPD) in -larpack" >&5 + $as_echo_n "checking for F77_FUNC(dseupd,DSEUPD) in -larpack... " >&6; } +-if test "${ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_+set}" = set; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -13403,17 +13415,18 @@ + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_=yes ++ eval "$as_ac_Lib=yes" + else +- ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_=no ++ eval "$as_ac_Lib=no" + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_" >&5 +-$as_echo "$ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_" >&6; } +-if test "x$ac_cv_lib_arpack_F77_FUNC_dseupd_DSEUPD_" = x""yes; then : ++eval ac_res=\$$as_ac_Lib ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + ARPACK_LIBS="-larpack"; with_arpack=yes + fi + +@@ -13473,7 +13486,7 @@ + if $STATIC_LIBS || $SHARED_LIBS; then + true + else +- as_fn_error "You can't disable building static AND shared libraries!" "$LINENO" 5 ++ as_fn_error $? "You can't disable building static AND shared libraries!" "$LINENO" 5 + fi + + # Check whether --enable-rpath was given. +@@ -14168,9 +14181,8 @@ + if test "$ac_cv_type_short" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (short) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (short) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_short=0 + fi +@@ -14202,9 +14214,8 @@ + if test "$ac_cv_type_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (int) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (int) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_int=0 + fi +@@ -14236,9 +14247,8 @@ + if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (long) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (long) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_long=0 + fi +@@ -14270,9 +14280,8 @@ + if test "$ac_cv_type_long_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (long long) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (long long) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_long_long=0 + fi +@@ -14435,8 +14444,7 @@ + for ac_func in _getb67 GETB67 getb67; do + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + + cat >>confdefs.h <<_ACEOF + #define CRAY_STACKSEG_END $ac_func +@@ -14707,10 +14715,8 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: guessing no" >&5 ++$as_echo "guessing no" >&6; } + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -14811,9 +14817,8 @@ + if test "$ac_cv_type_long_double" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (long double) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (long double) ++See \`config.log' for more details" "$LINENO" 5 ; } + else + ac_cv_sizeof_long_double=0 + fi +@@ -14958,7 +14963,7 @@ + as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 + $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Header+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -14993,8 +14998,7 @@ + eval ac_res=\$$as_ac_Header + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 + _ACEOF +@@ -15240,8 +15244,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -15514,10 +15517,10 @@ + + + if test "$have_fnmatch" != yes || test "$have_glob" != yes; then +- as_fn_error "You are required to have fnmatch and glob" "$LINENO" 5 ++ as_fn_error $? "You are required to have fnmatch and glob" "$LINENO" 5 + fi + else +- as_fn_error "You are required to have fnmatch.h and glob.h" "$LINENO" 5 ++ as_fn_error $? "You are required to have fnmatch.h and glob.h" "$LINENO" 5 + fi + + ### Checks for functions and variables. +@@ -15537,8 +15540,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -15591,8 +15593,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -15760,10 +15761,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++ octave_cv_strptime_broken=yes + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -16057,8 +16055,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -16194,8 +16191,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -16240,7 +16236,7 @@ + ac_safe=`echo "-rdynamic" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -rdynamic" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -rdynamic... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -16743,8 +16739,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -16756,8 +16751,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -16786,8 +16780,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -16799,8 +16792,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -17088,7 +17080,7 @@ + as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tputs" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tputs in -l${termlib}" >&5 + $as_echo_n "checking for tputs in -l${termlib}... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -17131,8 +17123,7 @@ + eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +-eval as_val=\$$as_ac_Lib +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + TERMLIBS="${TERMLIBS} -l${termlib}" + fi + +@@ -17221,7 +17212,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I need GNU Readline 4.2 or later" >&5 + $as_echo "$as_me: WARNING: I need GNU Readline 4.2 or later" >&2;} +- as_fn_error "this is fatal unless you specify --disable-readline" "$LINENO" 5 ++ as_fn_error $? "this is fatal unless you specify --disable-readline" "$LINENO" 5 + + fi + +@@ -17529,8 +17520,7 @@ + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -17667,7 +17657,7 @@ + { + tmp=$TMPDIR/sed$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || as_fn_error "cannot create a temporary directory in $TMPDIR" "$LINENO" 5 ++} || as_fn_error $? "cannot create a temporary directory in $TMPDIR" "$LINENO" 5 + _max=0 + _count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris +@@ -17708,7 +17698,7 @@ + + SED=$octave_cv_path_sed + if test -z "$SED"; then +- as_fn_error "no usable version of sed found" "$LINENO" 5 ++ as_fn_error $? "no usable version of sed found" "$LINENO" 5 + fi + fi + +@@ -17879,7 +17869,7 @@ + elif test -f lexyy.c; then + ac_cv_prog_lex_root=lexyy + else +- as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5 ++ as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 +@@ -18655,7 +18645,7 @@ + ac_safe=`echo "-Wall" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -Wall" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -Wall... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -18720,7 +18710,7 @@ + ac_safe=`echo "-W" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -W" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -W... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -18785,7 +18775,7 @@ + ac_safe=`echo "-Wshadow" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -Wshadow" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -Wshadow... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -18850,7 +18840,7 @@ + ac_safe=`echo "-Wformat" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -Wformat" >&5 + $as_echo_n "checking whether ${CC-cc} accepts -Wformat... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -18916,7 +18906,7 @@ + ac_safe=`echo "-Wall" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -Wall" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -Wall... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -18981,7 +18971,7 @@ + ac_safe=`echo "-W" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -W" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -W... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -19046,7 +19036,7 @@ + ac_safe=`echo "-Wshadow" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -Wshadow" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -Wshadow... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -19111,7 +19101,7 @@ + ac_safe=`echo "-Wold-style-cast" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -Wold-style-cast" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -Wold-style-cast... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -19176,7 +19166,7 @@ + ac_safe=`echo "-Wformat" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts -Wformat" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts -Wformat... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -19261,7 +19251,7 @@ + ac_safe=`echo "$flag" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts $flag" >&5 + $as_echo_n "checking whether ${CC-cc} accepts $flag... " >&6; } +- if { as_var=octave_cv_cc_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cc_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -19328,7 +19318,7 @@ + ac_safe=`echo "$flag" | sed 'y%./+-:=%__p___%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX-g++} accepts $flag" >&5 + $as_echo_n "checking whether ${CXX-g++} accepts $flag... " >&6; } +- if { as_var=octave_cv_cxx_flag_$ac_safe; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${octave_cv_cxx_flag_$ac_safe+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -19503,6 +19493,7 @@ + + ac_libobjs= + ac_ltlibobjs= ++U= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +@@ -19664,19 +19655,19 @@ + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -19872,7 +19863,7 @@ + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -19926,7 +19917,7 @@ + # values after options handling. + ac_log=" + This file was extended by $as_me, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -19966,6 +19957,7 @@ + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files +@@ -19988,12 +19980,13 @@ + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.64, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.67, ++ with options \\"\$ac_cs_config\\" + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -20010,11 +20003,16 @@ + while test $# != 0 + do + case $1 in +- --*=*) ++ --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; + *) + ac_option=$1 + ac_optarg=$2 +@@ -20028,12 +20026,15 @@ + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; +@@ -20046,7 +20047,7 @@ + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- as_fn_error "ambiguous option: \`$1' ++ as_fn_error $? "ambiguous option: \`$1' + Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; +@@ -20055,7 +20056,7 @@ + ac_cs_silent=: ;; + + # This is an error. +- -*) as_fn_error "unrecognized option: \`$1' ++ -*) as_fn_error $? "unrecognized option: \`$1' + Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" +@@ -20142,7 +20143,7 @@ + "libcruft/blas-xtra/Makefile") CONFIG_FILES="$CONFIG_FILES libcruft/blas-xtra/Makefile" ;; + "libcruft/lapack-xtra/Makefile") CONFIG_FILES="$CONFIG_FILES libcruft/lapack-xtra/Makefile" ;; + +- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + esac + done + +@@ -20180,7 +20181,7 @@ + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -20197,7 +20198,7 @@ + fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\r' ++ ac_cs_awk_cr='\\r' + else + ac_cs_awk_cr=$ac_cr + fi +@@ -20211,18 +20212,18 @@ + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -20244,7 +20245,7 @@ + t delim + :nl + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more1 + s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ + p +@@ -20258,7 +20259,7 @@ + t nl + :delim + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more2 + s/["\\]/\\&/g; s/^/"/; s/$/"/ + p +@@ -20311,20 +20312,28 @@ + else + cat + fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || as_fn_error "could not setup config files machinery" "$LINENO" 5 ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + _ACEOF + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/ +-s/:*\${srcdir}:*/:/ +-s/:*@srcdir@:*/:/ +-s/^\([^=]*=[ ]*\):*/\1/ ++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// + s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// + s/^[^=]*=[ ]*$// + }' + fi +@@ -20352,7 +20361,7 @@ + if test -z "$ac_t"; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -20437,7 +20446,7 @@ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- as_fn_error "could not setup config headers machinery" "$LINENO" 5 ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -20450,7 +20459,7 @@ + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -20478,7 +20487,7 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" +@@ -20505,7 +20514,7 @@ + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -20636,22 +20645,22 @@ + $ac_datarootdir_hack + " + eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&5 ++which seems to be undefined. Please make sure it is defined" >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&2;} ++which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -20662,19 +20671,19 @@ + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || as_fn_error "could not create -" "$LINENO" 5 ++ || as_fn_error $? "could not create -" "$LINENO" 5 + fi + ;; + +@@ -20698,7 +20707,7 @@ + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -20719,7 +20728,7 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || as_fn_exit $? ++ $ac_cs_success || as_fn_exit 1 + fi + + # +@@ -20860,7 +20869,7 @@ + # The eval makes quoting arguments work. + eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ + --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || +- as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 ++ as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 + fi + + cd "$ac_popdir" diff --git a/octave/patches/020-no-x-windows.patch b/octave/patches/020-no-x-windows.patch new file mode 100644 index 0000000..9c98466 --- /dev/null +++ b/octave/patches/020-no-x-windows.patch @@ -0,0 +1,26 @@ +Index: octave-3.2.4/configure +=================================================================== +--- octave-3.2.4.orig/configure 2011-01-02 15:14:21.000000000 +0100 ++++ octave-3.2.4/configure 2011-01-02 15:14:32.000000000 +0100 +@@ -6892,7 +6892,7 @@ + $as_echo "libraries $x_libraries, headers $x_includes" >&6; } + fi + +-if test "$have_x"; then ++if test "$have_x" = "yes"; then + + $as_echo "#define HAVE_X_WINDOWS 1" >>confdefs.h + +Index: octave-3.2.4/configure.in +=================================================================== +--- octave-3.2.4.orig/configure.in 2011-01-02 15:14:20.000000000 +0100 ++++ octave-3.2.4/configure.in 2011-01-02 15:14:25.000000000 +0100 +@@ -258,7 +258,7 @@ + ACX_PTHREAD + + AC_PATH_X +-if test "$have_x"; then ++if test "$have_x" = "yes"; then + AC_DEFINE(HAVE_X_WINDOWS, 1, [Define if you have X11]) + + if test "$x_includes" != "NONE"; then diff --git a/octave/patches/030-pager.patch b/octave/patches/030-pager.patch new file mode 100644 index 0000000..c24cd7b --- /dev/null +++ b/octave/patches/030-pager.patch @@ -0,0 +1,13 @@ +Index: octave-3.2.4/scripts/startup/main-rcfile +=================================================================== +--- octave-3.2.4.orig/scripts/startup/main-rcfile 2011-01-02 16:50:10.000000000 +0100 ++++ octave-3.2.4/scripts/startup/main-rcfile 2011-01-02 16:50:47.000000000 +0100 +@@ -11,7 +11,7 @@ + filesep, "inputrc")); + + if (strcmp (PAGER (), "less") && isempty (getenv ("LESS"))) +- PAGER_FLAGS ('-e -X -P"-- less ?pB(%pB\\%):--. (f)orward, (b)ack, (q)uit$"'); ++ PAGER_FLAGS ('-E'); + endif + + ## This appears here instead of in the pkg/PKG_ADD file so that --norc diff --git a/octave/patches/040-octinterp-rpath.patch b/octave/patches/040-octinterp-rpath.patch new file mode 100644 index 0000000..172fa07 --- /dev/null +++ b/octave/patches/040-octinterp-rpath.patch @@ -0,0 +1,20 @@ +Index: octave-3.2.4/src/Makefile.in +=================================================================== +--- octave-3.2.4.orig/src/Makefile.in 2011-01-02 18:05:54.000000000 +0100 ++++ octave-3.2.4/src/Makefile.in 2011-01-02 19:10:33.000000000 +0100 +@@ -298,11 +298,13 @@ + endif + + OCTINTERP_LINK_DEPS = \ +- -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) $(LIBS) $(FLIBS) \ ++ -L../liboctave $(LIBOCTAVE) -L../libcruft $(RLD_FLAG) \ ++ $(LIBCRUFT) $(LIBS) $(FLIBS) \ + $(X11_LIBS) $(OPENGL_LIBS) $(CARBON_LIBS) + + OCT_LINK_DEPS = \ +- -L../libcruft $(LIBCRUFT) -L../liboctave $(LIBOCTAVE) \ ++ -L../libcruft $(LIBCRUFT) -L../liboctave $(RLD_FLAG) \ ++ $(LIBOCTAVE) \ + -L. $(LIBOCTINTERP) $(CHOLMOD_LIBS) $(UMFPACK_LIBS) $(AMD_LIBS) \ + $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \ + $(FFTW_LIBS) $(QRUPDATE_LIBS) $(ARPACK_LIBS) $(LIBS) $(FLIBS) diff --git a/qball/Makefile b/qball/Makefile new file mode 100644 index 0000000..78ff08b --- /dev/null +++ b/qball/Makefile @@ -0,0 +1,57 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=qball +PKG_VERSION:=1.1 +PKG_RELEASE:=1 +PKG_SOURCE_URL:=http://homepage.ntlworld.com/mark.harman/ +PKG_SOURCE:=qball_src.zip +PKG_MD5SUM:=6748cf29650e6cb087d1b55e37f7361d +UNZIP_CMD=unzip -d $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) $(DL_DIR)/$(PKG_SOURCE) + +include $(INCLUDE_DIR)/package.mk + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/QBall + +$(call include_mk,qmake.mk) + +define Package/qball + SECTION:=games + CATEGORY:=Games + TITLE:=simple breakout style game + DEPENDS:=+qt4 +qt4-gui +dejavu-fonts-ttf + URL:=http://homepage.ntlworld.com/mark.harman/comp_qball.html +endef + +define Build/Prepare + $(call Build/Prepare/Default) + (\ +cd $(PKG_BUILD_DIR); \ +echo "QMAKE_UIC=$(STAGING_DIR_HOST)/bin/uic" >> QBall.pro; \ +echo "QMAKE_MOC=$(STAGING_DIR_HOST)/bin/moc" >> QBall.pro; \ +echo "QMAKE_RCC=$(STAGING_DIR_HOST)/bin/rcc" >> QBall.pro; \ +echo "QMAKE_LINK=$(TARGET_CXX)" >> QBall.pro; \ +echo "QMAKE_LIBS+=-L$(STAGING_DIR)/usr/lib/libintl/lib" >> QBall.pro; \ +echo "QMAKE_LIBS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib" >> QBall.pro; \ +echo "QMAKE_LIBS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" >> QBall.pro; \ +echo "INCLUDEPATH += $(STAGING_DIR)/usr/include" >> QBall.pro; \ +echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/Qt" >> QBall.pro; \ +echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtGui" >> QBall.pro; \ +echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtCore" >> QBall.pro; \ +) +endef + +define Build/Configure + $(call Build/Configure/Qmake,QBall) +endef + +define Package/qball/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/QBall $(1)/usr/bin/qball +endef + +$(eval $(call BuildPackage,qball)) diff --git a/qball/patches/001-disable-mouse.patch b/qball/patches/001-disable-mouse.patch new file mode 100644 index 0000000..6a18d6e --- /dev/null +++ b/qball/patches/001-disable-mouse.patch @@ -0,0 +1,24 @@ +diff -ur qball-1.1.or/QBall/main.cpp qball-1.1/QBall/main.cpp +--- qball-1.1.or/QBall/main.cpp 2010-12-14 21:13:48.387821716 +0300 ++++ qball-1.1/QBall/main.cpp 2010-12-14 21:16:23.749898252 +0300 +@@ -1,6 +1,10 @@ + #include <QtGui/QApplication>
+ #include "mainwindow.h"
+
++#if defined(Q_WS_QWS)
++#include <QtGui/QWSServer>
++#endif
++
+ int main(int argc, char *argv[])
+ {
+ QApplication a(argc, argv);
+@@ -14,6 +18,9 @@ + //w.show();
+ w.showFullScreen();
+ #endif
++#if defined(Q_WS_QWS)
++ QWSServer::setCursorVisible(false);
++#endif
+ //w.init();
+ //Gamestate *gamestate = new PlayingGamestate(&w);
+ Gamestate *gamestate = new OptionsGamestate(&w);
diff --git a/qstardict/Makefile b/qstardict/Makefile new file mode 100644 index 0000000..819f0d8 --- /dev/null +++ b/qstardict/Makefile @@ -0,0 +1,57 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=qstardict +PKG_VERSION:=0.13.1 +PKG_RELEASE:=1 +PKG_SOURCE_URL:=http://qstardict.ylsoftware.com/files/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_MD5SUM:=0828c3fa01c5237db8a67d356a9d1a8c + +include $(INCLUDE_DIR)/package.mk +$(call include_mk,qmake.mk) + +define Package/qstardict + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Qt clone of stardict + DEPENDS:=+qt4 +qt4-gui +dejavu-fonts-ttf +qt4-network +qt4-xml + URL:=http://qstardict.ylsoftware.com +endef + +define Build/Prepare + $(call Build/Prepare/Default) + (\ +cd $(PKG_BUILD_DIR); \ +echo "QMAKE_UIC=$(STAGING_DIR_HOST)/bin/uic" >> qstardict.pri; \ +echo "QMAKE_MOC=$(STAGING_DIR_HOST)/bin/moc" >> qstardict.pri; \ +echo "QMAKE_RCC=$(STAGING_DIR_HOST)/bin/rcc" >> qstardict.pri; \ +echo "QMAKE_LINK=$(TARGET_CXX)" >> qstardict.pri; \ +echo "QMAKE_LIBS+=-L$(STAGING_DIR)/usr/lib/libintl/lib" >> qstardict.pri; \ +echo "QMAKE_LIBS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib" >> qstardict.pri; \ +echo "QMAKE_LIBS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" >> qstardict.pri; \ +echo "INCLUDEPATH += $(STAGING_DIR)/usr/include" >> qstardict.pri; \ +echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/Qt" >> qstardict.pri; \ +echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtGui" >> qstardict.pri; \ +echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtCore" >> qstardict.pri; \ +echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtNetwork" >> qstardict.pri; \ +echo "INCLUDEPATH += $(STAGING_DIR)/usr/include/QtXml" >> qstardict.pri; \ +) +endef + +define Build/Configure + $(call Build/Configure/Qmake,qstardict) +endef + +define Package/qstardict/install + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/qstardict/plugins + $(INSTALL_BIN) $(PKG_BUILD_DIR)/qstardict/qstardict $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/plugins/stardict/libstardict.so $(1)/usr/lib/qstardict/plugins + $(INSTALL_BIN) $(PKG_BUILD_DIR)/plugins/web/libweb.so $(1)/usr/lib/qstardict/plugins +endef + +$(eval $(call BuildPackage,qstardict)) diff --git a/qstardict/patches/001-qstardict.patch b/qstardict/patches/001-qstardict.patch new file mode 100644 index 0000000..d9b9c78 --- /dev/null +++ b/qstardict/patches/001-qstardict.patch @@ -0,0 +1,1342 @@ +diff -ur qstardict-0.13.1.or/qstardict/keyboard.cpp qstardict-0.13.1/qstardict/keyboard.cpp +--- qstardict-0.13.1.or/qstardict/keyboard.cpp 2009-02-10 15:33:30.000000000 +0300 ++++ qstardict-0.13.1/qstardict/keyboard.cpp 2010-12-07 21:52:31.613898108 +0300 +@@ -82,7 +82,28 @@ + + } // namespace + +-#endif // Q_WS_WIN ++#elif defined(Q_WS_QWS) // Q_WS_WIN ++ ++namespace ++{ ++const unsigned mAlt = 0010; ++const unsigned mCtrl = 0004; ++const unsigned mShift = 0001; ++const unsigned mWin = 0100; ++} ++ ++namespace QStarDict ++{ ++ ++Qt::KeyboardModifiers Keyboard::activeModifiers() ++{ ++ Qt::KeyboardModifiers result; ++ return result; ++} ++ ++} // namespace ++ ++#endif // Q_WS_QWS + + // vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab cindent textwidth=120 formatoptions=tc + +diff -ur qstardict-0.13.1.or/qstardict/main.cpp qstardict-0.13.1/qstardict/main.cpp +--- qstardict-0.13.1.or/qstardict/main.cpp 2009-02-10 15:33:30.000000000 +0300 ++++ qstardict-0.13.1/qstardict/main.cpp 2010-12-09 21:29:28.240008646 +0300 +@@ -35,6 +35,10 @@ + #include <QTranslator> + #endif // QSTARDICT_WITH_TRANSLATIONS + ++#ifdef Q_WS_QWS ++#include <QtGui/QWSServer> ++#endif ++ + int main(int argc, char *argv[]) + { + QStarDict::Application app(argc, argv); +@@ -61,6 +65,9 @@ + } + #endif // Q_OS_WIN + ++#ifdef Q_WS_QWS ++ QWSServer::setCursorVisible(false); ++#endif + + return app.exec(); + } +diff -ur qstardict-0.13.1.or/qstardict/mainwindow.cpp qstardict-0.13.1/qstardict/mainwindow.cpp +--- qstardict-0.13.1.or/qstardict/mainwindow.cpp 2009-02-10 15:33:30.000000000 +0300 ++++ qstardict-0.13.1/qstardict/mainwindow.cpp 2010-12-08 22:05:16.400898587 +0300 +@@ -93,7 +93,7 @@ + setVisible(config.value("MainWindow/visible", true).toBool()); + wordsListDock->setFloating(config.value("MainWindow/wordsListDock/floating", wordsListDock->isFloating()).toBool()); + wordsListDock->setGeometry(config.value("MainWindow/wordsListDock/geometry", wordsListDock->geometry()).toRect()); +- setInstantSearch(config.value("MainWindow/instantSearch", true).toBool()); ++ setInstantSearch(config.value("MainWindow/instantSearch", false).toBool()); + setDefaultStyleSheet(config.value("MainWindow/defaultStyleSheet", defaultStyleSheet()).toString()); + } + +diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/mainwindow.ui +--- qstardict-0.13.1.or/qstardict/mainwindow.ui 2009-02-10 15:33:30.000000000 +0300 ++++ qstardict-0.13.1/qstardict/mainwindow.ui 2010-12-09 21:31:59.423898167 +0300 +@@ -1,190 +1,241 @@ +-<ui version="4.0" > ++<?xml version="1.0" encoding="UTF-8"?> ++<ui version="4.0"> + <class>QStarDict::MainWindow</class> +- <widget class="QMainWindow" name="QStarDict::MainWindow" > +- <property name="geometry" > ++ <widget class="QMainWindow" name="QStarDict::MainWindow"> ++ <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> +- <width>742</width> +- <height>511</height> ++ <width>326</width> ++ <height>240</height> + </rect> + </property> +- <property name="windowTitle" > ++ <property name="cursor"> ++ <cursorShape>BlankCursor</cursorShape> ++ </property> ++ <property name="windowTitle"> + <string>QStarDict</string> + </property> +- <property name="windowIcon" > +- <iconset resource="pixmaps/pixmaps.qrc" > ++ <property name="windowIcon"> ++ <iconset resource="pixmaps/pixmaps.qrc"> + <normaloff>:/icons/qstardict.png</normaloff>:/icons/qstardict.png</iconset> + </property> +- <widget class="QWidget" name="centralwidget" > +- <layout class="QGridLayout" > +- <property name="margin" > +- <number>9</number> +- </property> +- <property name="spacing" > +- <number>6</number> +- </property> +- <item row="0" column="0" > +- <layout class="QHBoxLayout" > +- <property name="spacing" > +- <number>6</number> ++ <widget class="QWidget" name="centralwidget"> ++ <property name="minimumSize"> ++ <size> ++ <width>214</width> ++ <height>130</height> ++ </size> ++ </property> ++ <property name="maximumSize"> ++ <size> ++ <width>320</width> ++ <height>240</height> ++ </size> ++ </property> ++ <layout class="QVBoxLayout" name="verticalLayout_2"> ++ <property name="spacing"> ++ <number>0</number> ++ </property> ++ <property name="margin"> ++ <number>0</number> ++ </property> ++ <item> ++ <layout class="QHBoxLayout"> ++ <property name="spacing"> ++ <number>0</number> + </property> +- <property name="margin" > ++ <property name="margin"> + <number>0</number> + </property> + <item> +- <widget class="QToolButton" name="searchClearButton" > +- <property name="toolTip" > ++ <widget class="QToolButton" name="searchClearButton"> ++ <property name="toolTip"> + <string>Clear the search box</string> + </property> +- <property name="text" > ++ <property name="text"> + <string>Clear</string> + </property> +- <property name="icon" > +- <iconset resource="pixmaps/pixmaps.qrc" > ++ <property name="icon"> ++ <iconset resource="pixmaps/pixmaps.qrc"> + <normaloff>:/icons/clear-right.png</normaloff>:/icons/clear-right.png</iconset> + </property> +- <property name="toolButtonStyle" > ++ <property name="toolButtonStyle"> + <enum>Qt::ToolButtonIconOnly</enum> + </property> + </widget> + </item> + <item> +- <widget class="QLineEdit" name="searchBox" /> ++ <widget class="QLineEdit" name="searchBox"/> + </item> + <item> +- <widget class="QToolButton" name="queryButton" > +- <property name="toolTip" > ++ <widget class="QToolButton" name="queryButton"> ++ <property name="toolTip"> + <string>Fuzzy query</string> + </property> +- <property name="text" > ++ <property name="text"> + <string>Search</string> + </property> +- <property name="icon" > +- <iconset resource="pixmaps/pixmaps.qrc" > ++ <property name="icon"> ++ <iconset resource="pixmaps/pixmaps.qrc"> + <normaloff>:/icons/search-filter.png</normaloff>:/icons/search-filter.png</iconset> + </property> +- <property name="toolButtonStyle" > ++ <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> + </widget> + </item> + </layout> + </item> +- <item row="1" column="0" > +- <widget class="DictWidget" native="1" name="translationView" /> ++ <item> ++ <widget class="DictWidget" name="translationView" native="true"/> + </item> + </layout> + </widget> +- <widget class="QDockWidget" name="wordsListDock" > +- <property name="features" > +- <set>QDockWidget::AllDockWidgetFeatures</set> ++ <widget class="QDockWidget" name="wordsListDock"> ++ <property name="minimumSize"> ++ <size> ++ <width>100</width> ++ <height>155</height> ++ </size> ++ </property> ++ <property name="maximumSize"> ++ <size> ++ <width>100</width> ++ <height>240</height> ++ </size> + </property> +- <property name="allowedAreas" > ++ <property name="features"> ++ <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable</set> ++ </property> ++ <property name="allowedAreas"> + <set>Qt::NoDockWidgetArea</set> + </property> +- <property name="windowTitle" > ++ <property name="windowTitle"> + <string>Words list</string> + </property> +- <attribute name="dockWidgetArea" > ++ <attribute name="dockWidgetArea"> + <number>1</number> + </attribute> +- <widget class="QWidget" name="dockWidgetContents" > +- <layout class="QGridLayout" > +- <property name="margin" > +- <number>9</number> ++ <widget class="QWidget" name="dockWidgetContents"> ++ <property name="minimumSize"> ++ <size> ++ <width>100</width> ++ <height>130</height> ++ </size> ++ </property> ++ <property name="maximumSize"> ++ <size> ++ <width>100</width> ++ <height>240</height> ++ </size> ++ </property> ++ <widget class="QListWidget" name="wordsList"> ++ <property name="geometry"> ++ <rect> ++ <x>0</x> ++ <y>5</y> ++ <width>100</width> ++ <height>190</height> ++ </rect> ++ </property> ++ <property name="minimumSize"> ++ <size> ++ <width>100</width> ++ <height>130</height> ++ </size> + </property> +- <property name="spacing" > +- <number>6</number> ++ <property name="maximumSize"> ++ <size> ++ <width>100</width> ++ <height>240</height> ++ </size> + </property> +- <item row="0" column="0" > +- <widget class="QListWidget" name="wordsList" /> +- </item> +- </layout> ++ </widget> + </widget> + </widget> +- <widget class="QMenuBar" name="menubar" > +- <property name="geometry" > ++ <widget class="QMenuBar" name="menubar"> ++ <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> +- <width>742</width> +- <height>22</height> ++ <width>326</width> ++ <height>27</height> + </rect> + </property> +- <widget class="QMenu" name="menu_File" > +- <property name="title" > ++ <widget class="QMenu" name="menu_File"> ++ <property name="title"> + <string>&File</string> + </property> +- <addaction name="actionQuit" /> ++ <addaction name="actionQuit"/> + </widget> +- <widget class="QMenu" name="menuHelp" > +- <property name="title" > ++ <widget class="QMenu" name="menuHelp"> ++ <property name="title"> + <string>&Help</string> + </property> +- <addaction name="actionHelp" /> +- <addaction name="actionAbout" /> +- <addaction name="actionAboutQt" /> ++ <addaction name="actionHelp"/> ++ <addaction name="actionAbout"/> ++ <addaction name="actionAboutQt"/> + </widget> +- <widget class="QMenu" name="menu_Options" > +- <property name="title" > ++ <widget class="QMenu" name="menu_Options"> ++ <property name="title"> + <string>&Settings</string> + </property> +- <addaction name="actionScan" /> +- <addaction name="actionSettings" /> ++ <addaction name="actionScan"/> ++ <addaction name="actionSettings"/> + </widget> +- <addaction name="menu_File" /> +- <addaction name="menu_Options" /> +- <addaction name="menuHelp" /> ++ <addaction name="menu_File"/> ++ <addaction name="menu_Options"/> ++ <addaction name="menuHelp"/> + </widget> +- <action name="actionQuit" > +- <property name="icon" > +- <iconset resource="pixmaps/pixmaps.qrc" > ++ <action name="actionQuit"> ++ <property name="icon"> ++ <iconset resource="pixmaps/pixmaps.qrc"> + <normaloff>:/icons/application-exit.png</normaloff>:/icons/application-exit.png</iconset> + </property> +- <property name="text" > ++ <property name="text"> + <string>&Quit</string> + </property> +- <property name="shortcut" > ++ <property name="shortcut"> + <string>Ctrl+Q</string> + </property> + </action> +- <action name="actionAbout" > +- <property name="text" > ++ <action name="actionAbout"> ++ <property name="text"> + <string>&About</string> + </property> + </action> +- <action name="actionAboutQt" > +- <property name="text" > ++ <action name="actionAboutQt"> ++ <property name="text"> + <string>About &Qt</string> + </property> + </action> +- <action name="actionSettings" > +- <property name="icon" > +- <iconset resource="pixmaps/pixmaps.qrc" > ++ <action name="actionSettings"> ++ <property name="icon"> ++ <iconset resource="pixmaps/pixmaps.qrc"> + <normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset> + </property> +- <property name="text" > ++ <property name="text"> + <string>&Configure QStarDict</string> + </property> + </action> +- <action name="actionScan" > +- <property name="checkable" > ++ <action name="actionScan"> ++ <property name="checkable"> + <bool>true</bool> + </property> +- <property name="text" > ++ <property name="text"> + <string>&Scan</string> + </property> + </action> +- <action name="actionHelp" > +- <property name="icon" > +- <iconset resource="pixmaps/pixmaps.qrc" > ++ <action name="actionHelp"> ++ <property name="icon"> ++ <iconset resource="pixmaps/pixmaps.qrc"> + <normaloff>:/icons/help-contents.png</normaloff>:/icons/help-contents.png</iconset> + </property> +- <property name="text" > ++ <property name="text"> + <string>QStarDict &Help</string> + </property> +- <property name="shortcut" > ++ <property name="shortcut"> + <string>F1</string> + </property> + </action> +@@ -203,7 +254,7 @@ + <tabstop>searchClearButton</tabstop> + </tabstops> + <resources> +- <include location="pixmaps/pixmaps.qrc" /> ++ <include location="pixmaps/pixmaps.qrc"/> + </resources> + <connections> + <connection> +@@ -212,11 +263,11 @@ + <receiver>searchBox</receiver> + <slot>clear()</slot> + <hints> +- <hint type="sourcelabel" > ++ <hint type="sourcelabel"> + <x>315</x> + <y>59</y> + </hint> +- <hint type="destinationlabel" > ++ <hint type="destinationlabel"> + <x>647</x> + <y>61</y> + </hint> +@@ -228,11 +279,11 @@ + <receiver>searchBox</receiver> + <slot>setFocus()</slot> + <hints> +- <hint type="sourcelabel" > ++ <hint type="sourcelabel"> + <x>315</x> + <y>59</y> + </hint> +- <hint type="destinationlabel" > ++ <hint type="destinationlabel"> + <x>647</x> + <y>61</y> + </hint> +@@ -244,11 +295,11 @@ + <receiver>queryButton</receiver> + <slot>click()</slot> + <hints> +- <hint type="sourcelabel" > ++ <hint type="sourcelabel"> + <x>438</x> + <y>50</y> + </hint> +- <hint type="destinationlabel" > ++ <hint type="destinationlabel"> + <x>661</x> + <y>51</y> + </hint> +diff -ur qstardict-0.13.1.or/qstardict/settingsdialog.ui qstardict-0.13.1/qstardict/settingsdialog.ui +--- qstardict-0.13.1.or/qstardict/settingsdialog.ui 2009-02-10 15:33:30.000000000 +0300 ++++ qstardict-0.13.1/qstardict/settingsdialog.ui 2010-12-09 21:31:59.432865593 +0300 +@@ -1,84 +1,67 @@ +-<ui version="4.0" > ++<?xml version="1.0" encoding="UTF-8"?> ++<ui version="4.0"> + <class>QStarDict::SettingsDialog</class> +- <widget class="QDialog" name="QStarDict::SettingsDialog" > +- <property name="geometry" > ++ <widget class="QDialog" name="QStarDict::SettingsDialog"> ++ <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> +- <width>463</width> +- <height>498</height> ++ <width>320</width> ++ <height>240</height> + </rect> + </property> +- <property name="windowTitle" > ++ <property name="sizePolicy"> ++ <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ <property name="cursor"> ++ <cursorShape>BlankCursor</cursorShape> ++ </property> ++ <property name="windowTitle"> + <string>QStarDict Settings</string> + </property> +- <property name="toolTip" > ++ <property name="toolTip"> + <string/> + </property> +- <layout class="QGridLayout" > +- <property name="margin" > +- <number>9</number> +- </property> +- <property name="spacing" > +- <number>6</number> +- </property> +- <item row="1" column="0" > +- <widget class="QDialogButtonBox" name="buttonBox" > +- <property name="orientation" > +- <enum>Qt::Horizontal</enum> +- </property> +- <property name="standardButtons" > +- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> +- </property> +- <property name="centerButtons" > +- <bool>false</bool> +- </property> +- </widget> +- </item> +- <item row="0" column="0" > +- <widget class="QTabWidget" name="tabWidget" > +- <property name="currentIndex" > ++ <layout class="QGridLayout" name="gridLayout"> ++ <item row="0" column="0"> ++ <widget class="QTabWidget" name="tabWidget"> ++ <property name="currentIndex"> + <number>0</number> + </property> +- <widget class="QWidget" name="tabGlobalSettings" > +- <property name="geometry" > +- <rect> +- <x>0</x> +- <y>0</y> +- <width>441</width> +- <height>414</height> +- </rect> +- </property> +- <attribute name="title" > ++ <widget class="QWidget" name="tabGlobalSettings"> ++ <attribute name="title"> + <string>Global settings</string> + </attribute> +- <layout class="QVBoxLayout" > ++ <layout class="QVBoxLayout"> + <item> +- <widget class="QCheckBox" name="instantSearchBox" > +- <property name="text" > ++ <widget class="QCheckBox" name="instantSearchBox"> ++ <property name="text"> + <string>Instant search</string> + </property> + </widget> + </item> + <item> +- <layout class="QHBoxLayout" > +- <property name="spacing" > ++ <layout class="QVBoxLayout" name="verticalLayout_2"> ++ <property name="spacing"> + <number>6</number> + </property> +- <property name="margin" > ++ <property name="margin"> + <number>0</number> + </property> + <item> +- <widget class="QLabel" name="label_7" > +- <property name="text" > ++ <widget class="QLabel" name="label_7"> ++ <property name="text"> + <string>Pronounce words using this command:</string> + </property> + </widget> + </item> + <item> +- <widget class="QLineEdit" name="speechCmdEdit" > +- <property name="toolTip" > +- <string>Enter cmd for the speaching program.<br>If cmd contains "%s" it will be replaced to word, else word will be writen to stdin of speech process.</string> ++ <widget class="QLineEdit" name="speechCmdEdit"> ++ <property name="toolTip"> ++ <string>Enter cmd for the speaching program.<br>If cmd contains "%s" it will be replaced to word, else word will be writen to stdin of speech process.</string> + </property> + </widget> + </item> +@@ -86,104 +69,96 @@ + </item> + <item> + <spacer> +- <property name="orientation" > ++ <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> +- <property name="sizeHint" stdset="0" > ++ <property name="sizeHint" stdset="0"> + <size> +- <width>369</width> +- <height>171</height> ++ <width>320</width> ++ <height>240</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> +- <widget class="QWidget" name="tabDictionaries" > +- <property name="geometry" > +- <rect> +- <x>0</x> +- <y>0</y> +- <width>441</width> +- <height>414</height> +- </rect> +- </property> +- <attribute name="title" > ++ <widget class="QWidget" name="tabDictionaries"> ++ <attribute name="title"> + <string>Dictionaries</string> + </attribute> +- <layout class="QVBoxLayout" > ++ <layout class="QVBoxLayout"> + <item> +- <widget class="QGroupBox" name="groupBox_3" > +- <property name="title" > ++ <widget class="QGroupBox" name="groupBox_3"> ++ <property name="title"> + <string>Dictionaries</string> + </property> +- <layout class="QVBoxLayout" > ++ <layout class="QVBoxLayout"> + <item> +- <widget class="QTableView" name="dictsTableView" > +- <property name="editTriggers" > ++ <widget class="QTableView" name="dictsTableView"> ++ <property name="editTriggers"> + <set>QAbstractItemView::NoEditTriggers</set> + </property> +- <property name="selectionMode" > ++ <property name="selectionMode"> + <enum>QAbstractItemView::SingleSelection</enum> + </property> +- <property name="selectionBehavior" > ++ <property name="selectionBehavior"> + <enum>QAbstractItemView::SelectRows</enum> + </property> +- <property name="showGrid" > ++ <property name="showGrid"> + <bool>false</bool> + </property> + </widget> + </item> + <item> +- <layout class="QHBoxLayout" > ++ <layout class="QHBoxLayout"> + <item> +- <widget class="QToolButton" name="dictsMoveUpButton" > +- <property name="toolTip" > ++ <widget class="QToolButton" name="dictsMoveUpButton"> ++ <property name="toolTip"> + <string>Move up</string> + </property> +- <property name="text" > ++ <property name="text"> + <string>Up</string> + </property> +- <property name="icon" > +- <iconset resource="pixmaps/pixmaps.qrc" > ++ <property name="icon"> ++ <iconset resource="../plugins/stardict/pixmaps/pixmaps.qrc"> + <normaloff>:/icons/arrow-up.png</normaloff>:/icons/arrow-up.png</iconset> + </property> + </widget> + </item> + <item> +- <widget class="QToolButton" name="dictsMoveDownButton" > +- <property name="toolTip" > ++ <widget class="QToolButton" name="dictsMoveDownButton"> ++ <property name="toolTip"> + <string>Move down</string> + </property> +- <property name="text" > ++ <property name="text"> + <string>Down</string> + </property> +- <property name="icon" > +- <iconset resource="pixmaps/pixmaps.qrc" > ++ <property name="icon"> ++ <iconset resource="../plugins/stardict/pixmaps/pixmaps.qrc"> + <normaloff>:/icons/arrow-down.png</normaloff>:/icons/arrow-down.png</iconset> + </property> + </widget> + </item> + <item> +- <widget class="QToolButton" name="dictsShowInfoButton" > +- <property name="toolTip" > ++ <widget class="QToolButton" name="dictsShowInfoButton"> ++ <property name="toolTip"> + <string>Show information about dictionary</string> + </property> +- <property name="text" > ++ <property name="text"> + <string>Show info</string> + </property> +- <property name="icon" > +- <iconset resource="pixmaps/pixmaps.qrc" > ++ <property name="icon"> ++ <iconset resource="pixmaps/pixmaps.qrc"> + <normaloff>:/icons/dialog-information.png</normaloff>:/icons/dialog-information.png</iconset> + </property> + </widget> + </item> + <item> + <spacer> +- <property name="orientation" > ++ <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> +- <property name="sizeHint" stdset="0" > ++ <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> +@@ -196,73 +171,80 @@ + </layout> + </widget> + </item> ++ </layout> ++ </widget> ++ <widget class="QWidget" name="tabPlugins"> ++ <attribute name="title"> ++ <string>Plugins</string> ++ </attribute> ++ <layout class="QVBoxLayout" name="verticalLayout"> + <item> +- <widget class="QGroupBox" name="groupBox_4" > +- <property name="maximumSize" > ++ <widget class="QGroupBox" name="groupBox_5"> ++ <property name="maximumSize"> + <size> + <width>16777215</width> +- <height>196</height> ++ <height>16777215</height> + </size> + </property> +- <property name="title" > ++ <property name="title"> + <string>Plugins</string> + </property> +- <property name="alignment" > ++ <property name="alignment"> + <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> + </property> +- <layout class="QVBoxLayout" > ++ <layout class="QVBoxLayout" name="_2"> + <item> +- <widget class="QTableView" name="pluginsTableView" > +- <property name="editTriggers" > ++ <widget class="QTableView" name="pluginsTableView"> ++ <property name="editTriggers"> + <set>QAbstractItemView::NoEditTriggers</set> + </property> +- <property name="selectionMode" > ++ <property name="selectionMode"> + <enum>QAbstractItemView::SingleSelection</enum> + </property> +- <property name="selectionBehavior" > ++ <property name="selectionBehavior"> + <enum>QAbstractItemView::SelectRows</enum> + </property> +- <property name="showGrid" > ++ <property name="showGrid"> + <bool>false</bool> + </property> + </widget> + </item> + <item> +- <layout class="QHBoxLayout" > ++ <layout class="QHBoxLayout" name="_3"> + <item> +- <widget class="QToolButton" name="pluginsShowInfoButton" > +- <property name="toolTip" > ++ <widget class="QToolButton" name="pluginsShowInfoButton"> ++ <property name="toolTip"> + <string>Show information about plugin</string> + </property> +- <property name="text" > ++ <property name="text"> + <string>Info</string> + </property> +- <property name="icon" > +- <iconset resource="pixmaps/pixmaps.qrc" > ++ <property name="icon"> ++ <iconset resource="pixmaps/pixmaps.qrc"> + <normaloff>:/icons/dialog-information.png</normaloff>:/icons/dialog-information.png</iconset> + </property> + </widget> + </item> + <item> +- <widget class="QToolButton" name="pluginsConfigureButton" > +- <property name="toolTip" > ++ <widget class="QToolButton" name="pluginsConfigureButton"> ++ <property name="toolTip"> + <string>Configure plugin</string> + </property> +- <property name="text" > ++ <property name="text"> + <string>Configure</string> + </property> +- <property name="icon" > +- <iconset resource="pixmaps/pixmaps.qrc" > ++ <property name="icon"> ++ <iconset resource="pixmaps/pixmaps.qrc"> + <normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset> + </property> + </widget> + </item> + <item> + <spacer> +- <property name="orientation" > ++ <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> +- <property name="sizeHint" stdset="0" > ++ <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> +@@ -277,136 +259,128 @@ + </item> + </layout> + </widget> +- <widget class="QWidget" name="tabPopupWindow" > +- <property name="geometry" > +- <rect> +- <x>0</x> +- <y>0</y> +- <width>640</width> +- <height>409</height> +- </rect> +- </property> +- <attribute name="title" > +- <string>Popup window</string> ++ <widget class="QWidget" name="tabPopupWindow"> ++ <attribute name="title"> ++ <string>Behaviour</string> + </attribute> +- <layout class="QGridLayout" > +- <property name="margin" > ++ <layout class="QGridLayout"> ++ <property name="margin"> + <number>9</number> + </property> +- <property name="spacing" > ++ <property name="spacing"> + <number>6</number> + </property> +- <item row="0" column="0" > +- <widget class="QGroupBox" name="groupBox" > +- <property name="title" > ++ <item row="0" column="0"> ++ <widget class="QGroupBox" name="groupBox"> ++ <property name="title"> + <string>Behavior</string> + </property> +- <layout class="QGridLayout" > +- <property name="margin" > ++ <layout class="QGridLayout"> ++ <property name="margin"> + <number>9</number> + </property> +- <property name="spacing" > ++ <property name="spacing"> + <number>6</number> + </property> +- <item row="4" column="0" > +- <layout class="QVBoxLayout" > +- <property name="spacing" > ++ <item row="4" column="0"> ++ <layout class="QVBoxLayout"> ++ <property name="spacing"> + <number>6</number> + </property> +- <property name="margin" > ++ <property name="margin"> + <number>0</number> + </property> + <item> +- <widget class="QCheckBox" name="pronounceWordBox" > +- <property name="text" > ++ <widget class="QCheckBox" name="pronounceWordBox"> ++ <property name="text"> + <string>Pronounce the word</string> + </property> + </widget> + </item> + </layout> + </item> +- <item row="3" column="0" > +- <layout class="QHBoxLayout" > +- <property name="spacing" > ++ <item row="3" column="0"> ++ <layout class="QHBoxLayout"> ++ <property name="spacing"> + <number>6</number> + </property> +- <property name="margin" > ++ <property name="margin"> + <number>0</number> + </property> + <item> +- <widget class="QLabel" name="label_4" > +- <property name="text" > ++ <widget class="QLabel" name="label_4"> ++ <property name="text"> + <string>Timeout before hide after mouse over</string> + </property> + </widget> + </item> + <item> +- <widget class="QDoubleSpinBox" name="timeoutBeforeHideSpin" > +- <property name="specialValueText" > ++ <widget class="QDoubleSpinBox" name="timeoutBeforeHideSpin"> ++ <property name="specialValueText"> + <string>Don't hide</string> + </property> +- <property name="suffix" > ++ <property name="suffix"> + <string> sec</string> + </property> +- <property name="decimals" > ++ <property name="decimals"> + <number>1</number> + </property> +- <property name="minimum" > ++ <property name="minimum"> + <double>0.000000000000000</double> + </property> +- <property name="maximum" > ++ <property name="maximum"> + <double>10.000000000000000</double> + </property> +- <property name="singleStep" > ++ <property name="singleStep"> + <double>0.100000000000000</double> + </property> +- <property name="value" > ++ <property name="value"> + <double>0.500000000000000</double> + </property> + </widget> + </item> + </layout> + </item> +- <item row="2" column="0" > +- <layout class="QHBoxLayout" > +- <property name="spacing" > ++ <item row="2" column="0"> ++ <layout class="QHBoxLayout"> ++ <property name="spacing"> + <number>6</number> + </property> +- <property name="margin" > ++ <property name="margin"> + <number>0</number> + </property> + <item> +- <widget class="QCheckBox" name="useScanModifierBox" > +- <property name="enabled" > ++ <widget class="QCheckBox" name="useScanModifierBox"> ++ <property name="enabled"> + <bool>true</bool> + </property> +- <property name="text" > ++ <property name="text"> + <string>Show only if modifier pressed</string> + </property> + </widget> + </item> + <item> +- <widget class="QComboBox" name="modifierKeyBox" > +- <property name="enabled" > ++ <widget class="QComboBox" name="modifierKeyBox"> ++ <property name="enabled"> + <bool>false</bool> + </property> + <item> +- <property name="text" > ++ <property name="text"> + <string>Alt</string> + </property> + </item> + <item> +- <property name="text" > ++ <property name="text"> + <string>Control</string> + </property> + </item> + <item> +- <property name="text" > ++ <property name="text"> + <string>Shift</string> + </property> + </item> + <item> +- <property name="text" > ++ <property name="text"> + <string>Win</string> + </property> + </item> +@@ -414,19 +388,19 @@ + </item> + </layout> + </item> +- <item row="0" column="0" > +- <widget class="QCheckBox" name="useScanBox" > +- <property name="text" > ++ <item row="0" column="0"> ++ <widget class="QCheckBox" name="useScanBox"> ++ <property name="text"> + <string>Scan selection</string> + </property> +- <property name="checked" > ++ <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> +- <item row="1" column="0" > +- <widget class="QCheckBox" name="showIfNotFoundBox" > +- <property name="text" > ++ <item row="1" column="0"> ++ <widget class="QCheckBox" name="showIfNotFoundBox"> ++ <property name="text"> + <string>Show if word not found</string> + </property> + </widget> +@@ -434,108 +408,128 @@ + </layout> + </widget> + </item> +- <item row="1" column="0" > +- <widget class="QGroupBox" name="groupBox_2" > +- <property name="title" > +- <string>Apperance</string> ++ <item row="1" column="0"> ++ <spacer> ++ <property name="orientation"> ++ <enum>Qt::Vertical</enum> ++ </property> ++ <property name="sizeHint" stdset="0"> ++ <size> ++ <width>20</width> ++ <height>101</height> ++ </size> + </property> +- <layout class="QGridLayout" > +- <property name="margin" > ++ </spacer> ++ </item> ++ </layout> ++ </widget> ++ <widget class="QWidget" name="tabAppearance"> ++ <attribute name="title"> ++ <string>View</string> ++ </attribute> ++ <layout class="QVBoxLayout" name="verticalLayout_3"> ++ <item> ++ <widget class="QGroupBox" name="groupBox_4"> ++ <property name="title"> ++ <string>View</string> ++ </property> ++ <layout class="QGridLayout" name="_4"> ++ <property name="margin"> + <number>9</number> + </property> +- <property name="spacing" > ++ <property name="spacing"> + <number>6</number> + </property> +- <item row="2" column="0" > +- <layout class="QHBoxLayout" > +- <property name="spacing" > ++ <item row="2" column="0"> ++ <layout class="QHBoxLayout" name="_5"> ++ <property name="spacing"> + <number>6</number> + </property> +- <property name="margin" > ++ <property name="margin"> + <number>0</number> + </property> + <item> +- <widget class="QLabel" name="label_3" > +- <property name="text" > ++ <widget class="QLabel" name="label_8"> ++ <property name="text"> + <string>Opacity</string> + </property> + </widget> + </item> + <item> +- <widget class="QSpinBox" name="popupOpacitySpin" > +- <property name="suffix" > ++ <widget class="QSpinBox" name="popupOpacitySpin"> ++ <property name="suffix"> + <string>%</string> + </property> +- <property name="prefix" > ++ <property name="prefix"> + <string/> + </property> +- <property name="minimum" > ++ <property name="minimum"> + <number>1</number> + </property> +- <property name="maximum" > ++ <property name="maximum"> + <number>100</number> + </property> +- <property name="value" > ++ <property name="value"> + <number>100</number> + </property> + </widget> + </item> + </layout> + </item> +- <item row="0" column="0" > +- <layout class="QHBoxLayout" > +- <property name="spacing" > ++ <item row="0" column="0"> ++ <layout class="QHBoxLayout" name="_6"> ++ <property name="spacing"> + <number>6</number> + </property> +- <property name="margin" > ++ <property name="margin"> + <number>0</number> + </property> + <item> +- <widget class="QLabel" name="label_5" > +- <property name="text" > ++ <widget class="QLabel" name="label_9"> ++ <property name="text"> + <string>Default width</string> + </property> + </widget> + </item> + <item> +- <widget class="QSpinBox" name="popupDefaultWidthSpin" > +- <property name="minimum" > ++ <widget class="QSpinBox" name="popupDefaultWidthSpin"> ++ <property name="minimum"> + <number>96</number> + </property> +- <property name="maximum" > ++ <property name="maximum"> + <number>9999</number> + </property> +- <property name="value" > ++ <property name="value"> + <number>320</number> + </property> + </widget> + </item> + </layout> + </item> +- <item row="1" column="0" > +- <layout class="QHBoxLayout" > +- <property name="spacing" > ++ <item row="1" column="0"> ++ <layout class="QHBoxLayout" name="_7"> ++ <property name="spacing"> + <number>6</number> + </property> +- <property name="margin" > ++ <property name="margin"> + <number>0</number> + </property> + <item> +- <widget class="QLabel" name="label_6" > +- <property name="text" > ++ <widget class="QLabel" name="label_10"> ++ <property name="text"> + <string>Default height</string> + </property> + </widget> + </item> + <item> +- <widget class="QSpinBox" name="popupDefaultHeightSpin" > +- <property name="minimum" > ++ <widget class="QSpinBox" name="popupDefaultHeightSpin"> ++ <property name="minimum"> + <number>96</number> + </property> +- <property name="maximum" > ++ <property name="maximum"> + <number>9999</number> + </property> +- <property name="value" > ++ <property name="value"> + <number>240</number> + </property> + </widget> +@@ -545,41 +539,40 @@ + </layout> + </widget> + </item> +- <item row="2" column="0" > +- <spacer> +- <property name="orientation" > +- <enum>Qt::Vertical</enum> +- </property> +- <property name="sizeHint" stdset="0" > +- <size> +- <width>20</width> +- <height>101</height> +- </size> +- </property> +- </spacer> +- </item> + </layout> + </widget> +- <widget class="QWidget" name="tab" > +- <property name="geometry" > +- <rect> +- <x>0</x> +- <y>0</y> +- <width>640</width> +- <height>409</height> +- </rect> +- </property> +- <attribute name="title" > ++ <widget class="QWidget" name="tab"> ++ <attribute name="title"> + <string>Apperance</string> + </attribute> +- <layout class="QGridLayout" > +- <item row="0" column="0" > +- <widget class="QStarDict::CSSEdit" native="1" name="apperanceCSSEdit" /> ++ <layout class="QGridLayout"> ++ <item row="0" column="0"> ++ <widget class="QStarDict::CSSEdit" name="apperanceCSSEdit" native="true"> ++ <property name="sizePolicy"> ++ <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> ++ <horstretch>0</horstretch> ++ <verstretch>0</verstretch> ++ </sizepolicy> ++ </property> ++ </widget> + </item> + </layout> + </widget> + </widget> + </item> ++ <item row="1" column="0"> ++ <widget class="QDialogButtonBox" name="buttonBox"> ++ <property name="orientation"> ++ <enum>Qt::Horizontal</enum> ++ </property> ++ <property name="standardButtons"> ++ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> ++ </property> ++ <property name="centerButtons"> ++ <bool>false</bool> ++ </property> ++ </widget> ++ </item> + </layout> + </widget> + <customwidgets> +@@ -599,21 +592,16 @@ + <tabstop>dictsMoveUpButton</tabstop> + <tabstop>dictsMoveDownButton</tabstop> + <tabstop>dictsShowInfoButton</tabstop> +- <tabstop>pluginsTableView</tabstop> +- <tabstop>pluginsShowInfoButton</tabstop> +- <tabstop>pluginsConfigureButton</tabstop> + <tabstop>useScanBox</tabstop> + <tabstop>showIfNotFoundBox</tabstop> + <tabstop>useScanModifierBox</tabstop> + <tabstop>modifierKeyBox</tabstop> + <tabstop>timeoutBeforeHideSpin</tabstop> + <tabstop>pronounceWordBox</tabstop> +- <tabstop>popupDefaultWidthSpin</tabstop> +- <tabstop>popupDefaultHeightSpin</tabstop> +- <tabstop>popupOpacitySpin</tabstop> + </tabstops> + <resources> +- <include location="pixmaps/pixmaps.qrc" /> ++ <include location="../plugins/stardict/pixmaps/pixmaps.qrc"/> ++ <include location="pixmaps/pixmaps.qrc"/> + </resources> + <connections> + <connection> +@@ -622,11 +610,11 @@ + <receiver>QStarDict::SettingsDialog</receiver> + <slot>accept()</slot> + <hints> +- <hint type="sourcelabel" > +- <x>330</x> +- <y>587</y> ++ <hint type="sourcelabel"> ++ <x>310</x> ++ <y>230</y> + </hint> +- <hint type="destinationlabel" > ++ <hint type="destinationlabel"> + <x>410</x> + <y>299</y> + </hint> +@@ -638,11 +626,11 @@ + <receiver>QStarDict::SettingsDialog</receiver> + <slot>reject()</slot> + <hints> +- <hint type="sourcelabel" > +- <x>406</x> +- <y>587</y> ++ <hint type="sourcelabel"> ++ <x>310</x> ++ <y>230</y> + </hint> +- <hint type="destinationlabel" > ++ <hint type="destinationlabel"> + <x>410</x> + <y>299</y> + </hint> +@@ -654,13 +642,13 @@ + <receiver>modifierKeyBox</receiver> + <slot>setEnabled(bool)</slot> + <hints> +- <hint type="sourcelabel" > +- <x>165</x> +- <y>140</y> ++ <hint type="sourcelabel"> ++ <x>194</x> ++ <y>85</y> + </hint> +- <hint type="destinationlabel" > +- <x>273</x> +- <y>137</y> ++ <hint type="destinationlabel"> ++ <x>289</x> ++ <y>85</y> + </hint> + </hints> + </connection> diff --git a/setfont2/Makefile b/setfont2/Makefile index 1dd2198..9fd2662 100644 --- a/setfont2/Makefile +++ b/setfont2/Makefile @@ -48,10 +48,6 @@ define Package/setfont2/install $(PKG_BUILD_DIR)/fonts/un-fuzzy-6x10-font.pnm \ $(PKG_BUILD_DIR)/fonts/un-fuzzy-4x8-font.pnm \ $(1)/usr/share/setfont2/ - - $(INSTALL_BIN) \ - ./files/$(PKG_NAME).init \ - $(1)/etc/init.d/$(PKG_NAME) endef $(eval $(call BuildPackage,setfont2)) diff --git a/stardict/Makefile b/stardict/Makefile index e7f8d99..2931065 100644 --- a/stardict/Makefile +++ b/stardict/Makefile @@ -28,7 +28,7 @@ endef define Package/stardict $(call Package/stardict/Default) - DEPENDS:=+libintl +libiconv +libgconf2 +gtk2 + DEPENDS:=+libintl +libiconv +libgconf2 +gtk2 +libstdcpp +libsigcxx endef define Package/stardict-dic-en-en @@ -36,6 +36,11 @@ define Package/stardict-dic-en-en TITLE+=(dictionary: English <-> English) endef +define Package/stardict-dic-en-cn + $(call Package/stardict/Default) + TITLE+=(dictionary: oxfordjm English <-> Chinses) +endef + define Package/stardict/description StarDict is a Cross-Platform and international dictionary Software. endef @@ -95,7 +100,24 @@ define Package/stardict-dic-en-en/install -C $(1)/usr/share/stardict/dic/ \ -jxf \ ./files/stardict-english-2.4.2.tar.bz2 + + $(CP) ./files/longman.idx.oft \ + $(1)/usr/share/stardict/dic/stardict-english-2.4.2/ +endef + +define Package/stardict-dic-en-cn/install + $(INSTALL_DIR) \ + $(1)/usr/share/stardict/dic + + $(TAR) \ + -C $(1)/usr/share/stardict/dic/ \ + -jxf \ + ./files/stardict-oxfordjm-ec-2.4.2.tar.bz2 + + $(CP) ./files/oxfordjm-ec.idx.oft \ + $(1)/usr/share/stardict/dic/stardict-oxfordjm-ec-2.4.2/ endef $(eval $(call BuildPackage,stardict)) $(eval $(call BuildPackage,stardict-dic-en-en)) +$(eval $(call BuildPackage,stardict-dic-en-cn)) diff --git a/stardict/files/longman.idx.oft b/stardict/files/longman.idx.oft Binary files differnew file mode 100644 index 0000000..cdef4f9 --- /dev/null +++ b/stardict/files/longman.idx.oft diff --git a/stardict/files/oxfordjm-ec.idx.oft b/stardict/files/oxfordjm-ec.idx.oft Binary files differnew file mode 100644 index 0000000..5f4bfd2 --- /dev/null +++ b/stardict/files/oxfordjm-ec.idx.oft diff --git a/stardict/files/stardict-oxfordjm-ec-2.4.2.tar.bz2 b/stardict/files/stardict-oxfordjm-ec-2.4.2.tar.bz2 Binary files differnew file mode 100644 index 0000000..e2b4ae6 --- /dev/null +++ b/stardict/files/stardict-oxfordjm-ec-2.4.2.tar.bz2 diff --git a/triggersad/Makefile b/triggersad/Makefile new file mode 100644 index 0000000..d8fbc5d --- /dev/null +++ b/triggersad/Makefile @@ -0,0 +1,54 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=triggersad +PKG_VERSION:=0.1.3 +PKG_REV:=f7c42167127fb8377f99440f943ab863433b14b5 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=git://github.com/wertarbyte/triggerhappy +PKG_SOURCE_PROTO:=git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) + +include $(INCLUDE_DIR)/package.mk + +define Package/triggersad + SECTION:=utils + CATEGORY:=Utilities + TITLE:=handle input events and run configured programs + URL:=http://github.com/wertarbyte/triggerhappy +endef + +define Package/triggersad/description + triggerhappy - handle input events and run configured programs + The daemon thd can handle hotplugged input devices and is configured through + simple configuration files in /etc/triggerhappy/triggers.d/. +endef + +MAKE_FLAGS += \ + $(TARGET_CONFIGURE_OPTS) \ + $(1) + +MAKE_VARS += TOOLCHAIN_DIR=$(TOOLCHAIN_DIR) + +define Package/triggersad/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_DIR) $(1)/etc/triggerhappy + $(INSTALL_DIR) $(1)/etc/triggerhappy/triggers.d/ + $(INSTALL_DIR) $(1)/etc/hotplug.d/input/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/thd $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/th-cmd $(1)/usr/sbin + $(INSTALL_BIN) ./files/triggerhappy.init $(1)/etc/init.d/triggerhappy + $(INSTALL_BIN) ./files/triggerhappy.hotplug $(1)/etc/hotplug.d/input/10-triggerhappy + $(INSTALL_BIN) ./files/triggerhappy-example.conf $(1)/etc/triggerhappy/triggers.d/example.conf +endef + +$(eval $(call BuildPackage,triggersad)) diff --git a/triggersad/files/triggerhappy-example.conf b/triggersad/files/triggerhappy-example.conf new file mode 100644 index 0000000..3a8017a --- /dev/null +++ b/triggersad/files/triggerhappy-example.conf @@ -0,0 +1,14 @@ +# This is an example configuration for the triggerhappy daemon (thd) +# please note that every file to be processed must end in ".conf" +# +# To view a list of supported event codes, use "thd --listevents" or +# "thd --dump /dev/input/event*" +# +# Format: +# <eventcode> <value> <command> +# +# values for key events are 1 (pressed), 0 (released) or 2 (held) +# +## control an mpd instance +# KEY_NEXTSONG 1 /usr/bin/mpc next +# KEY_PREVSONG 1 /usr/bin/mpc prev diff --git a/triggersad/files/triggerhappy.hotplug b/triggersad/files/triggerhappy.hotplug new file mode 100644 index 0000000..78ad349 --- /dev/null +++ b/triggersad/files/triggerhappy.hotplug @@ -0,0 +1,15 @@ +#!/bin/sh +THD_SOCKET=/tmp/triggerhappy.socket +[ -S "$THD_SOCKET" ] || exit + +case "$ACTION" in + add) + DEVICE="/dev/$DEVNAME" + [ -c "$DEVICE" ] || exit + # offer device to triggerhappy daemon + /usr/sbin/th-cmd --socket "$THD_SOCKET" --add "$DEVICE" + ;; + remove) + # nothing to do + ;; +esac diff --git a/triggersad/files/triggerhappy.init b/triggersad/files/triggerhappy.init new file mode 100644 index 0000000..e846d29 --- /dev/null +++ b/triggersad/files/triggerhappy.init @@ -0,0 +1,10 @@ +#!/bin/sh /etc/rc.common +START=93 + +start() { + /usr/sbin/thd --socket /tmp/triggerhappy.socket --triggers /etc/triggerhappy/triggers.d/ --daemon /dev/input/event* +} + +stop() { + /usr/sbin/th-cmd --socket /tmp/triggerhappy.socket --quit +} diff --git a/triggersad/patches/001-input.patch b/triggersad/patches/001-input.patch new file mode 100644 index 0000000..2f8d448 --- /dev/null +++ b/triggersad/patches/001-input.patch @@ -0,0 +1,12 @@ +diff -ur triggerhappy-0.1.3.orig/Makefile triggerhappy-0.1.3/Makefile +--- triggerhappy-0.1.3.orig/Makefile 2010-11-18 11:42:08.402150170 +0300 ++++ triggerhappy-0.1.3/Makefile 2010-11-18 12:09:55.033025473 +0300 +@@ -23,7 +23,7 @@ + --release="" \ + $< > $@ + +-evtable_%.h: /usr/include/linux/input.h ++evtable_%.h: $(TOOLCHAIN_DIR)/usr/include/linux/input.h + awk '/^#define $*_/ && $$2 !~ /_(MAX|CNT|VERSION)$$/ {print "EV_MAP("$$2"),"}' $< > $@ + + clean: diff --git a/tunec/Makefile b/tunec/Makefile new file mode 100644 index 0000000..af190ea --- /dev/null +++ b/tunec/Makefile @@ -0,0 +1,41 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=tunec +PKG_REV:=2 +PKG_VERSION:=r$(PKG_REV) +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=svn +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://tunec.googlecode.com/svn/trunk/ +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/ + +include $(INCLUDE_DIR)/package.mk + +define Package/tunec + SECTION:=utils + CATEGORY:=Utilities + TITLE:=A command line guitar tuner for linux + URL:=http://code.google.com/p/tunec/ + DEPENDS:=+fftw3 @BROKEN #since the upstream libfftw3 install not correct +endef + +TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include +TARGET_LDFLAGS+= -lfftw3 + +define Build/Compile + (cd $(PKG_BUILD_DIR); \ + $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) tuner.c -o $(PKG_NAME); \ + ) +endef + +define Package/tunec/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/tunec \ + $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,tunec)) diff --git a/ubi-utils/Makefile b/ubi-utils/Makefile deleted file mode 100644 index e1622b8..0000000 --- a/ubi-utils/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# -# Copyright (C) 2009 Qi Hardware Inc. -# Author: Xiangfu Liu <xiangfu@qi-hardware.com> -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ubi-utils -PKG_VERSION:=1.2.0 -PKG_REV:=600337e7c81e812d34460b413c5b044f454bc49d -PKG_RELEASE:=1 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) - -include $(INCLUDE_DIR)/package.mk - -define Package/ubi-utils - TITLE:=ubi-utils - SECTION:=utils - CATEGORY:=Utilities - URL:=http://www.linux-mtd.infradead.org/doc/ubi.html -endef - -define Package/ubi-utils/description - UBI (Latin: "where?") stands for "Unsorted Block Images". It is a volume management system for raw flash devices which manages multiple logical volumes on a single physical flash device and spreads the I/O load (i.e, wear-leveling) across whole flash chip. -endef - -define Build/Compile - (cd $(PKG_BUILD_DIR)/$(PKG_NAME); \ - $(MAKE) CC="$(TARGET_CROSS)gcc" \ - ARCH="$(ARCH)"; \ - $(MAKE) CC="$(TARGET_CROSS)gcc" \ - ARCH="$(ARCH)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - SBINDIR="/usr/bin/" \ - install \ - ) -endef - -define Package/ubi-utils/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mtdinfo $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ubinfo $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ubimkvol $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ubirmvol $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ubinize $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ubidetach $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ubicrc32 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ubiformat $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ubiupdatevol $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ubirsvol $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ubiattach $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ubirename $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,ubi-utils)) diff --git a/w3m/Makefile b/w3m/Makefile index 21e6012..6cf1d9a 100644 --- a/w3m/Makefile +++ b/w3m/Makefile @@ -11,29 +11,39 @@ PKG_NAME:=w3m PKG_VERSION:=0.5.2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://nchc.dl.sourceforge.net/project/w3m/w3m/w3m-0.5.2/ - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_INSTALL:=1 +PKG_SOURCE_URL:=@SF/$(PKG_NAME) +PKG_MD5SUM:=ba06992d3207666ed1bf2dcf7c72bf58 include $(INCLUDE_DIR)/package.mk define Package/w3m TITLE:=w3m + SUBMENU:=Web SECTION:=network CATEGORY:=Network URL:=http://w3m.sourceforge.net/ - DEPENDS:=@BROKEN + DEPENDS:=+libopenssl +gc +libncurses endef define Package/w3m/description w3m is a text-based web browser endef +define Build/Prepare + $(call Build/Prepare/Default) + $(CP) $(FILES_DIR)/functable.c $(PKG_BUILD_DIR) + $(CP) $(FILES_DIR)/tagtable.c $(PKG_BUILD_DIR) +endef + +CONFIGURE_ARGS += --with-ssl=$(STAGING_DIR)/usr \ + --with-gc=$(STAGING_DIR)/usr/lib + +CONFIGURE_VARS += ac_cv_lib_gc_GC_init=yes + + define Package/w3m/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/w3m $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/w3m $(1)/usr/bin/ endef $(eval $(call BuildPackage,w3m)) diff --git a/w3m/files/functable.c b/w3m/files/functable.c new file mode 100644 index 0000000..962697c --- /dev/null +++ b/w3m/files/functable.c @@ -0,0 +1,260 @@ +#include "hash.h" +#include <stdio.h> +#include "funcname1.h" +static HashItem_si MyHashItem[] = { + /* 0 */ {"SUSPEND",FUNCNAME_susp,&MyHashItem[1]}, + /* 1 */ {"SET_OPTION",FUNCNAME_setOpt,&MyHashItem[2]}, + /* 2 */ {"END",FUNCNAME_goLineL,NULL}, + /* 3 */ {"VIEW",FUNCNAME_vwSrc,NULL}, + /* 4 */ {"PREV_VISITED",FUNCNAME_prevVA,&MyHashItem[5]}, + /* 5 */ {"EXTERN",FUNCNAME_extbrz,NULL}, + /* 6 */ {"UNDO",FUNCNAME_undoPos,NULL}, + /* 7 */ {"SHELL",FUNCNAME_execsh,&MyHashItem[8]}, + /* 8 */ {"RIGHT",FUNCNAME_col1R,&MyHashItem[9]}, + /* 9 */ {"PREV_WORD",FUNCNAME_movLW,&MyHashItem[10]}, + /* 10 */ {"LEFT",FUNCNAME_col1L,&MyHashItem[11]}, + /* 11 */ {"INTERRUPT",FUNCNAME_susp,NULL}, + /* 12 */ {"TAB_GOTO_RELATIVE",FUNCNAME_tabrURL,NULL}, + /* 13 */ {"NEXT_UP",FUNCNAME_nextU,NULL}, + /* 14 */ {"CLOSE_TAB_MOUSE",FUNCNAME_closeTMs,NULL}, + /* 15 */ {"DOWN",FUNCNAME_ldown1,NULL}, + /* 16 */ {"HISTORY",FUNCNAME_ldHist,NULL}, + /* 17 */ {"SEARCH",FUNCNAME_srchfor,&MyHashItem[18]}, + /* 18 */ {"NEXT_VISITED",FUNCNAME_nextVA,&MyHashItem[19]}, + /* 19 */ {"NEXT_LEFT_UP",FUNCNAME_nextLU,&MyHashItem[20]}, + /* 20 */ {"MOVE_UP",FUNCNAME_movU,&MyHashItem[21]}, + /* 21 */ {"DOWNLOAD",FUNCNAME_svSrc,NULL}, + /* 22 */ {"VIEW_IMAGE",FUNCNAME_followI,&MyHashItem[23]}, + /* 23 */ {"MARK",FUNCNAME__mark,&MyHashItem[24]}, + /* 24 */ {"INFO",FUNCNAME_pginfo,NULL}, + /* 25 */ {"VERSION",FUNCNAME_dispVer,&MyHashItem[26]}, + /* 26 */ {"BEGIN",FUNCNAME_goLineF,NULL}, + /* 27 */ {"REDRAW",FUNCNAME_rdrwSc,NULL}, + /* 28 */ {"QUIT",FUNCNAME_qquitfm,&MyHashItem[29]}, + /* 29 */ {"DOWNLOAD_LIST",FUNCNAME_ldDL,NULL}, + /* 30 */ {"REG_MARK",FUNCNAME_reMark,NULL}, + /* 31 */ {"MOVE_RIGHT",FUNCNAME_movR,NULL}, + /* 32 */ {"MARK_MID",FUNCNAME_chkNMID,&MyHashItem[33]}, + /* 33 */ {"LOAD",FUNCNAME_ldfile,NULL}, + /* 34 */ {"EXEC_SHELL",FUNCNAME_execsh,NULL}, + /* 35 */ {"VIEW_BOOKMARK",FUNCNAME_ldBmark,&MyHashItem[36]}, + /* 36 */ {"TAB_MOUSE",FUNCNAME_tabMs,&MyHashItem[37]}, + /* 37 */ {"STOP_IMAGE",FUNCNAME_stopI,NULL}, + /* 38 */ {"SHIFT_RIGHT",FUNCNAME_shiftr,&MyHashItem[39]}, + /* 39 */ {"SEARCH_NEXT",FUNCNAME_srchnxt,NULL}, + /* 40 */ {"PEEK",FUNCNAME_curURL,NULL}, + /* 41 */ {"DICT_WORD_AT",FUNCNAME_dictwordat,NULL}, + /* 42 */ {"SOURCE",FUNCNAME_vwSrc,&MyHashItem[43]}, + /* 43 */ {"SAVE_LINK",FUNCNAME_svA,&MyHashItem[44]}, + /* 44 */ {"GOTO",FUNCNAME_goURL,&MyHashItem[45]}, + /* 45 */ {"ACCESSKEY",FUNCNAME_accessKey,NULL}, + /* 46 */ {"ABORT",FUNCNAME_quitfm,NULL}, + /* 47 */ {"MENU",FUNCNAME_mainMn,NULL}, + /* 48 */ {"PCMAP",FUNCNAME_pcmap,&MyHashItem[49]}, + /* 49 */ {"EXIT",FUNCNAME_quitfm,NULL}, + /* 50 */ {"LINE_INFO",FUNCNAME_curlno,&MyHashItem[51]}, + /* 51 */ {"ADD_BOOKMARK",FUNCNAME_adBmark,NULL}, + /* 52 */ {"WHEREIS",FUNCNAME_srchfor,&MyHashItem[53]}, + /* 53 */ {"SELECT_MENU",FUNCNAME_selMn,&MyHashItem[54]}, + /* 54 */ {"GOTO_LINE",FUNCNAME_goLine,NULL}, + /* 55 */ {"MOUSE",FUNCNAME_mouse,NULL}, + /* 56 */ {"PIPE_BUF",FUNCNAME_pipeBuf,&MyHashItem[57]}, + /* 57 */ {"LINK_BEGIN",FUNCNAME_topA,NULL}, + /* 58 */ {"PEEK_IMG",FUNCNAME_peekIMG,NULL}, + /* 59 */ {"CHARSET",FUNCNAME_docCSet,NULL}, + /* 60 */ {"GOTO_LINK",FUNCNAME_followA,&MyHashItem[61]}, + /* 61 */ {"EXTERN_LINK",FUNCNAME_linkbrz,NULL}, + /* 62 */ {"MARK_WORD",FUNCNAME_chkWORD,NULL}, + /* 63 */ {"MOVE_LIST_MENU",FUNCNAME_movlistMn,&MyHashItem[64]}, + /* 64 */ {"LINK_MENU",FUNCNAME_linkMn,NULL}, + /* 65 */ {"REDO",FUNCNAME_redoPos,&MyHashItem[66]}, + /* 66 */ {"BOOKMARK",FUNCNAME_ldBmark,NULL}, + /* 67 */ {"NEXT_RIGHT_DOWN",FUNCNAME_nextRD,&MyHashItem[68]}, + /* 68 */ {"NEXT_LEFT",FUNCNAME_nextL,&MyHashItem[69]}, + /* 69 */ {"COMMAND",FUNCNAME_execCmd,&MyHashItem[70]}, + /* 70 */ {"@@@",FUNCNAME_nulcmd,NULL}, + /* 71 */ {"RESHAPE",FUNCNAME_reshape,&MyHashItem[72]}, + /* 72 */ {"ALARM",FUNCNAME_setAlarm,NULL}, + /* 73 */ {"UP",FUNCNAME_lup1,&MyHashItem[74]}, + /* 74 */ {"SETENV",FUNCNAME_setEnv,&MyHashItem[75]}, + /* 75 */ {"RELOAD",FUNCNAME_reload,&MyHashItem[76]}, + /* 76 */ {"LIST",FUNCNAME_linkLst,NULL}, + /* 77 */ {"NEXT_PAGE",FUNCNAME_pgFore,&MyHashItem[78]}, + /* 78 */ {"MOVE_MOUSE",FUNCNAME_movMs,&MyHashItem[79]}, + /* 79 */ {"DISPLAY_IMAGE",FUNCNAME_dispI,NULL}, + /* 80 */ {"TAB_LEFT",FUNCNAME_tabL,&MyHashItem[81]}, + /* 81 */ {"PIPE_SHELL",FUNCNAME_pipesh,&MyHashItem[82]}, + /* 82 */ {"NEXT_TAB",FUNCNAME_nextT,&MyHashItem[83]}, + /* 83 */ {"NEXT_DOWN",FUNCNAME_nextD,NULL}, + /* 84 */ {"MAIN_MENU",FUNCNAME_mainMn,&MyHashItem[85]}, + /* 85 */ {"LIST_MENU",FUNCNAME_listMn,NULL}, + /* 86 */ {"REINIT",FUNCNAME_reinit,&MyHashItem[87]}, + /* 87 */ {"EDIT",FUNCNAME_editBf,NULL}, + /* 88 */ {"SAVE_IMAGE",FUNCNAME_svI,&MyHashItem[89]}, + /* 89 */ {"NEXT_MARK",FUNCNAME_nextMk,&MyHashItem[90]}, + /* 90 */ {"COOKIE",FUNCNAME_cooLst,NULL}, + /* 91 */ {"LINK_END",FUNCNAME_lastA,&MyHashItem[92]}, + /* 92 */ {"LINE_BEGIN",FUNCNAME_linbeg,&MyHashItem[93]}, + /* 93 */ {"DELETE_PREVBUF",FUNCNAME_deletePrevBuf,NULL}, + /* 94 */ {"WRAP_TOGGLE",FUNCNAME_wrapToggle,NULL}, + /* 95 */ {"DEFAULT_CHARSET",FUNCNAME_defCSet,NULL}, + /* 96 */ {"NOTHING",FUNCNAME_nulcmd,&MyHashItem[97]}, + /* 97 */ {"FRAME",FUNCNAME_rFrame,NULL}, + /* 98 */ {"SEARCH_PREV",FUNCNAME_srchprv,&MyHashItem[99]}, + /* 99 */ {"NEXT",FUNCNAME_nextBf,&MyHashItem[100]}, + /* 100 */ {"LINE_END",FUNCNAME_linend,NULL}, + /* 101 */ {"SELECT",FUNCNAME_selBuf,NULL}, + /* 102 */ {"PREV_TAB",FUNCNAME_prevT,&MyHashItem[103]}, + /* 103 */ {"MOVE_LEFT",FUNCNAME_movL,NULL}, + /* 104 */ {"SEARCH_BACK",FUNCNAME_srchbak,&MyHashItem[105]}, + /* 105 */ {"SAVE",FUNCNAME_svSrc,NULL}, + /* 106 */ {"SHIFT_LEFT",FUNCNAME_shiftl,&MyHashItem[107]}, + /* 107 */ {"READ_SHELL",FUNCNAME_readsh,&MyHashItem[108]}, + /* 108 */ {"PRINT",FUNCNAME_svBuf,&MyHashItem[109]}, + /* 109 */ {"MOVE_DOWN",FUNCNAME_movD,&MyHashItem[110]}, + /* 110 */ {"EDIT_SCREEN",FUNCNAME_editScr,NULL}, + /* 111 */ {"ISEARCH_BACK",FUNCNAME_isrchbak,NULL}, + /* 112 */ {"NEXT_LINK",FUNCNAME_nextA,NULL}, + /* 113 */ {"MSGS",FUNCNAME_msgs,NULL}, + /* 114 */ {"MULTIMAP",FUNCNAME_multimap,&MyHashItem[115]}, + /* 115 */ {"CENTER_H",FUNCNAME_ctrCsrH,NULL}, + /* 116 */ {"TAB_LINK",FUNCNAME_tabA,&MyHashItem[117]}, + /* 117 */ {"TAB_GOTO",FUNCNAME_tabURL,&MyHashItem[118]}, + /* 118 */ {"PREV_PAGE",FUNCNAME_pgBack,NULL}, + /* 119 */ {"SAVE_SCREEN",FUNCNAME_svBuf,NULL}, + /* 120 */ {"TAB_MENU",FUNCNAME_tabMn,&MyHashItem[121]}, + /* 121 */ {"SEARCH_FORE",FUNCNAME_srchfor,&MyHashItem[122]}, + /* 122 */ {"MOVE_UP1",FUNCNAME_movU1,&MyHashItem[123]}, + /* 123 */ {"MOVE_LEFT1",FUNCNAME_movL1,NULL}, + /* 124 */ {"PREV_MARK",FUNCNAME_prevMk,&MyHashItem[125]}, + /* 125 */ {"PEEK_LINK",FUNCNAME_peekURL,NULL}, + /* 126 */ {"MARK_URL",FUNCNAME_chkURL,NULL}, + /* 127 */ {"GOTO_RELATIVE",FUNCNAME_gorURL,NULL}, + /* 128 */ {"SUBMIT",FUNCNAME_submitForm,NULL}, + /* 129 */ {"NEXT_WORD",FUNCNAME_movRW,&MyHashItem[130]}, + /* 130 */ {"NEW_TAB",FUNCNAME_newT,&MyHashItem[131]}, + /* 131 */ {"HELP",FUNCNAME_ldhelp,NULL}, + /* 132 */ {"MOVE_DOWN1",FUNCNAME_movD1,NULL}, + /* 133 */ {"ISEARCH",FUNCNAME_isrchfor,NULL}, + /* 134 */ {"NEXT_RIGHT",FUNCNAME_nextR,&MyHashItem[135]}, + /* 135 */ {"CLOSE_TAB",FUNCNAME_closeT,&MyHashItem[136]}, + /* 136 */ {"CENTER_V",FUNCNAME_ctrCsrV,NULL}, + /* 137 */ {"MOVE_RIGHT1",FUNCNAME_movR1,NULL}, + /* 138 */ {"ESCMAP",FUNCNAME_escmap,&MyHashItem[139]}, + /* 139 */ {"ESCBMAP",FUNCNAME_escbmap,NULL}, + /* 140 */ {"MENU_MOUSE",FUNCNAME_menuMs,NULL}, + /* 141 */ {"PREV",FUNCNAME_prevBf,&MyHashItem[142]}, + /* 142 */ {"NULL",FUNCNAME_nulcmd,&MyHashItem[143]}, + /* 143 */ {"DICT_WORD",FUNCNAME_dictword,NULL}, + /* 144 */ {"PREV_LINK",FUNCNAME_prevA,NULL}, + /* 145 */ {"TAB_RIGHT",FUNCNAME_tabR,NULL}, + /* 146 */ {"MOUSE_TOGGLE",FUNCNAME_msToggle,&MyHashItem[147]}, + /* 147 */ {"BACK",FUNCNAME_backBf,NULL}, + /* 148 */ {"OPTIONS",FUNCNAME_ldOpt,&MyHashItem[149]}, + /* 149 */ {"DEFINE_KEY",FUNCNAME_defKey,NULL}, +}; + +static HashItem_si *MyHashItemTbl[] = { + &MyHashItem[0], + NULL, + NULL, + NULL, + NULL, + &MyHashItem[3], + &MyHashItem[4], + &MyHashItem[6], + &MyHashItem[7], + &MyHashItem[12], + &MyHashItem[13], + &MyHashItem[14], + &MyHashItem[15], + &MyHashItem[16], + &MyHashItem[17], + &MyHashItem[22], + &MyHashItem[25], + &MyHashItem[27], + &MyHashItem[28], + &MyHashItem[30], + &MyHashItem[31], + NULL, + &MyHashItem[32], + NULL, + &MyHashItem[34], + NULL, + NULL, + &MyHashItem[35], + &MyHashItem[38], + &MyHashItem[40], + &MyHashItem[41], + &MyHashItem[42], + &MyHashItem[46], + &MyHashItem[47], + &MyHashItem[48], + &MyHashItem[50], + NULL, + &MyHashItem[52], + NULL, + &MyHashItem[55], + &MyHashItem[56], + &MyHashItem[58], + &MyHashItem[59], + &MyHashItem[60], + &MyHashItem[62], + &MyHashItem[63], + NULL, + &MyHashItem[65], + &MyHashItem[67], + &MyHashItem[71], + &MyHashItem[73], + &MyHashItem[77], + &MyHashItem[80], + &MyHashItem[84], + &MyHashItem[86], + &MyHashItem[88], + &MyHashItem[91], + &MyHashItem[94], + &MyHashItem[95], + &MyHashItem[96], + &MyHashItem[98], + NULL, + &MyHashItem[101], + NULL, + &MyHashItem[102], + &MyHashItem[104], + NULL, + NULL, + &MyHashItem[106], + &MyHashItem[111], + NULL, + &MyHashItem[112], + NULL, + &MyHashItem[113], + &MyHashItem[114], + &MyHashItem[116], + &MyHashItem[119], + &MyHashItem[120], + NULL, + &MyHashItem[124], + &MyHashItem[126], + &MyHashItem[127], + &MyHashItem[128], + NULL, + &MyHashItem[129], + &MyHashItem[132], + &MyHashItem[133], + NULL, + &MyHashItem[134], + &MyHashItem[137], + &MyHashItem[138], + &MyHashItem[140], + &MyHashItem[141], + NULL, + NULL, + &MyHashItem[144], + &MyHashItem[145], + &MyHashItem[146], + NULL, + &MyHashItem[148], +}; + +Hash_si functable = {100, MyHashItemTbl}; diff --git a/w3m/files/tagtable.c b/w3m/files/tagtable.c new file mode 100644 index 0000000..4315252 --- /dev/null +++ b/w3m/files/tagtable.c @@ -0,0 +1,281 @@ +#include "hash.h" +#include <stdio.h> +#include "html.h" +static HashItem_si MyHashItem[] = { + /* 0 */ {"option_int",HTML_OPTION_INT,&MyHashItem[1]}, + /* 1 */ {"/form_int",HTML_N_FORM_INT,&MyHashItem[2]}, + /* 2 */ {"/kbd",HTML_NOP,&MyHashItem[3]}, + /* 3 */ {"dd",HTML_DD,&MyHashItem[4]}, + /* 4 */ {"/dir",HTML_N_UL,NULL}, + /* 5 */ {"/body",HTML_N_BODY,&MyHashItem[6]}, + /* 6 */ {"noframes",HTML_NOFRAMES,NULL}, + /* 7 */ {"base",HTML_BASE,NULL}, + /* 8 */ {"/div",HTML_N_DIV,NULL}, + /* 9 */ {"tbody",HTML_TBODY,&MyHashItem[10]}, + /* 10 */ {"meta",HTML_META,&MyHashItem[11]}, + /* 11 */ {"i",HTML_I,NULL}, + /* 12 */ {"/_symbol",HTML_N_SYMBOL,&MyHashItem[13]}, + /* 13 */ {"sup",HTML_SUP,&MyHashItem[14]}, + /* 14 */ {"/p",HTML_N_P,NULL}, + /* 15 */ {"/q",HTML_N_Q,NULL}, + /* 16 */ {"input_alt",HTML_INPUT_ALT,&MyHashItem[17]}, + /* 17 */ {"dl",HTML_DL,NULL}, + /* 18 */ {"/tbody",HTML_N_TBODY,&MyHashItem[19]}, + /* 19 */ {"/s",HTML_N_S,NULL}, + /* 20 */ {"del",HTML_DEL,&MyHashItem[21]}, + /* 21 */ {"xmp",HTML_XMP,&MyHashItem[22]}, + /* 22 */ {"br",HTML_BR,NULL}, + /* 23 */ {"link",HTML_LINK,&MyHashItem[24]}, + /* 24 */ {"/u",HTML_N_U,&MyHashItem[25]}, + /* 25 */ {"em",HTML_EM,NULL}, + /* 26 */ {"title_alt",HTML_TITLE_ALT,&MyHashItem[27]}, + /* 27 */ {"caption",HTML_CAPTION,&MyHashItem[28]}, + /* 28 */ {"plaintext",HTML_PLAINTEXT,&MyHashItem[29]}, + /* 29 */ {"p",HTML_P,NULL}, + /* 30 */ {"q",HTML_Q,&MyHashItem[31]}, + /* 31 */ {"blockquote",HTML_BLQ,&MyHashItem[32]}, + /* 32 */ {"menu",HTML_UL,NULL}, + /* 33 */ {"/colgroup",HTML_N_COLGROUP,&MyHashItem[34]}, + /* 34 */ {"dfn",HTML_NOP,NULL}, + /* 35 */ {"s",HTML_S,&MyHashItem[36]}, + /* 36 */ {"strong",HTML_STRONG,NULL}, + /* 37 */ {"dt",HTML_DT,NULL}, + /* 38 */ {"u",HTML_U,NULL}, + /* 39 */ {"/map",HTML_N_MAP,&MyHashItem[40]}, + /* 40 */ {"/frameset",HTML_N_FRAMESET,&MyHashItem[41]}, + /* 41 */ {"/ol",HTML_N_OL,NULL}, + /* 42 */ {"/td",HTML_N_TD,NULL}, + /* 43 */ {"li",HTML_LI,NULL}, + /* 44 */ {"html",HTML_BODY,&MyHashItem[45]}, + /* 45 */ {"hr",HTML_HR,NULL}, + /* 46 */ {"/strong",HTML_N_STRONG,NULL}, + /* 47 */ {"/th",HTML_N_TH,&MyHashItem[48]}, + /* 48 */ {"option",HTML_OPTION,&MyHashItem[49]}, + /* 49 */ {"kbd",HTML_NOP,&MyHashItem[50]}, + /* 50 */ {"dir",HTML_UL,NULL}, + /* 51 */ {"col",HTML_COL,NULL}, + /* 52 */ {"/caption",HTML_N_CAPTION,&MyHashItem[53]}, + /* 53 */ {"div",HTML_DIV,NULL}, + /* 54 */ {"head",HTML_HEAD,&MyHashItem[55]}, + /* 55 */ {"ol",HTML_OL,&MyHashItem[56]}, + /* 56 */ {"/ul",HTML_N_UL,NULL}, + /* 57 */ {"/ins",HTML_N_INS,&MyHashItem[58]}, + /* 58 */ {"area",HTML_AREA,NULL}, + /* 59 */ {"pre_plain",HTML_PRE_PLAIN,&MyHashItem[60]}, + /* 60 */ {"td",HTML_TD,&MyHashItem[61]}, + /* 61 */ {"/option",HTML_N_OPTION,NULL}, + /* 62 */ {"/noframes",HTML_N_NOFRAMES,NULL}, + /* 63 */ {"/tr",HTML_N_TR,&MyHashItem[64]}, + /* 64 */ {"nobr",HTML_NOBR,NULL}, + /* 65 */ {"img_alt",HTML_IMG_ALT,&MyHashItem[66]}, + /* 66 */ {"table_alt",HTML_TABLE_ALT,&MyHashItem[67]}, + /* 67 */ {"th",HTML_TH,&MyHashItem[68]}, + /* 68 */ {"script",HTML_SCRIPT,&MyHashItem[69]}, + /* 69 */ {"/tt",HTML_NOP,NULL}, + /* 70 */ {"code",HTML_NOP,NULL}, + /* 71 */ {"samp",HTML_NOP,NULL}, + /* 72 */ {"textarea",HTML_TEXTAREA,NULL}, + /* 73 */ {"textarea_int",HTML_TEXTAREA_INT,NULL}, + /* 74 */ {"table",HTML_TABLE,&MyHashItem[75]}, + /* 75 */ {"img",HTML_IMG,&MyHashItem[76]}, + /* 76 */ {"/blockquote",HTML_N_BLQ,NULL}, + /* 77 */ {"applet",HTML_APPLET,&MyHashItem[78]}, + /* 78 */ {"map",HTML_MAP,&MyHashItem[79]}, + /* 79 */ {"ul",HTML_UL,NULL}, + /* 80 */ {"/script",HTML_N_SCRIPT,&MyHashItem[81]}, + /* 81 */ {"center",HTML_CENTER,NULL}, + /* 82 */ {"/table",HTML_N_TABLE,&MyHashItem[83]}, + /* 83 */ {"cite",HTML_NOP,&MyHashItem[84]}, + /* 84 */ {"/h1",HTML_N_H,NULL}, + /* 85 */ {"tr",HTML_TR,&MyHashItem[86]}, + /* 86 */ {"/h2",HTML_N_H,NULL}, + /* 87 */ {"image",HTML_IMG,&MyHashItem[88]}, + /* 88 */ {"/h3",HTML_N_H,NULL}, + /* 89 */ {"pre_int",HTML_PRE_INT,&MyHashItem[90]}, + /* 90 */ {"/font",HTML_N_FONT,&MyHashItem[91]}, + /* 91 */ {"tt",HTML_NOP,&MyHashItem[92]}, + /* 92 */ {"/h4",HTML_N_H,NULL}, + /* 93 */ {"body",HTML_BODY,&MyHashItem[94]}, + /* 94 */ {"/form",HTML_N_FORM,&MyHashItem[95]}, + /* 95 */ {"/h5",HTML_N_H,NULL}, + /* 96 */ {"/h6",HTML_N_H,NULL}, + /* 97 */ {"frame",HTML_FRAME,NULL}, + /* 98 */ {"/textarea_int",HTML_N_TEXTAREA_INT,&MyHashItem[99]}, + /* 99 */ {"/img_alt",HTML_N_IMG_ALT,&MyHashItem[100]}, + /* 100 */ {"/center",HTML_N_CENTER,NULL}, + /* 101 */ {"/pre",HTML_N_PRE,NULL}, + /* 102 */ {"tfoot",HTML_TFOOT,NULL}, + /* 103 */ {"ins",HTML_INS,NULL}, + /* 104 */ {"/var",HTML_NOP,NULL}, + /* 105 */ {"h1",HTML_H,NULL}, + /* 106 */ {"/tfoot",HTML_N_TFOOT,&MyHashItem[107]}, + /* 107 */ {"input",HTML_INPUT,&MyHashItem[108]}, + /* 108 */ {"h2",HTML_H,NULL}, + /* 109 */ {"h3",HTML_H,NULL}, + /* 110 */ {"h4",HTML_H,NULL}, + /* 111 */ {"h5",HTML_H,NULL}, + /* 112 */ {"internal",HTML_INTERNAL,&MyHashItem[113]}, + /* 113 */ {"h6",HTML_H,NULL}, + /* 114 */ {"div_int",HTML_DIV_INT,&MyHashItem[115]}, + /* 115 */ {"select_int",HTML_SELECT_INT,&MyHashItem[116]}, + /* 116 */ {"/pre_int",HTML_N_PRE_INT,NULL}, + /* 117 */ {"/menu",HTML_N_UL,NULL}, + /* 118 */ {"form_int",HTML_FORM_INT,&MyHashItem[119]}, + /* 119 */ {"/sub",HTML_N_SUB,NULL}, + /* 120 */ {"style",HTML_STYLE,&MyHashItem[121]}, + /* 121 */ {"address",HTML_BR,NULL}, + /* 122 */ {"/textarea",HTML_N_TEXTAREA,NULL}, + /* 123 */ {"/input_alt",HTML_N_INPUT_ALT,NULL}, + /* 124 */ {"doctype",HTML_DOCTYPE,&MyHashItem[125]}, + /* 125 */ {"/style",HTML_N_STYLE,NULL}, + /* 126 */ {"/html",HTML_N_BODY,NULL}, + /* 127 */ {"pre",HTML_PRE,&MyHashItem[128]}, + /* 128 */ {"title",HTML_TITLE,NULL}, + /* 129 */ {"select",HTML_SELECT,NULL}, + /* 130 */ {"/div_int",HTML_N_DIV_INT,&MyHashItem[131]}, + /* 131 */ {"var",HTML_NOP,NULL}, + /* 132 */ {"/title",HTML_N_TITLE,NULL}, + /* 133 */ {"embed",HTML_EMBED,&MyHashItem[134]}, + /* 134 */ {"/sup",HTML_N_SUP,&MyHashItem[135]}, + /* 135 */ {"colgroup",HTML_COLGROUP,&MyHashItem[136]}, + /* 136 */ {"/head",HTML_N_HEAD,&MyHashItem[137]}, + /* 137 */ {"isindex",HTML_ISINDEX,NULL}, + /* 138 */ {"strike",HTML_S,&MyHashItem[139]}, + /* 139 */ {"listing",HTML_LISTING,NULL}, + /* 140 */ {"bgsound",HTML_BGSOUND,NULL}, + /* 141 */ {"/address",HTML_BR,NULL}, + /* 142 */ {"thead",HTML_THEAD,&MyHashItem[143]}, + /* 143 */ {"wbr",HTML_WBR,&MyHashItem[144]}, + /* 144 */ {"/del",HTML_N_DEL,&MyHashItem[145]}, + /* 145 */ {"/nobr",HTML_N_NOBR,&MyHashItem[146]}, + /* 146 */ {"/select",HTML_N_SELECT,&MyHashItem[147]}, + /* 147 */ {"frameset",HTML_FRAMESET,&MyHashItem[148]}, + /* 148 */ {"/xmp",HTML_N_XMP,NULL}, + /* 149 */ {"/code",HTML_NOP,NULL}, + /* 150 */ {"_symbol",HTML_SYMBOL,&MyHashItem[151]}, + /* 151 */ {"/thead",HTML_N_THEAD,&MyHashItem[152]}, + /* 152 */ {"/samp",HTML_NOP,&MyHashItem[153]}, + /* 153 */ {"/dfn",HTML_NOP,&MyHashItem[154]}, + /* 154 */ {"_id",HTML_NOP,NULL}, + /* 155 */ {"/strike",HTML_N_S,&MyHashItem[156]}, + /* 156 */ {"/a",HTML_N_A,NULL}, + /* 157 */ {"/select_int",HTML_N_SELECT_INT,&MyHashItem[158]}, + /* 158 */ {"sub",HTML_SUB,&MyHashItem[159]}, + /* 159 */ {"/b",HTML_N_B,NULL}, + /* 160 */ {"/internal",HTML_N_INTERNAL,NULL}, + /* 161 */ {"/pre_plain",HTML_N_PRE_PLAIN,&MyHashItem[162]}, + /* 162 */ {"font",HTML_FONT,&MyHashItem[163]}, + /* 163 */ {"/dl",HTML_N_DL,NULL}, + /* 164 */ {"form",HTML_FORM,&MyHashItem[165]}, + /* 165 */ {"/cite",HTML_NOP,&MyHashItem[166]}, + /* 166 */ {"a",HTML_A,NULL}, + /* 167 */ {"b",HTML_B,NULL}, + /* 168 */ {"/listing",HTML_N_LISTING,&MyHashItem[169]}, + /* 169 */ {"/em",HTML_N_EM,&MyHashItem[170]}, + /* 170 */ {"/i",HTML_N_I,NULL}, +}; + +static HashItem_si *MyHashItemTbl[] = { + &MyHashItem[0], + &MyHashItem[5], + NULL, + &MyHashItem[7], + &MyHashItem[8], + &MyHashItem[9], + &MyHashItem[12], + &MyHashItem[15], + &MyHashItem[16], + &MyHashItem[18], + &MyHashItem[20], + &MyHashItem[23], + &MyHashItem[26], + &MyHashItem[30], + &MyHashItem[33], + &MyHashItem[35], + &MyHashItem[37], + &MyHashItem[38], + &MyHashItem[39], + NULL, + &MyHashItem[42], + &MyHashItem[43], + &MyHashItem[44], + &MyHashItem[46], + &MyHashItem[47], + NULL, + &MyHashItem[51], + NULL, + &MyHashItem[52], + NULL, + &MyHashItem[54], + &MyHashItem[57], + &MyHashItem[59], + &MyHashItem[62], + &MyHashItem[63], + NULL, + &MyHashItem[65], + &MyHashItem[70], + &MyHashItem[71], + &MyHashItem[72], + &MyHashItem[73], + &MyHashItem[74], + &MyHashItem[77], + NULL, + &MyHashItem[80], + &MyHashItem[82], + &MyHashItem[85], + &MyHashItem[87], + &MyHashItem[89], + &MyHashItem[93], + &MyHashItem[96], + &MyHashItem[97], + &MyHashItem[98], + &MyHashItem[101], + &MyHashItem[102], + &MyHashItem[103], + &MyHashItem[104], + &MyHashItem[105], + &MyHashItem[106], + &MyHashItem[109], + &MyHashItem[110], + &MyHashItem[111], + &MyHashItem[112], + NULL, + &MyHashItem[114], + &MyHashItem[117], + NULL, + NULL, + &MyHashItem[118], + &MyHashItem[120], + NULL, + &MyHashItem[122], + &MyHashItem[123], + &MyHashItem[124], + &MyHashItem[126], + NULL, + NULL, + &MyHashItem[127], + &MyHashItem[129], + NULL, + &MyHashItem[130], + &MyHashItem[132], + &MyHashItem[133], + &MyHashItem[138], + &MyHashItem[140], + &MyHashItem[141], + &MyHashItem[142], + NULL, + NULL, + &MyHashItem[149], + &MyHashItem[150], + &MyHashItem[155], + &MyHashItem[157], + NULL, + &MyHashItem[160], + NULL, + &MyHashItem[161], + &MyHashItem[164], + &MyHashItem[167], + &MyHashItem[168], +}; + +Hash_si tagtable = {100, MyHashItemTbl}; diff --git a/w3m/patches/001-configure.patch b/w3m/patches/001-configure.patch new file mode 100644 index 0000000..c630e77 --- /dev/null +++ b/w3m/patches/001-configure.patch @@ -0,0 +1,20 @@ +--- w3m-0.5.2/configure 2010-09-25 20:57:25.128744963 +0400 ++++ w3m-0.5.2_mod/configure 2010-09-25 20:57:51.055870033 +0400 +@@ -6221,7 +6221,7 @@ + _ACEOF + + +-for lib in bsd BSD 44bsd socket nsl dld dl ++for lib in BSD 44bsd socket nsl dld dl + do + lib=$lib + { echo "$as_me:$LINENO: checking for -l$lib" >&5 +@@ -7886,7 +7886,7 @@ + { (exit 1); exit 1; }; } + fi + fi +- unset ac_cv_lib_gc_GC_init ++ + { echo "$as_me:$LINENO: checking for GC_init in -lgc" >&5 + echo $ECHO_N "checking for GC_init in -lgc... $ECHO_C" >&6; } + if test "${ac_cv_lib_gc_GC_init+set}" = set; then diff --git a/w3m/patches/002-main.patch b/w3m/patches/002-main.patch new file mode 100644 index 0000000..093f2fb --- /dev/null +++ b/w3m/patches/002-main.patch @@ -0,0 +1,11 @@ +--- w3m-0.5.2/main.c 2007-05-31 05:19:50.000000000 +0400 ++++ w3m-0.5.2_mod/main.c 2010-09-25 18:12:27.960869894 +0400 +@@ -842,7 +842,7 @@ + mySignal(SIGPIPE, SigPipe); + #endif + +- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); ++ // orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); + err_msg = Strnew(); + if (load_argc == 0) { + /* no URL specified */ diff --git a/w3m/patches/003-Makefile.in.patch b/w3m/patches/003-Makefile.in.patch new file mode 100644 index 0000000..433040f --- /dev/null +++ b/w3m/patches/003-Makefile.in.patch @@ -0,0 +1,20 @@ +--- w3m-0.5.2/Makefile.in 2007-05-29 16:01:04.000000000 +0400 ++++ w3m-0.5.2_mod/Makefile.in 2010-09-25 22:01:16.666250962 +0400 +@@ -134,7 +134,7 @@ + $(OBJS) $(LOBJS): fm.h funcname1.h + + tagtable.c: tagtable.tab mktable$(EXT) html.h +- ./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@ ++# ./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@ + + indep.o: indep.c fm.h funcname1.h + func.o: funcname.c functable.c funcname1.h +@@ -167,7 +167,7 @@ + + functable.c: funcname.tab mktable$(EXT) + sort funcname.tab | $(AWK) -f $(top_srcdir)/functable.awk > functable.tab +- ./mktable$(EXT) 100 functable.tab > $@ ++# ./mktable$(EXT) 100 functable.tab > $@ + -rm -f functable.tab + + mktable$(EXT): mktable.o dummy.o $(ALIB) diff --git a/wordgrinder/Makefile b/wordgrinder/Makefile index 9a478ee..84b241f 100644 --- a/wordgrinder/Makefile +++ b/wordgrinder/Makefile @@ -16,7 +16,7 @@ define Package/wordgrinder TITLE:=A word processor for processing words URL:=http://wordgrinder.sourceforge.net/ SUBMENU:=Editors - DEPENDS:=+libncursesw lua luafilesystem BROKEN + DEPENDS:=+libncursesw lua luafilesystem endef define Package/wordgrinder/description diff --git a/wtime/Makefile b/wtime/Makefile new file mode 100644 index 0000000..640fce8 --- /dev/null +++ b/wtime/Makefile @@ -0,0 +1,43 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=wtime +PKG_VERSION:=0.2 +PKG_RELEASE:=2 + +PKG_SOURCE:=wtime_0_2.tar.gz +PKG_SOURCE_URL:=@SF/wtime +PKG_MD5SUM:=59c2d41048706993ca260afcdab337c3 +PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/wtime + +include $(INCLUDE_DIR)/package.mk + +define Package/wtime + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:= + TITLE:=WTime time tracker + URL:=http://wtime.sourceforge.net +endef + +define Package/wtime/description + Time tracking command-line utility. +endef + +define Build/Configure + $(call Build/Compile/Default, \ + ) +endef + + +define Package/wtime/install + $(INSTALL_DIR) $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wtime $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/root/.wtimed/ + $(INSTALL_DIR) $(1)/usr/share/ + $(INSTALL_DIR) $(1)/usr/share/wtime/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/LICENCE $(1)/usr/share/wtime/ +endef + +$(eval $(call BuildPackage,wtime)) diff --git a/wtime/patches/config.patch b/wtime/patches/config.patch new file mode 100644 index 0000000..af3017f --- /dev/null +++ b/wtime/patches/config.patch @@ -0,0 +1,24 @@ +--- wtime/config.mk 2006-06-17 14:30:50.000000000 +0200 ++++ wtimem/config.mk 2010-12-08 20:11:42.933802915 +0100 +@@ -1,17 +1,11 @@ + # Customize to fit your system + +-PREFIX = /usr/local ++INCLUDES = -I. ++LIBS = + +-INCDIR = ${PREFIX}/include +-LIBDIR = ${PREFIX}/lib ++CFLAGS = -std=c99 -O2 ++LDFLAGS = + +-INCLUDES = -I. -I${INCDIR} -I/usr/include +-LIBS = -L${LIBDIR} -L/usr/lib -lc +- +-CFLAGS = -std=c99 -O2 ${INCLUDES} +-LDFLAGS = ${LIBS} +- +-CC = gcc + CP = cp -f + RM = rm -f + MKDIR = mkdir diff --git a/wtime/patches/wtime.patch b/wtime/patches/wtime.patch new file mode 100644 index 0000000..9f75b66 --- /dev/null +++ b/wtime/patches/wtime.patch @@ -0,0 +1,12 @@ +--- wtime/wtime.c 2006-06-17 14:29:37.000000000 +0200 ++++ wtimem/wtime.c 2010-12-08 20:20:18.692552915 +0100 +@@ -10,7 +10,8 @@ + + typedef enum { EMPTY, STARTED, STOPPED, UNKNOWN } Tstate; + +-char usage[] = "wt [-t task] [-h|-a|-s|-c|-r [<start>[<end>]]]\nFor more info see the man page.\n"; ++//char usage[] = "wt [-t task] [-h|-a|-s|-c|-r [<start>[<end>]]]\nFor more info see the man page.\n"; ++char usage[] = "wt [-t task] [-h|-a|-s|-c|-r [<start>[<end>]]]\nExamples:\n wt -a ... start counting\n wt -s ... stop counting\n wt -c ... show running time in seconds\n wt -r ... show spent time in seconds\n"; + + static int fgetlastl(FILE * fd, char *lbuf, int size) + { |
