diff --git a/srcpkgs/ftjam/files/LICENSE b/srcpkgs/ftjam/files/LICENSE deleted file mode 100644 index 4b633251a9d..00000000000 --- a/srcpkgs/ftjam/files/LICENSE +++ /dev/null @@ -1,7 +0,0 @@ -Copyright 1993-2002 Christopher Seiwald and Perforce Software, Inc. - -License is hereby granted to use this software and distribute it -freely, as long as this copyright notice is retained and modifications -are clearly marked. - -ALL WARRANTIES ARE HEREBY DISCLAIMED. diff --git a/srcpkgs/ftjam/patches/gcc-14.patch b/srcpkgs/ftjam/patches/gcc-14.patch new file mode 100644 index 00000000000..4cec8b22523 --- /dev/null +++ b/srcpkgs/ftjam/patches/gcc-14.patch @@ -0,0 +1,50 @@ +--- a/execunix.c ++++ b/execunix.c +@@ -42,6 +42,8 @@ + # include "lists.h" + # include "execcmd.h" + # include ++# include ++# include + + # ifdef USE_EXECUNIX + +@@ -102,7 +104,7 @@ execcmd( + { + int pid; + int slot; +- const char *argv[ MAXARGC + 1 ]; /* +1 for NULL */ ++ char *argv[ MAXARGC + 1 ]; /* +1 for NULL */ + + # ifdef USE_EXECNT + char *p; +--- a/fileunix.c ++++ b/fileunix.c +@@ -36,6 +36,7 @@ + # include "jam.h" + # include "filesys.h" + # include "pathsys.h" ++# include + + # ifdef USE_FILEUNIX + +--- a/make1.c ++++ b/make1.c +@@ -61,6 +61,7 @@ + # include "make.h" + # include "command.h" + # include "execcmd.h" ++# include + + static void make1a( TARGET *t, TARGET *parent ); + static void make1b( TARGET *t ); +--- a/mkjambase.c ++++ b/mkjambase.c +@@ -24,6 +24,7 @@ + # include + # include + ++int + main( int argc, char **argv, char **envp ) + { + char buf[ 1024 ]; diff --git a/srcpkgs/ftjam/template b/srcpkgs/ftjam/template index 4b4b1001c6b..bac28e45d31 100644 --- a/srcpkgs/ftjam/template +++ b/srcpkgs/ftjam/template @@ -1,18 +1,20 @@ # Template file for 'ftjam' pkgname=ftjam -version=2.5.3rc2 -revision=5 -nocross=yes +reverts="2.5.3rc2_1 2.5.3rc2_2 2.5.3rc2_3 2.5.3rc2_4 2.5.3rc2_5" +version=2.5.2 +revision=1 build_style=gnu-configure hostmakedepends="bison" -short_desc="Enhanced version of the Jam build tool" +short_desc="FreeType's version of the Jam build tool" maintainer="Orphaned " -license="ftjam - /usr/share/licenses/ftjam/LICENSE" +license="Jam" +homepage="http://freetype.org/jam/" +# distfiles="http://david.freetype.org/jam/${pkgname}-${version}.tar.bz2" +distfiles="${SOURCEFORGE_SITE}/freetype/ftjam-${version}.tar.bz2" +checksum=e89773500a92912de918e9febffabe4b6bce79d69af194435f4e032b8a6d66a3 +nocross=yes provides="jam-${version}_${revision}" replaces="jam>=0" -homepage="http://freetype.org/jam/" -distfiles="http://david.freetype.org/jam/${pkgname}-${version}.tar.bz2" -checksum=a9f8a274049893a4d1f1ad82f7b04f3ebc2554635dd606185e20ba97cb4d64ec do_build() { unset AR @@ -20,5 +22,6 @@ do_build() { make ${makejobs} } post_install() { - vlicense ${FILESDIR}/LICENSE + head -n13 jam.c >LICENSE + vlicense LICENSE }