diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2012-02-07 10:30:40 -0600 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2012-02-07 10:30:40 -0600 |
commit | 9085e5e45cbd65c004af3b3014e1cf7a52bf63e1 (patch) | |
tree | 15c4f81bf0391d494ba634bcc561547a5825ad26 /libre | |
parent | 655aabe10c5d75c91787a53a558f90489b85d1a9 (diff) | |
parent | b07a9cd02c59fb33fb249aee0de79b45d4b96fbb (diff) |
Merge branch 'master' of gitpar:abslibre-mips64el
Diffstat (limited to 'libre')
-rw-r--r-- | libre/audacious-plugins-libre/PKGBUILD | 38 | ||||
-rw-r--r-- | libre/cups-libre/cups | 1 | ||||
-rw-r--r-- | libre/cups-libre/cups-avahi.patch | 1 | ||||
-rw-r--r-- | libre/cups-libre/cups-no-export-ssllibs.patch | 1 | ||||
-rw-r--r-- | libre/cups-libre/cups-no-gcrypt.patch | 1 | ||||
-rw-r--r-- | libre/cups-libre/cups.logrotate | 1 | ||||
-rw-r--r-- | libre/cups-libre/cups.pam | 1 | ||||
-rw-r--r-- | libre/kdenetwork-libre/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/kdeutils-libre/PKGBUILD | 194 | ||||
-rw-r--r-- | libre/kdeutils-libre/fix-kcalc-keys.patch | 93 | ||||
-rw-r--r-- | libre/kdeutils-libre/kdeutils.install | 11 | ||||
-rw-r--r-- | libre/kdeutils-libre/rePKGBUILD | 34 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/texlive-bin-libre/archlinux-build.patch | 40 |
14 files changed, 19 insertions, 401 deletions
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 0dc7a2830..8dc995bdc 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -5,7 +5,7 @@ # Parabola maintainer: Brendan Tildesley pkgname=audacious-plugins-libre -pkgver=3.1 +pkgver=3.2 pkgrel=1 pkgdesc='Plugins for Audacious without unfree plugins' url='http://audacious-media-player.org/' @@ -14,10 +14,10 @@ license=('GPL' 'GPL3' 'LGPL' 'custom') # Licensing issues: # The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice -# but I've been informed by an upstream dev, <nenolod>, that they are all GPL of some type. -# -# The plugin 'psf' is currently BSD+noncommercial, but is apparently being changed to GPL. -# However, 'psf' is apparently an emulator for running non-free code, so I'll leave it out. +# but I've been informed by an upstream dev, nenolod, that they are all GPL. I don't know what version +# +# The plugin 'psf' is currently (Nov 2011) BSD+noncommercial, but is apparently being changed to GPL. +# However, 'psf' is apparently an emulator for running non-free code, so I'm not rushing to fix it. # # All the other custom licensed plugins I think are mostly modified BSD or ISC. @@ -57,15 +57,15 @@ optdepends=('oss: Open Sound System v4 output' 'libmms: libmms-based mms transport' 'libcue: CUE playlist format') -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d5f2ef19cda220d6fa7dd26c514c5c22c8dd7b42') +source=("http://repo.parabolagnulinux.org/~brendan/src-libre/${pkgname}-${pkgver}.tar.xz") +sha1sums=('6375b65b975e2905a8ff1c0ddfaeee2a71bbef94') -# Retrieve upstream & remove plugins 'psf' & 'usf' due to issues mentioned above. Repackage as -libre +# Retrieve upstream & remove plugin 'psf' due to issues mentioned above. Repackage as -libre mksource(){ - [ -f ${pkgname%-libre}-$pkgver.tar.gz ] || wget http://distfiles.atheme.org/${pkgname%-libre}-$pkgver.tar.gz - tar xzf ${pkgname%-libre}-${pkgver}.tar.gz + [ -f ${pkgname%-libre}-$pkgver.tar.bz2 ] || wget http://distfiles.audacious-media-player.org/${pkgname%-libre}-$pkgver.tar.bz2 + tar xjf ${pkgname%-libre}-${pkgver}.tar.bz2 - rm -rvf ${pkgname%-libre}-$pkgver/src/{p,u}usf/ + rm -rvf ${pkgname%-libre}-$pkgver/src/psf/ sed -i s/enable_psf=yes/enable_psf=no/ ${pkgname%-libre}-$pkgver/configure mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver @@ -78,24 +78,20 @@ mksource(){ build() { cd "${srcdir}/${pkgname}-${pkgver}" - # hack to enable global hotkeys with gtk3 - sed -e 's/gdk-x11-2.0/gdk-x11-3.0/g' -i configure - # Get license notices out of custom-licensed packages cd src tmpdir=$(mktemp -d /tmp/${pkgname}-${pkgver}-XXXX) head -n 18 albumart/albumart.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.albumart head -n 17 alsa/alsa.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.alsa + head -n 17 audpl/audpl.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.audpl head -n 18 cairo-spectrum/cairo-spectrum.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.cairo-spectrum head -n 17 compressor/compressor.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor head -n 17 crossfade/crossfade.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade head -n 18 crystalizer/crystalizer.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer - head -n 22 dockalbumart/dockalbumart.c | cut -c 4- | tail -n 21 > ${tmpdir}/LICENSE.dockalbumart head -n 18 lyricwiki/lyricwiki.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki head -n 19 mpg123/mpg123.c | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123 - head -n 17 openal/openal.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.openal + head -n 17 mpris2/plugin.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mpris2 head -n 17 resample/resample.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample - head -n 18 roaraudio-vio/roaraudio-vio.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.roaraudio-vio head -n 17 unix-io/unix-io.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io head -n 18 voice_removal/voice_removal.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal head -n 25 xsf/corlett.c | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs @@ -105,22 +101,22 @@ build() { pushd $tmpdir install -m644 LICENSE.albumart $l install -m644 LICENSE.alsa $l + install -m644 LICENSE.audpl $l install -m644 LICENSE.cairo-spectrum $l install -m644 LICENSE.compressor $l install -m644 LICENSE.crossfade $l install -m644 LICENSE.crystalizer $l - install -m644 LICENSE.dockalbumart $l install -m644 LICENSE.lyricwiki $l install -m644 LICENSE.mpg123 $l - install -m644 LICENSE.openal $l + install -m644 LICENSE.mpris2 $l install -m644 LICENSE.resample $l - install -m644 LICENSE.roaraudio-vio $l install -m644 LICENSE.unix-io $l install -m644 LICENSE.voice_removal $l install -m644 LICENSE.xfs $l popd - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --enable-amidiplug \ --disable-adplug diff --git a/libre/cups-libre/cups b/libre/cups-libre/cups index a9d91de76..744c8e663 100644 --- a/libre/cups-libre/cups +++ b/libre/cups-libre/cups @@ -66,4 +66,3 @@ case "$1" in esac exit 0 - diff --git a/libre/cups-libre/cups-avahi.patch b/libre/cups-libre/cups-avahi.patch index 47860ef97..7e9c8ecea 100644 --- a/libre/cups-libre/cups-avahi.patch +++ b/libre/cups-libre/cups-avahi.patch @@ -3154,4 +3154,3 @@ Origin: git clone http://twaugh.fedorapeople.org/cups-avahi.git (Aug 11, 2011) cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups"); #endif /* HAVE_DNSSD */ - diff --git a/libre/cups-libre/cups-no-export-ssllibs.patch b/libre/cups-libre/cups-no-export-ssllibs.patch index 24bac2e56..9be3c819b 100644 --- a/libre/cups-libre/cups-no-export-ssllibs.patch +++ b/libre/cups-libre/cups-no-export-ssllibs.patch @@ -10,4 +10,3 @@ diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/conf AC_SUBST(EXPORT_SSLLIBS) - diff --git a/libre/cups-libre/cups-no-gcrypt.patch b/libre/cups-libre/cups-no-gcrypt.patch index ab299d989..42f71d0d4 100644 --- a/libre/cups-libre/cups-no-gcrypt.patch +++ b/libre/cups-libre/cups-no-gcrypt.patch @@ -36,4 +36,3 @@ diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/ # elif defined(HAVE_CDSASSL) # include <CoreFoundation/CoreFoundation.h> # include <Security/Security.h> - diff --git a/libre/cups-libre/cups.logrotate b/libre/cups-libre/cups.logrotate index 67c4cdd39..9c49bbdaf 100644 --- a/libre/cups-libre/cups.logrotate +++ b/libre/cups-libre/cups.logrotate @@ -6,4 +6,3 @@ /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true endscript } - diff --git a/libre/cups-libre/cups.pam b/libre/cups-libre/cups.pam index 5a31a927a..53724d1f8 100644 --- a/libre/cups-libre/cups.pam +++ b/libre/cups-libre/cups.pam @@ -1,4 +1,3 @@ auth required pam_unix.so account required pam_unix.so session required pam_unix.so - diff --git a/libre/kdenetwork-libre/PKGBUILD b/libre/kdenetwork-libre/PKGBUILD index d8fa960e5..2f4b4c21c 100644 --- a/libre/kdenetwork-libre/PKGBUILD +++ b/libre/kdenetwork-libre/PKGBUILD @@ -12,7 +12,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-krfb') pkgver=4.8.0 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdenetwork') diff --git a/libre/kdeutils-libre/PKGBUILD b/libre/kdeutils-libre/PKGBUILD deleted file mode 100644 index f0256b815..000000000 --- a/libre/kdeutils-libre/PKGBUILD +++ /dev/null @@ -1,194 +0,0 @@ -# $Id: PKGBUILD 146715 2012-01-16 19:50:44Z dreisner $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeutils -pkgname=('kdeutils-ark-libre' - 'kdeutils-filelight' - 'kdeutils-kcalc' - 'kdeutils-kcharselect' - 'kdeutils-kdf' - 'kdeutils-kfloppy' - 'kdeutils-kgpg' - 'kdeutils-kremotecontrol' - 'kdeutils-ktimer' - 'kdeutils-kwallet' - 'kdeutils-printer-applet' - 'kdeutils-superkaramba' - 'kdeutils-sweeper') -pkgver=4.7.4 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeutils') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' - 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' - 'qjson') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('4630f01f36558eb5494fc562086fbd4e488e411e') - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - - # Use Python2 - sed -i 's|/usr/bin/python|/usr/bin/python2|' \ - kcharselect/kcharselect-generate-datafile.py \ - superkaramba/examples/richtext/rtext.py - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ - printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 - make -} - -package_kdeutils-ark-libre() { - pkgdesc='Archiving Tool' - depends=('kdebase-runtime' 'kdebase-lib' 'libarchive') - optdepends=('p7zip' 'zip' 'unzip' 'ununrar') - provides=("kdeutils-ark=$pkgver") - replaces=('kdeutils-ark') - conflicts=('kdeutils-ark') - url="http://kde.org/applications/utilities/ark/" - cd $srcdir/build/ark - make DESTDIR=$pkgdir install - cd $srcdir/build/ark/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-filelight() { - pkgdesc='View disk usage information' - depends=('kdebase-runtime' 'qimageblitz') - replaces=('filelight') - conflicts=('filelight') - install='kdeutils.install' - url="http://methylblue.com/filelight/" - cd $srcdir/build/filelight - make DESTDIR=$pkgdir install - cd $srcdir/build/filelight/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kcalc() { - pkgdesc='Scientific Calculator' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kcalc/" - cd $srcdir/build/kcalc - make DESTDIR=$pkgdir install - cd $srcdir/build/kcalc/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kcharselect() { - pkgdesc='Character Selector' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kcharselect/" - cd $srcdir/build/kcharselect - make DESTDIR=$pkgdir install - cd $srcdir/build/kcharselect/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kdf() { - pkgdesc='View Disk Usage' - depends=('kdebase-runtime') - url="http://kde.org/applications/system/kdiskfree/" - install='kdeutils.install' - cd $srcdir/build/kdf - make DESTDIR=$pkgdir install - cd $srcdir/build/kdf/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kfloppy() { - pkgdesc='Floppy Formatter' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kfloppy/" - install='kdeutils.install' - cd $srcdir/build/kfloppy - make DESTDIR=$pkgdir install - cd $srcdir/build/kfloppy/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kgpg() { - pkgdesc='A GnuPG frontend' - depends=('kdepim-runtime' 'kde-agent') - url="http://kde.org/applications/utilities/kgpg" - install='kdeutils.install' - cd $srcdir/build/kgpg - make DESTDIR=$pkgdir install - cd $srcdir/build/kgpg/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kremotecontrol() { - pkgdesc='Configure your remote controls for use with applications' - replaces=('kdeutils-kdelirc') - conflicts=('kdeutils-kdelirc') - depends=('kdebase-workspace') - url="http://kde.org/applications/utilities/kremotecontrol" - install='kdeutils.install' - cd $srcdir/build/kremotecontrol - make DESTDIR=$pkgdir install - cd $srcdir/build/kremotecontrol/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-ktimer() { - pkgdesc='Countdown Launcher' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/ktimer" - install='kdeutils.install' - cd $srcdir/build/ktimer - make DESTDIR=$pkgdir install - cd $srcdir/build/ktimer/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kwallet() { - pkgdesc='Wallet Management Tool' - depends=('kdebase-runtime') - url="http://kde.org/applications/system/kwalletmanager/" - install='kdeutils.install' - cd $srcdir/build/kwallet - make DESTDIR=$pkgdir install - cd $srcdir/build/kwallet/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-printer-applet() { - pkgdesc='System tray icon for managing print jobs' - depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common') - url="http://kde.org/applications/system/printerapplet/" - cd $srcdir/build/printer-applet - make DESTDIR=$pkgdir install - cd $srcdir/build/printer-applet/doc - make DESTDIR=$pkgdir install -} - -package_kdeutils-superkaramba() { - pkgdesc='An engine for cool desktop eyecandy' - depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz') - url="http://kde.org/applications/utilities/superkaramba" - install='kdeutils.install' - cd $srcdir/build/superkaramba - make DESTDIR=$pkgdir install -} - -package_kdeutils-sweeper() { - pkgdesc='System Cleaner' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/sweeper/" - cd $srcdir/build/sweeper - make DESTDIR=$pkgdir install - cd $srcdir/build/sweeper/doc - make DESTDIR=$pkgdir install -} diff --git a/libre/kdeutils-libre/fix-kcalc-keys.patch b/libre/kdeutils-libre/fix-kcalc-keys.patch deleted file mode 100644 index 0bfc4b3b2..000000000 --- a/libre/kdeutils-libre/fix-kcalc-keys.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- trunk/KDE/kdeutils/kcalc/kcalc.ui 2011/07/06 18:27:29 1240129 -+++ trunk/KDE/kdeutils/kcalc/kcalc.ui 2011/07/06 18:27:58 1240130 -@@ -616,7 +616,7 @@ - <string>7</string> - </property> - <property name="shortcut"> -- <string notr="true">7</string> -+ <string>7</string> - </property> - </widget> - </item> -@@ -632,7 +632,7 @@ - <string>8</string> - </property> - <property name="shortcut"> -- <string notr="true">8</string> -+ <string>8</string> - </property> - </widget> - </item> -@@ -648,7 +648,7 @@ - <string>9</string> - </property> - <property name="shortcut"> -- <string notr="true">9</string> -+ <string>9</string> - </property> - </widget> - </item> -@@ -680,7 +680,7 @@ - <string>4</string> - </property> - <property name="shortcut"> -- <string notr="true">4</string> -+ <string>4</string> - </property> - </widget> - </item> -@@ -696,7 +696,7 @@ - <string>5</string> - </property> - <property name="shortcut"> -- <string notr="true">5</string> -+ <string>5</string> - </property> - </widget> - </item> -@@ -712,7 +712,7 @@ - <string>6</string> - </property> - <property name="shortcut"> -- <string notr="true">6</string> -+ <string>6</string> - </property> - </widget> - </item> -@@ -728,7 +728,7 @@ - <string>1</string> - </property> - <property name="shortcut"> -- <string notr="true">1</string> -+ <string>1</string> - </property> - </widget> - </item> -@@ -744,7 +744,7 @@ - <string>2</string> - </property> - <property name="shortcut"> -- <string notr="true">2</string> -+ <string>2</string> - </property> - </widget> - </item> -@@ -760,7 +760,7 @@ - <string>3</string> - </property> - <property name="shortcut"> -- <string notr="true">3</string> -+ <string>3</string> - </property> - </widget> - </item> -@@ -786,7 +786,7 @@ - <string>0</string> - </property> - <property name="shortcut"> -- <string notr="true">0</string> -+ <string>0</string> - </property> - </widget> - </item> - diff --git a/libre/kdeutils-libre/kdeutils.install b/libre/kdeutils-libre/kdeutils.install deleted file mode 100644 index e70c054ec..000000000 --- a/libre/kdeutils-libre/kdeutils.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/kdeutils-libre/rePKGBUILD b/libre/kdeutils-libre/rePKGBUILD deleted file mode 100644 index 9dad18cf0..000000000 --- a/libre/kdeutils-libre/rePKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar> -source PKGBUILD -#CARCH=x86_64 -unset build package md5sums source -pkgname=("kdeutils-ark-libre") -_repo=extra # Put the repo here -_mirror=ftp://mirrors.kernel.org/archlinux # Put mirror here -source=(PKGBUILD - "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT" - # files for pkg modifications below this line - ) -options=(!strip) - -build() { - cd "${srcdir}/" - rm -vf .{INSTALL,PKGINFO} || true - # put actions for package modifications below this line - -} - -package_kdeutils-ark-libre() { - pkgdesc='Archiving Tool' - depends=('kdebase-runtime' 'kdebase-lib' 'libarchive') - optdepends=('p7zip' 'zip' 'unzip' 'ununrar') - provides=("kdeutils-ark=$pkgver") - replaces=('kdeutils-ark') - conflicts=('kdeutils-ark') - url="http://kde.org/applications/utilities/ark/" - find ${srcdir} -maxdepth 1 -type l -delete - cp -a ${srcdir}/* ${pkgdir} -} - - -# vim:set ts=2 sw=2 et: diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index bc6b67c12..0effda0b4 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -61,7 +61,7 @@ build() { if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile msg2 "Adding loongson-community patches" - patch -Np1 -i ${srcdir}/${_basekernel}.*-*-loongson-community.patch + patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch patch -Np0 -i "${srcdir}/lxo-config.patch" # ensure N32, add localversion and remove uevent helper as per diff --git a/libre/texlive-bin-libre/archlinux-build.patch b/libre/texlive-bin-libre/archlinux-build.patch deleted file mode 100644 index accb97a7a..000000000 --- a/libre/texlive-bin-libre/archlinux-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ur source.old/texk/am/script_links.am source/texk/am/script_links.am ---- source.old/texk/am/script_links.am 2011-05-02 13:54:33.000000000 +0200 -+++ source/texk/am/script_links.am 2011-06-05 11:22:53.118216353 +0200 -@@ -51,8 +51,8 @@ - # We support both multiplatform and non-multiplatform builds. - install-links: - case "$(bindir)" in \ -- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \ -- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \ -+ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) TYPE=$(TYPE) EXT=$(EXT) make-links;; \ -+ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) TYPE=$(TYPE) EXT=$(EXT) make-links;; \ - *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \ - exit 1;; \ - esac -diff -ur source.old/texk/tetex/Makefile.am source/texk/tetex/Makefile.am ---- source.old/texk/tetex/Makefile.am 2011-05-31 11:47:04.000000000 +0200 -+++ source/texk/tetex/Makefile.am 2011-06-05 10:28:40.287025375 +0200 -@@ -35,7 +35,7 @@ - - include $(srcdir)/../am/script_links.am - --texmfdir = ${prefix}/$(scriptsdir) -+texmfdir = $(datadir)/$(scriptsdir) - dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) - - if !WIN32 -diff -ur source.old/texk/texlive/linked_scripts/Makefile.am source/texk/texlive/linked_scripts/Makefile.am ---- source.old/texk/texlive/linked_scripts/Makefile.am 2011-05-31 11:47:04.000000000 +0200 -+++ source/texk/texlive/linked_scripts/Makefile.am 2011-06-05 09:41:50.997250443 +0200 -@@ -165,8 +165,8 @@ - done - else !WIN32 - case "$(bindir)" in \ -- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \ -- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \ -+ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) install-links;; \ -+ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=$(datadir) install-links;; \ - *) echo "strange directory '$(bindir)' for linked scripts" >&2; \ - exit 1;; \ - esac |