diff --git a/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe b/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe index c3c910c4c..9eead7fc4 100644 --- a/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe +++ b/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe @@ -21,49 +21,35 @@ REVISION="1" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" -PATCHES="libavlduptree-${portVersion}.patch" - PROVIDES=" libavlduptree$secondaryArchSuffix = $portVersion lib:libavlduptree$secondaryArchSuffix = 1.0.0 compat >= 1 - cmd:AGMSAVLTest$secondaryArchSuffix - app:AGMSAVLTest " REQUIRES=" haiku$secondaryArchSuffix - cmd:autoconf cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:ar - cmd:ranlib - cmd:install " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel - cmd:autoconf cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:install cmd:mkdir " BUILD() { - autoconf - runConfigure ./configure make $jobArgs } INSTALL() { mkdir -p $libDir - mkdir -p $binDir - make install PREFIX=$libDir BINDIR=$binDir - addAppDeskbarSymlink $binDir/AGMSAVLTest + make install INSTALL_DIR=$libDir # set up the develop directory correctly prepareInstalledDevelLibs libavlduptree diff --git a/haiku-libs/libavlduptree/patches/libavlduptree-1.0.0.patch b/haiku-libs/libavlduptree/patches/libavlduptree-1.0.0.patch deleted file mode 100644 index 2d54ee78c..000000000 --- a/haiku-libs/libavlduptree/patches/libavlduptree-1.0.0.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Naur AVLDupTree/configure.in AVLDupTree-haiku/configure.in ---- AVLDupTree/configure.in 1970-01-01 00:00:00.000000000 +0000 -+++ AVLDupTree-haiku/configure.in 2015-01-11 18:54:32.475791360 +0000 -@@ -0,0 +1,25 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_PREREQ([2.69]) -+AC_INIT(AVLDupTree, 1.0.0, https://github.com/HaikuArchives/AVLDupTree/issues) -+AC_CONFIG_SRCDIR([Source/AVLDupTree.c]) -+# AC_CONFIG_HEADERS([config.h]) -+ -+# Checks for programs. -+AC_PROG_CXX -+AC_PROG_CC -+ -+# Checks for libraries. -+ -+# Checks for header files. -+AC_CHECK_HEADERS([OS.h stdlib.h string.h]) -+ -+# Checks for typedefs, structures, and compiler characteristics. -+AC_CHECK_HEADER_STDBOOL -+ -+# Checks for library functions. -+AC_FUNC_MALLOC -+AC_CHECK_FUNCS([memset strerror]) -+ -+AC_OUTPUT -diff -Naur AVLDupTree/Makefile AVLDupTree-haiku/Makefile ---- AVLDupTree/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ AVLDupTree-haiku/Makefile 2015-01-11 23:01:41.289406976 +0000 -@@ -0,0 +1,32 @@ -+CC=gcc -+CFLAGS=-g -O2 -Wall -ISource $(OPTFLAGS) -+ -+SOURCES=$(wildcard Source/*.c) -+OBJECTS=$(patsubst %.c,%.o,$(SOURCES)) -+GUISOURCES=Source/Main.cpp -+GUIEXE=bin/AGMSAVLTest -+ -+TARGET=build/libavlduptree.so -+ -+all: $(TARGET) $(SO_TARGET) -+ -+$(TARGET): build $(OBJECTS) -+ $(CC) -shared -o $(TARGET) $(OBJECTS) -+ -+build: -+ @mkdir -p build -+ @mkdir -p bin -+ -+clean: -+ @rm -rf build $(OBJECTS) $(TESTS) -+ -+install: all $(GUIEXE) -+ install $(TARGET) $(PREFIX) -+ -+$(GUIEXE): CFLAGS += -Wno-multichar -+$(GUIEXE): CFLAGS+= -lbe -+$(GUIEXE): $(SOURCES) $(GUISOURCES) -+ $(CC) $(CFLAGS) $^ -o $@ -+ install $(GUIEXE) $(BINDIR)/ -+ -+.PHONY: all clean install