diff --git a/app-cdr/cdrtools/cdrtools-2.01.01a77.bep b/app-cdr/cdrtools/cdrtools-2.01.01a77.bep index b258a37d3..ea13e679c 100644 --- a/app-cdr/cdrtools/cdrtools-2.01.01a77.bep +++ b/app-cdr/cdrtools/cdrtools-2.01.01a77.bep @@ -7,18 +7,10 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd cdrtools-2.01.01 - patch -p1 -ui ../../patches/cdrtools-2.01.01a77-haiku.patch make } INSTALL { cd cdrtools-2.01.01 - if [ -n ${DESTDIR} ];then - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/common/lib - ln -s ${DESTDIR}/apps/cdrtools/cdrecord ${DESTDIR}/common/lib/cdrecord - ln -s ${DESTDIR}/apps/cdrtools/mkisofs ${DESTDIR}/common/lib/mkisofs - else - make install - fi + make install } diff --git a/app-cdr/cdrtools/cdrtools-2.01.01-haiku.diff b/app-cdr/cdrtools/patches/cdrtools-2.01.01a66.patch similarity index 100% rename from app-cdr/cdrtools/cdrtools-2.01.01-haiku.diff rename to app-cdr/cdrtools/patches/cdrtools-2.01.01a66.patch diff --git a/app-cdr/cdrtools/patches/cdrtools-2.01.01a77-haiku.patch b/app-cdr/cdrtools/patches/cdrtools-2.01.01a77-haiku.patch deleted file mode 100644 index 24ac6871c..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-2.01.01a77-haiku.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN cdrtools-2.01.01/DEFAULTS/Defaults.haiku cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku ---- cdrtools-2.01.01/DEFAULTS/Defaults.haiku 2009-07-25 15:36:53.000000000 +0000 -+++ cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku 2009-10-12 04:53:52.000000000 +0000 -@@ -1,7 +1,7 @@ --#ident "@(#)Defaults.haiku 1.3 09/07/25 " -+#ident "@(#)Defaults.beos 1.5 09/06/04 " - ########################################################################### - # --# global definitions for Haiku Systems -+# global definitions for BeOS Systems - # - ########################################################################### - # -@@ -29,16 +29,16 @@ - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_APPS_DIRECTORY)/cdrtools/lib - #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) --RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -+RUNPATH= -R$(INS_BASE)/lib - - ########################################################################### - # - # Installation config stuff - # - ########################################################################### --INS_BASE= /boot/opt/schily -+INS_BASE= $(shell finddir B_APPS_DIRECTORY)/cdrtools - INS_KBASE= / - INS_RBASE= / - # diff --git a/app-cdr/cdrtools/patches/cdrtools-2.01.01a66-haiku.patch b/app-cdr/cdrtools/patches/cdrtools-2.01.01a77.patch similarity index 100% rename from app-cdr/cdrtools/patches/cdrtools-2.01.01a66-haiku.patch rename to app-cdr/cdrtools/patches/cdrtools-2.01.01a77.patch