From 35a965b84d3d09c261075c280e17b198151788eb Mon Sep 17 00:00:00 2001 From: rudson Date: Tue, 29 Apr 2008 14:02:11 +0000 Subject: git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@501 04377dda-e619-0410-9926-eae83683ac58 --- trunk/mkbuild/generic.mkSlackBuild | 25 +++++++++++++++++-------- trunk/mkbuild/model.mkbuild | 1 + 2 files changed, 18 insertions(+), 8 deletions(-) (limited to 'trunk/mkbuild') diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild index 87ecd43..d06167d 100644 --- a/trunk/mkbuild/generic.mkSlackBuild +++ b/trunk/mkbuild/generic.mkSlackBuild @@ -17,9 +17,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General # Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place - Suite 330, Boston, MA 02111-1307, USA +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # # slackbuild for [[PROGRAM NAME]], by [[SLACKBUILD AUTHOR]] # requires: [[REQUIRES]] @@ -188,6 +188,15 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`" cd "$PKG_SRC" + off +# Get svn source code +cd "$PKG_WORK" +svn checkout [[DOWNLOAD FOLDER URL]] $PKG_SRC || exit $ERROR_VCS +PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`" +cd "$PKG_SRC" +[ -e autogen.sh ] && . ./autogen.sh + + off # Patch source patches="[[PATCH FILES]] @@ -207,7 +216,7 @@ done if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then for patch_url in [[PATCH URLS]]; do - patch="`basename $patch_url`" + patch="`basename $patch_url`" if [ ! -s "$SRC_DIR/$patch" ]; then wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET fi @@ -299,13 +308,13 @@ done mkdir -p "$PKG/install" || exit $ERROR_MKDIR cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must +# on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler----------------------------------------------------| [[SLACK-DESC]] EODESC @@ -338,7 +347,7 @@ mkgroup() { if ! grep -qe "^\$GROUP:" etc/group; then echo Creating group \$GROUP... chroot . /usr/sbin/groupadd \$GROUP - fi + fi } mkuser() { diff --git a/trunk/mkbuild/model.mkbuild b/trunk/mkbuild/model.mkbuild index 3dd7b06..848ef50 100644 --- a/trunk/mkbuild/model.mkbuild +++ b/trunk/mkbuild/model.mkbuild @@ -132,6 +132,7 @@ off: md5sum_download_and_check_0 off: md5sum_download_and_check_1 off: gpg_signature_check on: untar_source +off: get_svn_source off: patch_source on: configure on: make_package -- cgit v1.2.3