moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

Merge commit 'allan/working'

Browse Source
This commit is contained in:
Dan McGee 2009-06-23 21:52:35 -05:00
commit 68813ca986
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/PKGBUILD.5.txt
View File

@ -161,7 +161,7 @@ name. The syntax is: `source=('filename::url')`.
Versioned provisions are also possible, in the 'name=version' format. Versioned provisions are also possible, in the 'name=version' format.
For example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0' For example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0'
dependency of other packages. Provisions involving the '>' and '<' dependency of other packages. Provisions involving the '>' and '<'
operators are invalid as only specifc versions of a package may be operators are invalid as only specific versions of a package may be
provided. provided.
*replaces (array)*:: *replaces (array)*::
@ -221,7 +221,7 @@ name. The syntax is: `source=('filename::url')`.
operation, even if the version number would normally not trigger operation, even if the version number would normally not trigger
such an upgrade. This is useful when the version numbering scheme such an upgrade. This is useful when the version numbering scheme
of a package changes (or is alphanumeric). See linkman:pacman[8] for of a package changes (or is alphanumeric). See linkman:pacman[8] for
more infomation on version comparisons. more information on version comparisons.
build() Function build() Function

54
scripts/makepkg.sh.in
View File

@ -871,22 +871,7 @@ tidy_install() {
fi fi
} }
create_package() { write_pkginfo() {
if [ -z "$1" ]; then
nameofpkg="$pkgname"
else
nameofpkg="$1"
fi
if [ ! -d "$pkgdir" ]; then
error "$(gettext "Missing pkg/ directory.")"
plain "$(gettext "Aborting...")"
exit 1 # $E_MISSING_PKGDIR
fi
cd "$pkgdir"
msg "$(gettext "Creating package...")"
local builddate=$(date -u "+%s") local builddate=$(date -u "+%s")
if [ -n "$PACKAGER" ]; then if [ -n "$PACKAGER" ]; then
local packager="$PACKAGER" local packager="$PACKAGER"
@ -958,6 +943,25 @@ create_package() {
warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT" warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT"
plain "$(gettext "Example for GPL\'ed software: license=('GPL').")" plain "$(gettext "Example for GPL\'ed software: license=('GPL').")"
fi fi
}
create_package() {
if [ ! -d "$pkgdir" ]; then
error "$(gettext "Missing pkg/ directory.")"
plain "$(gettext "Aborting...")"
exit 1 # $E_MISSING_PKGDIR
fi
if [ -z "$1" ]; then
nameofpkg="$pkgname"
else
nameofpkg="$1"
fi
write_pkginfo $nameofpkg
cd "$pkgdir"
msg "$(gettext "Creating package...")"
local comp_files=".PKGINFO" local comp_files=".PKGINFO"
@ -1012,15 +1016,15 @@ create_package() {
create_srcpackage() { create_srcpackage() {
cd "$startdir" cd "$startdir"
if [ "$SOURCEONLY" -eq 2 ]; then
# get back to our src directory so we can begin with sources # Get back to our src directory so we can begin with sources.
mkdir -p "$srcdir" mkdir -p "$srcdir"
cd "$srcdir" cd "$srcdir"
download_sources download_sources
# we can only check checksums if we have all files # We can only check checksums if we have all files.
check_checksums check_checksums
cd "$startdir" cd "$startdir"
fi
msg "$(gettext "Creating source package...")" msg "$(gettext "Creating source package...")"
local srclinks="$(mktemp -d "$startdir"/srclinks.XXXXXXXXX)" local srclinks="$(mktemp -d "$startdir"/srclinks.XXXXXXXXX)"
mkdir "${srclinks}"/${pkgbase} mkdir "${srclinks}"/${pkgbase}