summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/asapm/Makefile7
-rw-r--r--sysutils/asapm/distinfo4
-rw-r--r--sysutils/asapm/patches/patch-aa23
3 files changed, 22 insertions, 12 deletions
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 3c02f00cdcd..d2e61af0b1b 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2007/11/12 00:09:15 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2011/03/02 13:15:23 obache Exp $
#
DISTNAME= asapm-2.11
@@ -10,6 +10,9 @@ MASTER_SITES= http://www.tigr.net/afterstep/download/asapm/ \
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.tigr.net/afterstep/view.php?applet=asapm/data
COMMENT= Laptop battery status display for X11
+LICENSE= gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT= user-destdir
.if !exists(/usr/include/machine/apmvar.h)
PKG_FAIL_REASON+= "APM needs /usr/include/machine/apmvar.h to build."
@@ -21,5 +24,7 @@ CONFIGURE_ARGS+= --with-xpm
CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include
CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib
+INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
+
.include "../../x11/libXpm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/asapm/distinfo b/sysutils/asapm/distinfo
index bb6516f95b8..6f009ca7639 100644
--- a/sysutils/asapm/distinfo
+++ b/sysutils/asapm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 13:40:50 agc Exp $
+$NetBSD: distinfo,v 1.11 2011/03/02 13:15:23 obache Exp $
SHA1 (asapm-2.11.tar.gz) = cd89c5557d76dbb19ee565435b533ab48f05f102
RMD160 (asapm-2.11.tar.gz) = 14d33828a475f61d4499be2e5008842f4950dfa6
Size (asapm-2.11.tar.gz) = 58729 bytes
-SHA1 (patch-aa) = 570d2240f6afbf78d3cd72e1c1b963beb7ae074d
+SHA1 (patch-aa) = f25a3bb15cd37ecd4771dfcf20c04abb552ebac2
SHA1 (patch-ab) = 8796f1f6220ecdbd23d360bb18f721e1ef83febf
SHA1 (patch-ac) = edfe7deae628b9e2aa57b67666f4e7dea13c19bf
SHA1 (patch-ad) = 4b6bf84a4cf1881ef0c4e97fbe64201e3437aba1
diff --git a/sysutils/asapm/patches/patch-aa b/sysutils/asapm/patches/patch-aa
index 50d932dbe17..06f7d6abbb8 100644
--- a/sysutils/asapm/patches/patch-aa
+++ b/sysutils/asapm/patches/patch-aa
@@ -1,22 +1,27 @@
-$NetBSD: patch-aa,v 1.3 2000/01/16 18:37:05 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2011/03/02 13:15:23 obache Exp $
---- autoconf/Makefile.common.in.orig Tue Mar 9 05:35:24 1999
-+++ autoconf/Makefile.common.in Sun Jan 16 13:23:25 2000
-@@ -13,11 +13,11 @@
- $(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)
+--- autoconf/Makefile.common.in.orig 1999-03-09 10:35:24.000000000 +0000
++++ autoconf/Makefile.common.in
+@@ -10,14 +10,14 @@ install: install.bin install.man
+
+ install.bin: $(PROG)
+ $(STRIP) $(PROG)
+- $(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)
++ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(AFTER_BIN_DIR)
install.man:
- $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1x
-+ $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1
++ $(INSTALL_DATA) $(PROG).man $(DESTDIR)$(AFTER_MAN_DIR)/$(PROG).1
uninstall:
- $(RMF) $(AFTER_BIN_DIR)/$(PROG)
+- $(RMF) $(AFTER_BIN_DIR)/$(PROG)
- $(RMF) $(AFTER_MAN_DIR)/$(PROG).1x
-+ $(RMF) $(AFTER_MAN_DIR)/$(PROG).1
++ $(RMF) $(DESTDIR)$(AFTER_BIN_DIR)/$(PROG)
++ $(RMF) $(DESTDIR)$(AFTER_MAN_DIR)/$(PROG).1
clean:
$(RMF) $(PROG) *.o *~ *% *.bak \#* core
-@@ -34,7 +34,7 @@
+@@ -34,7 +34,7 @@ indent:
done
$(PROG): $(OBJS)