summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-11-27 21:44:06 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-11-27 21:44:06 -0500
commitf47a2d8a121ceca17b28467728a00d4ebe2ec1c0 (patch)
tree38966b60fbe2abac84c252974e411ecaf229adcf
parenta976c4f12966caf5f25500850b343add29093532 (diff)
downloadabslibre-f47a2d8a121ceca17b28467728a00d4ebe2ec1c0.tar.gz
abslibre-f47a2d8a121ceca17b28467728a00d4ebe2ec1c0.tar.bz2
abslibre-f47a2d8a121ceca17b28467728a00d4ebe2ec1c0.zip
fix up the java makepkg-git situation
-rw-r--r--java/makepkg-git/PKGBUILD48
l---------java/pacman-makepkg-git/0001-Add-conflict-for-replacing-owned-empty-directory.patch1
l---------java/pacman-makepkg-git/0002-Check-empty-subdirectory-ownership.patch1
-rw-r--r--java/pacman-makepkg-git/PKGBUILD116
l---------java/pacman-makepkg-git/PKGBUILD.orig1
l---------java/pacman-makepkg-git/makepkg.conf1
l---------java/pacman-makepkg-git/pacman.conf1
l---------java/pacman-makepkg-git/pacman.conf.mips64el1
l---------java/pacman-makepkg-git/pacman.conf.x86_641
l---------java/pacman-makepkg-git/pacman.install1
10 files changed, 48 insertions, 124 deletions
diff --git a/java/makepkg-git/PKGBUILD b/java/makepkg-git/PKGBUILD
new file mode 100644
index 000000000..a8542c318
--- /dev/null
+++ b/java/makepkg-git/PKGBUILD
@@ -0,0 +1,48 @@
+# vim: set ts=2 sw=2 et:
+# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Maintainer: Dave Reisner <dave@archlinux.org>
+
+_pkgname=pacman
+pkgname=makepkg-git
+_relver=4.0.3
+_gitver=2abe1f16461133c0dc386f8ecb8b06865c22940b
+pkgver=${_relver}.git
+
+provides=($_pkgname=$pkgver)
+replaces=(pacman-makepkg-git)
+conflicts=(pacman-makepkg-git)
+
+pkgrel=1
+
+pkgdesc="Pacman's makepkg, built from git sources"
+#arch=('i686' 'x86_64' 'mips64el')
+arch=('any')
+url="http://www.archlinux.org/pacman/"
+license=('GPL')
+#groups=('base')
+depends=('bash' 'libarchive>=3.0.2' 'curl>=7.19.4' 'gpgme')
+makedepends=('asciidoc')
+optdepends=('fakeroot: for makepkg usage as normal user')
+#backup=(etc/pacman.conf etc/makepkg.conf)
+#install=pacman.install
+options=(!libtool)
+source=(https://projects.archlinux.org/pacman.git/snapshot/$_pkgname-$_gitver.tar.gz)
+md5sums=('4013517cf9016c920b525611bd63d6dc')
+
+build() {
+ cd $srcdir/$_pkgname-$_gitver
+
+ ./autogen.sh
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ make -C "$_pkgname-$_gitver" check
+}
+
+package() {
+ install -Dm755 $srcdir/$_pkgname-$_gitver/scripts/makepkg $pkgdir/usr/bin/makepkg-git
+}
diff --git a/java/pacman-makepkg-git/0001-Add-conflict-for-replacing-owned-empty-directory.patch b/java/pacman-makepkg-git/0001-Add-conflict-for-replacing-owned-empty-directory.patch
deleted file mode 120000
index ea3e7b047..000000000
--- a/java/pacman-makepkg-git/0001-Add-conflict-for-replacing-owned-empty-directory.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch \ No newline at end of file
diff --git a/java/pacman-makepkg-git/0002-Check-empty-subdirectory-ownership.patch b/java/pacman-makepkg-git/0002-Check-empty-subdirectory-ownership.patch
deleted file mode 120000
index 9efbca3c0..000000000
--- a/java/pacman-makepkg-git/0002-Check-empty-subdirectory-ownership.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/0002-Check-empty-subdirectory-ownership.patch \ No newline at end of file
diff --git a/java/pacman-makepkg-git/PKGBUILD b/java/pacman-makepkg-git/PKGBUILD
deleted file mode 100644
index 0c72f03e9..000000000
--- a/java/pacman-makepkg-git/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer: Dave Reisner <dave@archlinux.org>
-
-_pkgname=pacman
-pkgname=$_pkgname-makepkg-git
-_relver=4.0.3
-_gitver=2abe1f16461133c0dc386f8ecb8b06865c22940b
-pkgver=${_relver}.git
-
-provides=($_pkgname=$pkgver)
-replaces=($_pkgname)
-conflicts=($_pkgname)
-
-pkgrel=1
-
-pkgdesc="A library-based package manager with dependency support (with makepkg from git)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.archlinux.org/pacman/"
-license=('GPL')
-#groups=('base')
-depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4'
- 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring')
-makedepends=('asciidoc')
-optdepends=('fakeroot: for makepkg usage as normal user')
-backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
-options=(!libtool)
-source=(ftp://ftp.archlinux.org/other/pacman/$_pkgname-$_relver.tar.gz{,.sig}
- https://projects.archlinux.org/pacman.git/snapshot/$_pkgname-$_gitver.tar.gz
- 0001-Add-conflict-for-replacing-owned-empty-directory.patch
- 0002-Check-empty-subdirectory-ownership.patch
- pacman.conf
- pacman.conf.x86_64
- pacman.conf.mips64el
- makepkg.conf)
-md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
- '1a70392526c8768470da678b31905a6e'
- '4013517cf9016c920b525611bd63d6dc'
- '1a9b79788640907a2b34e8671cacc94a'
- 'a9ddd43891bed364e1e97d27b2887bf1'
- '080d9f76f56e135cc62205874636aa0f'
- 'ce9943fc8086d491890565e91ea1a0d8'
- 'eb8dba9bd0b315230fbf0e5dc0a7335b'
- 'debc512689a1aa8c124fe0ccf27f5758')
-
-build() {
- cd $srcdir/$_pkgname-$_relver
-
- patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
- patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --enable-doc
- make
-
- cd $srcdir/$_pkgname-$_gitver
-
- ./autogen.sh
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --enable-doc
- make
-}
-
-check() {
- make -C "$_pkgname-$_relver" check
- make -C "$_pkgname-$_gitver" check
-}
-
-package() {
- cd $srcdir/$_pkgname-$_relver
- make DESTDIR=$pkgdir install
- install $srcdir/$_pkgname-$_gitver/scripts/makepkg $pkgdir/usr/bin/makepkg
-
- # install Arch specific stuff
- mkdir -p $pkgdir/etc
- case "$CARCH" in
- i686)
- install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
- mycarch="i686"
- mychost="i686-pc-linux-gnu"
- myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
- ;;
- x86_64)
- install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
- mycarch="x86_64"
- mychost="x86_64-unknown-linux-gnu"
- myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
- ;;
- mips64el)
- install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
- mycarch="mips64el"
- mychost="mips64el-unknown-linux-gnu"
- myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
- ;;
- esac
- install -m644 $srcdir/makepkg.conf $pkgdir/etc/
- # set things correctly in the default conf file
- sed -i $pkgdir/etc/makepkg.conf \
- -e "s|@CARCH[@]|$mycarch|g" \
- -e "s|@CHOST[@]|$mychost|g" \
- -e "s|@LDFLAGS[@]|$myldflags|g" \
- -e "s|@CARCHFLAGS[@]|$myflags|g"
-
- # install completion files
- install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman"
- for f in makepkg pacman-key; do
- ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
- done
-
- install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
-}
diff --git a/java/pacman-makepkg-git/PKGBUILD.orig b/java/pacman-makepkg-git/PKGBUILD.orig
deleted file mode 120000
index 448b40973..000000000
--- a/java/pacman-makepkg-git/PKGBUILD.orig
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/PKGBUILD \ No newline at end of file
diff --git a/java/pacman-makepkg-git/makepkg.conf b/java/pacman-makepkg-git/makepkg.conf
deleted file mode 120000
index 2d1108635..000000000
--- a/java/pacman-makepkg-git/makepkg.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/makepkg.conf \ No newline at end of file
diff --git a/java/pacman-makepkg-git/pacman.conf b/java/pacman-makepkg-git/pacman.conf
deleted file mode 120000
index c75a6eed0..000000000
--- a/java/pacman-makepkg-git/pacman.conf
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/pacman.conf \ No newline at end of file
diff --git a/java/pacman-makepkg-git/pacman.conf.mips64el b/java/pacman-makepkg-git/pacman.conf.mips64el
deleted file mode 120000
index 01fb857d8..000000000
--- a/java/pacman-makepkg-git/pacman.conf.mips64el
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/pacman.conf.mips64el \ No newline at end of file
diff --git a/java/pacman-makepkg-git/pacman.conf.x86_64 b/java/pacman-makepkg-git/pacman.conf.x86_64
deleted file mode 120000
index 1be1966fd..000000000
--- a/java/pacman-makepkg-git/pacman.conf.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/pacman.conf.x86_64 \ No newline at end of file
diff --git a/java/pacman-makepkg-git/pacman.install b/java/pacman-makepkg-git/pacman.install
deleted file mode 120000
index 0b1fee98c..000000000
--- a/java/pacman-makepkg-git/pacman.install
+++ /dev/null
@@ -1 +0,0 @@
-../../libre/pacman/pacman.install \ No newline at end of file