From 7b378b1b5b346bd49a5ab1652214fb34d03de3a9 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 9 Jun 2013 00:51:01 -0700
Subject: Sun Jun  9 00:50:45 PDT 2013

---
 community/aiccu/01-fix-makefile.patch | 39 -----------------------------------
 community/aiccu/PKGBUILD              | 18 +++++++---------
 2 files changed, 8 insertions(+), 49 deletions(-)
 delete mode 100644 community/aiccu/01-fix-makefile.patch

(limited to 'community/aiccu')

diff --git a/community/aiccu/01-fix-makefile.patch b/community/aiccu/01-fix-makefile.patch
deleted file mode 100644
index 211df7a6a..000000000
--- a/community/aiccu/01-fix-makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/Makefile	2007-01-11 01:29:33.000000000 +0100
-+++ b/Makefile	2013-05-12 23:38:17.171000000 +0200
-@@ -17,9 +17,9 @@
- PROJECT_VERSION=$(shell grep "AICCU_VER" common/aiccu.h | head -n 1 | awk '{print $$3}' | tr -d \")
- 
- # Misc bins
--RM=@rm -f
--MAKE:=@${MAKE}
--CP=@echo [Copy]; cp
-+RM=rm -f
-+MAKE:=${MAKE}
-+CP=cp
- RPMBUILD=@echo [RPMBUILD]; rpmbuild
- RPMBUILD_SILENCE=>/dev/null 2>/dev/null
- 
-@@ -78,21 +78,11 @@
- 	@mkdir -p ${DESTDIR}${dirdoc}
- 	@echo "Configuration..."
- 	@mkdir -p ${DESTDIR}${diretc}
--ifeq ($(shell echo "A${RPM_BUILD_ROOT}"),A)
--	$(shell [ -f ${DESTDIR}${diretc}${PROJECT}.conf ] || cp -R doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf)
-+	@cp -R doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf
- 	@echo "Documentation..."
- 	@cp doc/README ${DESTDIR}${dirdoc}
--	@cp doc/LICENSE ${DESTDIR}${dirdoc}
-+	@cp doc/changelog ${DESTDIR}${dirdoc}
- 	@cp doc/HOWTO  ${DESTDIR}${dirdoc}
--	@echo "Installing Debian-style init.d"
--	@mkdir -p ${DESTDIR}${diretc}init.d
--	@cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT}
--else
--	@echo "Installing Redhat-style init.d"
--	@mkdir -p ${DESTDIR}${diretc}init.d
--	@cp doc/${PROJECT}.init.rpm ${DESTDIR}${diretc}init.d/${PROJECT}
--	@cp doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf
--endif
- 	@echo "Installation into ${DESTDIR}/ completed"
- 
- help:
diff --git a/community/aiccu/PKGBUILD b/community/aiccu/PKGBUILD
index 801c28866..989bd574f 100644
--- a/community/aiccu/PKGBUILD
+++ b/community/aiccu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90477 2013-05-12 21:46:51Z seblu $
+# $Id: PKGBUILD 92564 2013-06-08 18:07:25Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=aiccu
 pkgver=20070115
-pkgrel=3
+pkgrel=4
 pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility'
 arch=('i686' 'x86_64')
 url='http://www.sixxs.net/tools/aiccu/'
@@ -12,7 +12,6 @@ depends=('gnutls' 'iproute2')
 backup=('etc/aiccu.conf')
 source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz"
         'aiccu.service'
-        '01-fix-makefile.patch'
         '02-allow-tunnels.patch'
         '03-no-quiet-gcc.patch'
         '04-skip-strip.patch'
@@ -20,7 +19,6 @@ source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.
         '06-setup-script.patch')
 md5sums=('c9bcc83644ed788e22a7c3f3d4021350'
          '891b0fa527c1b847ce803dac047cf80d'
-         '7c7c563ecc6d3fa64a7766de28ba1927'
          'b9b2c0e7186f3f96366caaa39252dccc'
          'b38db1d95760cd9687330b7db5f4ea1d'
          '6dfa2df27bb4859c7511bfea91337925'
@@ -41,14 +39,14 @@ build() {
 }
 
 package() {
+  install -Dm644 aiccu.service "$pkgdir/usr/lib/systemd/system/aiccu.service"
   cd $pkgname
-  make DESTDIR="$pkgdir" dirsbin="/usr/bin/" install
-  # license
+  install -Dm755 unix-console/aiccu "$pkgdir/usr/bin/aiccu"
+  install -Dm640 doc/aiccu.conf "$pkgdir/etc/aiccu.conf"
+  install -Dm644 doc/aiccu.1 "$pkgdir/usr/share/man/man1/aiccu.1"
   install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  # man
-  install -Dm644 doc/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1"
-  # systemd
-  install -Dm644 "$srcdir/aiccu.service" "$pkgdir/usr/lib/systemd/system/aiccu.service"
+  install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+  install -m644 doc/{README,HOWTO,changelog} "$pkgdir/usr/share/doc/$pkgname"
 }
 
 # vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-54-g00ecf