Updated sysutils/libirman to 0.4.1c

Move abandonware to code.google, and merge pkgsrc patches
Add PKG_DESTDIR_SUPPORT

8 files changed, 10 insertions, 117 deletions

diff --git a/sysutils/libirman/Makefile b/sysutils/libirman/Makefile
index a66a7a605a2..d0d302455cd 100644
--- a/sysutils/libirman/Makefile
+++ b/sysutils/libirman/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2008/09/21 19:41:42 abs Exp $
+# $NetBSD: Makefile,v 1.15 2009/02/13 22:18:01 abs Exp $
 #
 
-DISTNAME=	libirman-0.4.1b
-PKGNAME=	${DISTNAME:S/b$/.2/}
-PKGREVISION=	7
+DISTNAME=	libirman-0.4.1c
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.evation.com/libirman/
+MASTER_SITES=	http://libirman.googlecode.com/files/
+EXTRACT_SUFX=	.tbz
 
 MAINTAINER=	abs@NetBSD.org
-HOMEPAGE=	http://www.evation.com/libirman/libirman.html
+HOMEPAGE=	http://code.google.com/p/libirman/
 COMMENT=	Programming library for Irman - infrared control
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
@@ -19,6 +18,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 EGDIR=		${PREFIX}/share/examples
 CONF_FILES=	${EGDIR}/irman.conf ${PKG_SYSCONFDIR}/irman.conf
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	share/doc share/examples
 
 post-build:
@@ -32,11 +32,4 @@ post-build:
 			${WRKSRC}/irman.conf > ${WRKSRC}/irman.conf.patched
 	    ${MV} ${WRKSRC}/irman.conf.patched ${WRKSRC}/irman.conf
 
-post-install:
-	    ${INSTALL_PROGRAM} ${WRKSRC}/test_func ${PREFIX}/bin/irman_func
-	    ${INSTALL_PROGRAM} ${WRKSRC}/test_io ${PREFIX}/bin/irman_io
-	    ${INSTALL_PROGRAM} ${WRKSRC}/test_name ${PREFIX}/bin/irman_name
-	    ${INSTALL_DATA} ${WRKSRC}/libirman.README \
-					${PREFIX}/share/doc/libirman.README
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/libirman/distinfo b/sysutils/libirman/distinfo
index e077785038e..8abba47197f 100644
--- a/sysutils/libirman/distinfo
+++ b/sysutils/libirman/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.8 2008/09/21 19:41:43 abs Exp $
+$NetBSD: distinfo,v 1.9 2009/02/13 22:18:01 abs Exp $
 
-SHA1 (libirman-0.4.1b.tar.gz) = 739e7cbb4c7e0af59fd244e3d2ed73b97905849a
-RMD160 (libirman-0.4.1b.tar.gz) = 2121e085006079c02c3c84a9b66434c9ed882ec5
-Size (libirman-0.4.1b.tar.gz) = 52874 bytes
-SHA1 (patch-aa) = 54c4e71c03954aaf87c3c0b9b55c4b099d6b9af1
-SHA1 (patch-ab) = b16e235fbfe581ee1a2d4406be8911faa2d047fc
-SHA1 (patch-ac) = 94bf4bbbadc36ff47ded256c37eb86b36a2ad1d9
-SHA1 (patch-ad) = 4a4cef60aa053a2781bc48d9c268cc10ae9654cf
-SHA1 (patch-ae) = a5ec71dd27d0d9033ab6464a28146c7fe6ca8d0e
-SHA1 (patch-af) = 9e2da7f5fa175a69b0ddf2c681d574cd656bc662
+SHA1 (libirman-0.4.1c.tbz) = be8e734842d33da4f7d6949212479f693c925a12
+RMD160 (libirman-0.4.1c.tbz) = 4ffeb2fd219df81051a8192ade02a7e39a3e0202
+Size (libirman-0.4.1c.tbz) = 48911 bytes
diff --git a/sysutils/libirman/patches/patch-aa b/sysutils/libirman/patches/patch-aa
deleted file mode 100644
index 89af59c99ca..00000000000
--- a/sysutils/libirman/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2008/09/21 19:41:43 abs Exp $
-
---- Makefile.in.orig	1999-02-18 11:14:57.000000000 +0000
-+++ Makefile.in
-@@ -27,6 +27,7 @@ exec_prefix = @exec_prefix@
- bindir = @bindir@
- sbindir = @sbindir@
- libdir = @libdir@
-+datadir = @datadir@
- sysconfdir = @sysconfdir@
- 
- PROGS=test_io test_func test_name workmanir lirmand
-@@ -121,11 +122,11 @@ install-dirs:
- 	$(top_srcdir)/mkinstalldirs $(sysconfdir)
- 	$(top_srcdir)/mkinstalldirs `echo $(LIRC_DRIVER_DEVICE) | sed 's|/[^/]*$$||'`
- 
--install: @NORMAL@ install-dirs mkdev
-+install: @NORMAL@ install-dirs
- 	$(INSTALL) -m 755 workmanir $(bindir)/workmanir
- 	$(INSTALL) -m 755 lirmand $(sbindir)/lirmand
- 	$(INSTALL) -m 755 libirman.a $(libdir)/libirman.a
--	$(INSTALL) -m 644 irman.conf $(sysconfdir)/irman.conf
-+	$(INSTALL) -m 644 irman.conf $(datadir)/examples/irman.conf
- 	@echo notice: the test programs are only installed in the current directory \(`pwd`\)
- 
- uninstall: rmdev
diff --git a/sysutils/libirman/patches/patch-ab b/sysutils/libirman/patches/patch-ab
deleted file mode 100644
index 867b99d1851..00000000000
--- a/sysutils/libirman/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/06/26 22:51:48 abs Exp $
-
---- ircmd.c.orig	Wed Jun 26 21:55:30 2002
-+++ ircmd.c
-@@ -140,10 +140,10 @@
-       strcpy(rcname, home);
-       rcname[hl] = '/';
-       strcpy(rcname + hl+1, IR_USER_IRMANRC);
--      rcname[hl+rl+2] = '\0';
-     
-       rc = fopen(rcname, "r");
-       if (!rc) {			/* system, eg /etc/irmanrc.conf */
-+        freefile = 0;
-         rcname = IR_SYSTEM_IRMANRC;
-         rc = fopen(rcname, "r");
-       }
diff --git a/sysutils/libirman/patches/patch-ac b/sysutils/libirman/patches/patch-ac
deleted file mode 100644
index 07bebdd1db8..00000000000
--- a/sysutils/libirman/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/06/26 21:03:01 abs Exp $
-
---- test_func.c.orig	Thu Feb 18 11:15:03 1999
-+++ test_func.c
-@@ -17,6 +17,8 @@
-   unsigned char *code;
-   char *text;
- 
-+  setlinebuf(stdout);
-+
-   if (argc < 2) {
-     fprintf(stderr, "usage: test_func device\n");
-     fprintf(stderr, "       where device is the serial port at which the infra red receiver resides\n");
diff --git a/sysutils/libirman/patches/patch-ad b/sysutils/libirman/patches/patch-ad
deleted file mode 100644
index 96b32d48d63..00000000000
--- a/sysutils/libirman/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/06/26 21:03:01 abs Exp $
-
---- test_io.c.orig	Thu Feb 18 11:15:03 1999
-+++ test_io.c
-@@ -17,6 +17,8 @@
-   int datum;
-   int i;
- 
-+  setlinebuf(stdout);
-+
-   if (argc < 2) {
-     fprintf(stderr, "usage: test_io device\n");
-     fprintf(stderr, "       where device is the serial port at which the infra red receiver resides\n");
diff --git a/sysutils/libirman/patches/patch-ae b/sysutils/libirman/patches/patch-ae
deleted file mode 100644
index 4d33524681b..00000000000
--- a/sysutils/libirman/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/06/26 21:03:01 abs Exp $
-
---- test_name.c.orig	Thu Feb 18 11:15:03 1999
-+++ test_name.c
-@@ -18,6 +18,8 @@
-   char *name;
-   char *filename;
- 
-+  setlinebuf(stdout);
-+
-   if (ir_init_commands(NULL, 1) < 0) {
-     fprintf(stderr, "error initialising commands: %s\n", strerror(errno));
-     exit(1);
diff --git a/sysutils/libirman/patches/patch-af b/sysutils/libirman/patches/patch-af
deleted file mode 100644
index de15573b90f..00000000000
--- a/sysutils/libirman/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/08/19 22:52:23 abs Exp $
-
---- chunk.c.orig	1999-02-18 11:14:59.000000000 +0000
-+++ chunk.c
-@@ -122,7 +122,7 @@ void *ch_malloc(size_t numbytes, chunk_t
-   
-   ptr = ch->top;
-   ch->free -= numbytes;
--  (char *)ch->top += numbytes;
-+  ch->top = (char *)ch->top + numbytes;
- 
-   return ptr;
- }