diff --git a/srcpkgs/go/template b/srcpkgs/go/template index 7160397a3c..e465b2e620 100644 --- a/srcpkgs/go/template +++ b/srcpkgs/go/template @@ -3,7 +3,6 @@ pkgname=go version=r58 revision=1 build_style=custom-install -build_wrksrc=go-release short_desc="The Go Programming Language" maintainer="Juan RP " homepage="http://golang.org/" @@ -16,8 +15,7 @@ long_desc=" flexible and modular program construction. Go compiles quickly to machine code yet has the convenience of garbage collection and the power of run-time reflection. It's a fast, statically typed, compiled language that feels like - a dynamically typed, interpreted language. -" + a dynamically typed, interpreted language." nofetch=yes noextract=yes @@ -33,25 +31,20 @@ Add_dependency build bison Add_dependency build gawk Add_dependency build glibc-devel -do_fetch() -{ +do_fetch() { local url="https://go.googlecode.com/hg" - cd $wrksrc - hg clone -u ${version} ${url} ${build_wrksrc} + hg clone -u ${version} ${url} ${pkgname}-${version} } -do_build() -{ - cd ${wrksrc}/${build_wrksrc}/src +do_build() { + cd ${wrksrc}/src GOROOT="${wrksrc}/${build_wrksrc}" GOROOT_FINAL="/opt/go/" bash ./make.bash hg --config extensions.purge= purge . --all } -do_install() -{ - cd ${wrksrc}/${build_wrksrc} +do_install() { vmkdir opt/go 755 for i in bin doc misc src lib include pkg;do vcopy $i opt/go diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index 9a56ee72b6..855386a3ae 100644 --- a/srcpkgs/linux-firmware/template +++ b/srcpkgs/linux-firmware/template @@ -2,7 +2,6 @@ pkgname=linux-firmware version="$(date +%Y%m%d)" build_style=custom-install -build_wrksrc=$pkgname short_desc="Binary firmware blobs for the Linux kernel" maintainer="Juan RP " homepage="http://www.kernel.org/" @@ -24,15 +23,13 @@ ar9170-firmware>=0" Add_dependency build coreutils Add_dependency build git -do_fetch() -{ +do_fetch() { url="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git" msg_normal " Fetching source from $url ...\n" - cd ${wrksrc} && git clone $url + git clone ${url} ${pkgname}-${version} } -do_install() -{ +do_install() { install -d ${DESTDIR}/lib/firmware install -d ${DESTDIR}/usr/share/licenses/${pkgname} cp -a * ${DESTDIR}/lib/firmware diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index 11ec50e23a..b665d20883 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -4,11 +4,10 @@ _distver=7.3 _patchver=237 version=${_distver}.${_patchver} build_style=gnu_configure -build_wrksrc=vim73 configure_args="--disable-perlinterp --disable-pythoninterp --disable-rubyinterp - --disable-cscope --disable-workshop --disable-netbeans --disable-sniff - --disable-gpm --disable-hangulinput --disable-xim --enable-gui=no - --without-x --enable-multibyte --with-tlib=ncursesw" +--disable-cscope --disable-workshop --disable-netbeans --disable-sniff +--disable-gpm --disable-hangulinput --disable-xim --enable-gui=no +--without-x --enable-multibyte --with-tlib=ncursesw" short_desc="Vim editor (vi clone)" maintainer="Juan RP " long_desc=" @@ -19,6 +18,7 @@ long_desc=" nofetch=yes noextract=yes subpackages="vim-common" + Add_dependency run glibc Add_dependency run ncurses-libs Add_dependency run acl @@ -28,9 +28,7 @@ Add_dependency build ncurses-devel Add_dependency build acl-devel Add_dependency build mercurial -do_fetch() -{ +do_fetch() { local url="https://vim.googlecode.com/hg" - cd ${wrksrc} - hg clone -u v7-3-${_patchver} ${url} ${build_wrksrc} + hg clone -u v7-3-${_patchver} ${url} ${pkgname}-${version} } diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template index 3204a4c2b8..8394a761d2 100644 --- a/srcpkgs/xbps-devel/template +++ b/srcpkgs/xbps-devel/template @@ -2,8 +2,6 @@ pkgname=xbps-devel version="$(date +%Y%m%d)" build_style=configure -build_wrksrc="xbps" -configure_script="./configure" configure_args="--prefix=/ --includedir=/usr/include --datadir=/usr/share --mandir=/usr/share/man --with-pie" short_desc="The XBPS package system (development branch)" @@ -38,9 +36,8 @@ Add_dependency build libarchive-devel Add_dependency build openssl-devel Add_dependency build libfetch-devel -do_fetch() -{ +do_fetch() { local url="git://github.com/xtraeme/xbps" msg_normal " Fetching source from $url ...\n" - cd ${wrksrc} && git clone $url + git clone ${url} ${pkgname}-${version} } diff --git a/srcpkgs/xf86-video-ati-git-snapshot/template b/srcpkgs/xf86-video-ati-git-snapshot/template index 6e3cfd24e9..34d0de50b3 100644 --- a/srcpkgs/xf86-video-ati-git-snapshot/template +++ b/srcpkgs/xf86-video-ati-git-snapshot/template @@ -2,7 +2,6 @@ pkgname=xf86-video-ati-git-snapshot version="$(date +%Y%m%d)" build_style=gnu_configure -build_wrksrc=${pkgname} short_desc="Xorg ATI Radeon video driver (git snapshot)" maintainer="Juan RP " long_desc=" @@ -32,14 +31,12 @@ Add_dependency build pixman-devel Add_dependency build xorg-util-macros Add_dependency build xorg-server-devel -do_fetch() -{ +do_fetch() { local url="git://anongit.freedesktop.org/xorg/driver/xf86-video-ati" msg_normal " Fetching from master git repository...\n" - cd ${wrksrc} && git clone ${url} ${build_wrksrc} + git clone ${url} ${pkgname}-${version} } -pre_configure() -{ - cd ${build_wrksrc} && ./autogen.sh +pre_configure() { + ./autogen.sh } diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template index fb37b1484f..a422783ee9 100644 --- a/srcpkgs/xf86-video-nouveau/template +++ b/srcpkgs/xf86-video-nouveau/template @@ -3,7 +3,6 @@ pkgname=xf86-video-nouveau _distver=0.0.16 _gitver="$(date +%Y%m%d)" version=${_distver}.${_gitver} -build_wrksrc=nouveau build_style=gnu_configure short_desc="Xorg OpenSource NVIDIA video driver" maintainer="Juan RP " @@ -30,15 +29,12 @@ Add_dependency build libudev-devel Add_dependency build xorg-server-devel Add_dependency build xorg-util-macros -do_fetch() -{ +do_fetch() { local gitrepo="git://anongit.freedesktop.org/nouveau/xf86-video-nouveau" - msg_normal "Fetching source from git repo at: $gitrepo\n" - cd ${wrksrc} && git clone -v --depth 1 $gitrepo ${build_wrksrc} + git clone --depth 1 ${gitrepo} ${pkgname}-${version} } -pre_configure() -{ - cd ${build_wrksrc} && autoreconf -fi +pre_configure() { + autoreconf -fi }