haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Package creation makefile rules improved;

Browse Source 
x86_64 build fixed.
This commit is contained in:
Siarzhuk Zharski
2013-01-19 20:31:21 +00:00
parent bb824ed842
commit ae3fc0d930
1 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
app-editors/vim/patches/vim-7.3.patch
View File

@@ -12,55 +12,48 @@ diff -Naur vim73/Makefile vim73.haiku/Makefile
+# - Go to "src" directory and use "make autoconf" to regenerate configure script.
+# - Default "make [install]" will produce GUI version.
+# - To prepare Haiku package use following command:
+# make haiku_package GCCVER_SUFFIX="-gcc2"
+# make haiku_package
+# Both gui-less and full versions of vim will be packaged.
VIMVER = vim-$(MAJOR).$(MINOR)
VERSION = $(MAJOR)$(MINOR)
@@ -236,6 +245,7 @@
COMMENT_OS2 = comment/$(VERSION)-bin-os2
COMMENT_HTML = comment/$(VERSION)-html
COMMENT_FARSI = comment/$(VERSION)-farsi
+COMMENT_HAIKU = comment/$(VERSION)-haiku
dist/$(COMMENT_RT): dist/comment
echo "Vim - Vi IMproved - v$(VDOT) runtime files for MS-DOS and MS-Windows" > dist/$(COMMENT_RT)
@@ -270,6 +280,9 @@
dist/$(COMMENT_FARSI): dist/comment
echo "Vim - Vi IMproved - v$(VDOT) Farsi language files" > dist/$(COMMENT_FARSI)
+dist/$(COMMENT_HAIKU): dist/comment
+ echo "Vim - Vi IMproved - v$(VDOT)$(GCCVER_SUFFIX) package for Haiku OS" > dist/$(COMMENT_HAIKU)
+
unixall: dist prepare
-rm -f dist/$(VIMVER).tar.bz2
-rm -rf dist/$(VIMRTDIR)
@@ -576,3 +589,26 @@
@@ -576,3 +585,37 @@
farsi: dist dist/$(COMMENT_FARSI)
-rm -f dist/farsi$(VERSION).zip
zip -9 -rD -z dist/farsi$(VERSION).zip farsi < dist/$(COMMENT_FARSI)
+
+haiku_package: dist dist/$(COMMENT_HAIKU)
+# Haiku package
+MACHINE=$(shell uname -m)
+ifeq ($(MACHINE), BePC)
+ MACHINE = x86-gcc$(word 1, $(subst -, , $(subst ., , $(shell $(CC) -dumpversion))))
+endif
+DATE = `date +%F`
+PACKAGE_NAME := vim-$(VDOT)-$(MACHINE)-$(DATE)
+COMMENT = .OptionalPackageDescription
+DESCRIPTION = dist/boot/$(COMMENT)
+
+haiku_package: dist
+ -rm -rf dist/boot/
+ ./configure --prefix=/boot/common \
+ --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
+ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
+ --with-features=big --with-compiledby="$(COMPILEDBY)"
+ --with-features=big --with-compiledby="$(COMPILEDBY)" --disable-nls
+ make clean; make install DESTDIR=`pwd`/dist
+ ./configure --prefix=/boot/common \
+ --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
+ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
+ --with-features=big --disable-gui --with-compiledby="$(COMPILEDBY)"
+ --with-features=big --disable-gui --with-compiledby="$(COMPILEDBY)" --disable-nls
+ make clean; make install DESTDIR=`pwd`/dist
+ -mkdir -p dist/boot/common/data/licenses
+ -cp runtime/doc/uganda.txt dist/boot/common/data/licenses/vim
+ echo "Package: Vim" > dist/boot/.OptionalPackageDescription
+ echo "Version: $(VDOT)$(GCCVER_SUFFIX)" >> dist/boot/.OptionalPackageDescription
+ echo "Copyright: Bram Moolenaar et al." >> dist/boot/.OptionalPackageDescription
+ echo "Description: Vi IMproved. Highly configurable text editor." >> dist/boot/.OptionalPackageDescription
+ echo "License: vim" >> dist/boot/.OptionalPackageDescription
+ echo "URL: http://www.vim.org/" >> dist/boot/.OptionalPackageDescription
+ cd dist/boot && zip -9 -r -z -y ../vim-$(VDOT)$(GCCVER_SUFFIX)-`date +%F`.zip * .OptionalPackageDescription* < ../$(COMMENT_HAIKU)
+ ln -s -T vim dist/boot/common/bin/vi
+ echo "Package: Vim" > $(DESCRIPTION)
+ echo "Version: $(VDOT)-$(MACHINE)" >> $(DESCRIPTION)
+ echo "Copyright: Bram Moolenaar et al." >> $(DESCRIPTION)
+ echo "Description: Vi IMproved. Highly configurable text editor." >> $(DESCRIPTION)
+ echo "License: vim" >> $(DESCRIPTION)
+ echo "URL: http://www.vim.org/" >> $(DESCRIPTION)
+ cd dist/boot && zip -9 -r -z -y ../$(PACKAGE_NAME).zip * $(COMMENT) < $(COMMENT)
+
diff -Naur vim73/runtime/doc/eval.txt vim73.haiku/runtime/doc/eval.txt
--- vim73/runtime/doc/eval.txt 2010-08-15 14:23:20.045088768 +0200
@@ -547,7 +540,7 @@ diff -Naur vim73/runtime/vimrc_example.vim vim73.haiku/runtime/vimrc_example.vim
diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile
--- vim73/src/Makefile 2010-08-15 12:56:15.017301504 +0000
+++ vim73.haiku/src/Makefile 2010-08-20 23:27:51.707264512 +0000
@@ -1242,6 +1242,21 @@
@@ -1242,6 +1242,23 @@
# too:
#EXTRA_LIBS = /usr/openwin/lib/libXmu.sa -lm
@@ -557,8 +550,10 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile
+BEOSGUI_DEFS = -DFEAT_GUI_BEOS
+BEOSGUI_IPATH =
+BEOSGUI_LIBS_DIR =
+BEOSGUI_LIBS1 = -lbe -lroot -ltracker -lsupc++ -ltranslation
+#BEOSGUI_LIBS1 = -lbe -lroot -ltracker -ltranslation
+BEOSGUI_LIBS1 = -lbe -lroot -ltracker -ltranslation
+ifeq ($(strip $(word 1, $(subst -, , $(subst ., , $(shell $(CC) -dumpversion))))), 4)
+BEOSGUI_LIBS1 += -lsupc++
+endif
+BEOSGUI_LIBS2 =
+BEOSGUI_INSTALL = install_normal install_beos_extra
+BEOSGUI_TARGETS = installglinks_beos
@@ -569,7 +564,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile
# PHOTON GUI
PHOTONGUI_SRC = gui.c gui_photon.c pty.c
PHOTONGUI_OBJ = objects/gui.o objects/gui_photon.o objects/pty.o
@@ -2458,6 +2473,9 @@
@@ -2458,6 +2475,9 @@
objects/gui_athena.o: gui_athena.c
$(CCC) -o $@ gui_athena.c
@@ -579,7 +574,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile
objects/gui_beval.o: gui_beval.c
$(CCC) -o $@ gui_beval.c
@@ -2585,6 +2603,9 @@
@@ -2585,6 +2605,9 @@
objects/os_beos.o: os_beos.c
$(CCC) -o $@ os_beos.c
@@ -589,7 +584,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile
objects/os_qnx.o: os_qnx.c
$(CCC) -o $@ os_qnx.c
@@ -2738,6 +2759,56 @@
@@ -2738,6 +2761,56 @@
###############################################################################
@@ -3737,7 +3732,7 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc
+gui_beos_process_event(bigtime_t timeout)
+{
+ struct VimMsg vm;
+ long what;
+ int32 what;
+ ssize_t size;
+
+ size = read_port_etc(gui.vdcmp, &what, &vm, sizeof(vm),
@@ -6176,7 +6171,7 @@ diff -Naur vim73/src/os_beos.rdef vim73.haiku/src/os_beos.rdef
+
+resource app_version {
+ major = 7,
+ middle = 2,
+ middle = 3,
+ minor = 0,
+
+ variety = B_APPV_FINAL,