diff --git a/git/build.sh b/git/build.sh index 551a873..38d1476 100755 --- a/git/build.sh +++ b/git/build.sh @@ -9,67 +9,89 @@ ########################################################### # Check the following 4 variables before running the script topdir=git -version=1.5.3.4 -pkgver=3 +version=1.5.5.1 +pkgver=1 source[0]=$topdir-$version.tar.bz2 source[1]=$topdir-manpages-$version.tar.bz2 # If there are no patches, simply comment this patch[0]=git-1.5.3.4-symlinks.patch +patch[1]=git-1.5.5.1-socklen_t.patch +patch[2]=git-1.5.5.1-sunos56.patch # Source function library . ${BUILDPKG_BASE}/scripts/buildpkg.functions # Global settings -export topinstalldir=/usr/sbware -export prefix=$topinstalldir + +# Helper to tweak makefile defines +set_define() +{ + ${__sed} -e "/Define $1/ s/.*/$1=$2/" Makefile > Makefile.1 + mv Makefile.1 Makefile +} + +export ICONVDIR=$prefix +export PERL_PATH=$prefix/bin/perl +export SHELL_PATH=$prefix/bin/bash +no_configure=1 +make_check_target="test" +__configure="make" +configure_args="" reg prep prep() { generic_prep setdir source - perl -i -pe 's;ginstall;/usr/local/bin/install;g' Makefile - perl -i -pe 's;gtar;/usr/local/bin/tar;g' Makefile - sed -e '/Define NO_CURL/ s/.*/NO_CURL=Yes/' Makefile > Makefile.1 + perl -i -pe "s;ginstall;${__install};g" Makefile + perl -i -pe "s;gtar;${__tar};g" Makefile + for def in NO_CURL NO_EXPAT NO_TCLTK; do + set_define $def YesPlease + done + + # Set default buildflags + sed -e "/^LDFLAGS/ s;.*;LDFLAGS = -L$prefix/lib -R$prefix/lib;" Makefile > Makefile.1 mv Makefile.1 Makefile - sed -e '/PERL_PATH =/ s;.*;PERL_PATH=/opt/csw/bin/perl;' Makefile > Makefile.1 - mv Makefile.1 Makefile - sed -e '/Define NO_EXPAT/ s/.*/NO_EXPAT=Yes/' Makefile > Makefile.1 - mv Makefile.1 Makefile -# sed -e '/Define NO_PERL_MAKEMAKER/ s/.*/NO_PERL_MAKEMAKER=Yes/' Makefile.1 > Makefile -# mv Makefile.1 Makefile - sed -e '/Define NO_TCLTK/ s/.*/NO_TCLTK=Yes/' Makefile > Makefile.1 - mv Makefile.1 Makefile - sed -e '/^LDFLAGS/ s;.*;LDFLAGS = -L/usr/sbware/lib -R/usr/sbware/lib -L/usr/local/lib -R/usr/local/lib;' Makefile > Makefile.1 + sed -e "/^CFLAGS/ s;\(.*\);\1 -I$prefix/include;" Makefile > Makefile.1 mv Makefile.1 Makefile sed -e "/^prefix =/ s;.*;prefix = $prefix;" Makefile > Makefile.1 mv Makefile.1 Makefile + # sed -e '/Define V=/ s/.*/V=1/' Makefile > Makefile.1 # mv Makefile.1 Makefile +## sed -e '/Define NO_PERL_MAKEMAKER/ s/.*/NO_PERL_MAKEMAKER=Yes/' Makefile.1 > Makefile +## mv Makefile.1 Makefile } reg build build() { - setdir source - $MAKE_PROG + generic_build +# setdir source +# ${__make} # cd perl # perl Makefile.PL PREFIX="${stagedir}${prefix}" INSTALLDIRS="vendor" } +reg check +check() +{ + generic_check +} + reg install install() { generic_install DESTDIR mkdir -p ${stagedir}${prefix}/${_mandir} setdir ${stagedir}${prefix}/${_mandir} - $TAR -xvjf ${srcfiles}/${source[1]} + ${__tar} -xvjf ${srcfiles}/${source[1]} # Hopeless, absolutely hopeless :( - setdir ${stagedir}${prefix}/${_libdir}/perl5/site_perl - mkdir -p ${stagedir}/opt/csw/lib/perl/site_perl - mv * ${stagedir}/opt/csw/lib/perl/site_perl - setdir ${stagedir}${prefix}/${_libdir} - rm -rf perl* + #setdir ${stagedir}${prefix}/${_libdir}/perl5/site_perl + #mkdir -p ${stagedir}/opt/csw/lib/perl/site_perl + #mv * ${stagedir}/opt/csw/lib/perl/site_perl + #setdir ${stagedir}${prefix}/${_libdir} + #rm -rf perl* } reg pack diff --git a/git/meta/depend.git b/git/meta/depend.git deleted file mode 100644 index 379f34f..0000000 --- a/git/meta/depend.git +++ /dev/null @@ -1,4 +0,0 @@ -P SBlibiconv GNU libiconv -P SBlibgccso1 libgcc_s.so.1 from gcc 3.3.2+ -P SBossl098glib Openssl 0.9.8g libraries -P CSWperl perl from blastwave diff --git a/git/meta/pkgdef b/git/meta/pkgdef index 3e782e3..e8181bd 100644 --- a/git/meta/pkgdef +++ b/git/meta/pkgdef @@ -1,9 +1,9 @@ [git] -pkgname="$pkgprefix""$topdir" -name="$topdir" +pkgname="${pkgprefix}${topdir}" +name="$topdir - Git revision control system" pkgcat="application" pkgvendor="http://git.or.cz" -pkgdesc="A distributed scm" +pkgdesc="A fast, scalable, distributed revision control system" pkgver="$pkgver" files(-,root,bin) * diff --git a/git/meta/relnotes b/git/meta/relnotes new file mode 100644 index 0000000..bd83629 --- /dev/null +++ b/git/meta/relnotes @@ -0,0 +1,27 @@ +PACKAGE DETAILS +--------------- +Name: %%PKGNAME%% +Version: %%SOURCE_AND_VER%% +Vendor: %%VENDOR%% +Packager: %%PKGEDBY%% + +Source (sha1sum): +%%SOURCE_SHA1SUM%% + +BUILD DETAILS +------------- +Compiler: +%%COMPILER%% + +Environment: +%%ENVIRONMENT%% + +Configure: +%%CONFIGURE%% + +KNOWN DEPENDENCIES +------------------ +%%DEPENDENCIES%% + +ERRORS/MISCELLANEOUS +-------------------- diff --git a/git/src/git-1.5.5.1-socklen_t.patch b/git/src/git-1.5.5.1-socklen_t.patch new file mode 100644 index 0000000..2e6145a --- /dev/null +++ b/git/src/git-1.5.5.1-socklen_t.patch @@ -0,0 +1,24 @@ +--- git-1.5.5.1/git-compat-util.h.socklen_t 2008-05-11 20:17:59.225343000 +0200 ++++ git-1.5.5.1/git-compat-util.h 2008-05-11 20:20:01.765932000 +0200 +@@ -453,4 +453,8 @@ + # define FORCE_DIR_SET_GID 0 + #endif + ++#ifdef NO_SOCKLEN_T ++typedef int socklen_t; ++#endif ++ + #endif +--- git-1.5.5.1.hack/Makefile.socklen_t 2008-05-11 20:26:52.657848000 +0200 ++++ git-1.5.5.1.hack/Makefile 2008-05-11 20:28:06.418161000 +0200 +@@ -852,6 +852,10 @@ + LIB_OBJS += compat/inet_pton.o + endif + ++ifdef NO_SOCKLEN_T ++ BASIC_CFLAGS += -DNO_SOCKLEN_T ++endif ++ + ifdef NO_ICONV + BASIC_CFLAGS += -DNO_ICONV + endif diff --git a/git/src/git-1.5.5.1-sunos56.patch b/git/src/git-1.5.5.1-sunos56.patch new file mode 100644 index 0000000..39e5e29 --- /dev/null +++ b/git/src/git-1.5.5.1-sunos56.patch @@ -0,0 +1,25 @@ +--- git-1.5.5.1.hack/Makefile.sunos56 2008-04-21 00:17:13.000000000 +0200 ++++ git-1.5.5.1.hack/Makefile 2008-05-11 20:21:37.326327000 +0200 +@@ -573,6 +573,22 @@ + NO_MEMMEM = YesPlease + NO_HSTRERROR = YesPlease + NO_MKDTEMP = YesPlease ++ ifeq ($(uname_R),5.6) ++ NEEDS_LIBICONV = YesPlease ++ NO_UNSETENV = YesPlease ++ NO_SETENV = YesPlease ++ NO_C99_FORMAT = YesPlease ++ NO_STRTOUMAX = YesPlease ++ NO_D_TYPE_IN_DIRENT = YesPlease ++ NO_SOCKADDR_STORAGE = YesPlease ++ NO_STRCASESTR = YesPlease ++ NO_STRLCPY = YesPlease ++ NO_STRTOUMAX = YesPlease ++ NO_IPV6 = YesPlease ++ NO_INET_NTOP = YesPlease ++ NO_INET_PTON = YesPlease ++ NO_SOCKLEN_T = YesPlease ++ endif + ifeq ($(uname_R),5.8) + NEEDS_LIBICONV = YesPlease + NO_UNSETENV = YesPlease