diff options
-rw-r--r-- | sysutils/ups-nut-cgi/Makefile | 19 | ||||
-rw-r--r-- | sysutils/ups-nut-cgi/distinfo | 4 | ||||
-rw-r--r-- | sysutils/ups-nut-cgi/patches/patch-ab | 8 |
3 files changed, 18 insertions, 13 deletions
diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile index cf9c5db2fff..873926a32f9 100644 --- a/sysutils/ups-nut-cgi/Makefile +++ b/sysutils/ups-nut-cgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/11/18 00:57:50 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2001/11/21 15:53:08 jlam Exp $ DISTNAME= nut-0.45.2 PKGNAME= ups-nut-cgi-0.45.2 @@ -9,21 +9,26 @@ MAINTAINER= lukem@netbsd.org HOMEPAGE= http://www.exploits.org/nut/ COMMENT= Network UPS Tools CGI scripts -DEPENDS+= gd-[0-9]*:../../graphics/gd -DEPENDS+= ups-nut-0*:../ups-nut BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf +DEPENDS+= ups-nut-0.*:../sysutils/ups-nut ALL_TARGET= cgi INSTALL_TARGET= install-cgi +NUT_CONFDIR= ${CONFDIR}/nut +NUT_STATEDIR= /var/db/nut +NUT_CGIDIR= ${PREFIX}/share/nut/cgi + +USE_BUILDLINK_ONLY= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${LOCALBASE}/etc/nut \ - --with-statepath=/var/db/nut \ - --with-cgipath=${LOCALBASE}/share/nut/cgi \ +CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ + --with-statepath=${NUT_STATEDIR} \ + --with-cgipath=${NUT_CGIDIR} \ --with-graphics=${LOCALBASE} pre-configure: cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf --force -.include "../../mk/bsd.prefs.mk" +.include "../../graphics/gd/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo index ce062f02980..068ed10b22c 100644 --- a/sysutils/ups-nut-cgi/distinfo +++ b/sysutils/ups-nut-cgi/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2001/11/19 03:47:42 lukem Exp $ +$NetBSD: distinfo,v 1.6 2001/11/21 15:53:08 jlam Exp $ SHA1 (nut-0.45.2.tar.gz) = 9c225205127eee1e9bb55d9a28ff1290b47f75aa Size (nut-0.45.2.tar.gz) = 330851 bytes SHA1 (patch-aa) = f99436a2e83654e5a078b6ea899cc33ef8a48fa9 -SHA1 (patch-ab) = 47be57592a77ded239f20d8a2bd686c34dabfe6f +SHA1 (patch-ab) = dfc1663368b670b84b1545c388bcd5f8703c08e3 SHA1 (patch-ac) = ded33bbc4c78b2b7c53230c0d4ab3c663104582f SHA1 (patch-ad) = f9f7fdc08c49aa1c1aa667ac6b7597679c9fea4e SHA1 (patch-ae) = 39ea3f3a4234790837ccf6e5799c39b6ba390975 diff --git a/sysutils/ups-nut-cgi/patches/patch-ab b/sysutils/ups-nut-cgi/patches/patch-ab index 2d19f8020eb..04856e2c203 100644 --- a/sysutils/ups-nut-cgi/patches/patch-ab +++ b/sysutils/ups-nut-cgi/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2001/09/28 04:42:49 lukem Exp $ +$NetBSD: patch-ab,v 1.3 2001/11/21 15:53:08 jlam Exp $ ---- clients/Makefile.in.orig Wed Jul 4 14:31:29 2001 -+++ clients/Makefile.in Fri Sep 28 11:14:57 2001 +--- clients/Makefile.in.orig Wed Jul 4 00:31:29 2001 ++++ clients/Makefile.in @@ -59,7 +59,7 @@ $(CC) $(CFLAGS) -o upsstats.cgi upsstats.c upsfetch.o cgilib.o $(LIBOBJ) upsimage.cgi: upsimage.c upsfetch.o cgilib.o $(LIBDEP) - $(CC) $(CFLAGS) -o upsimage.cgi upsimage.c upsfetch.o cgilib.o @GFXLIBS@ -lm $(LIBOBJ) -+ $(CC) $(CFLAGS) @GRAPHICS_INCLUDES@ -o upsimage.cgi upsimage.c upsfetch.o cgilib.o @GRAPHICS_LIBS@ -lm $(LIBOBJ) ++ $(CC) $(CFLAGS) @GRAPHICS_INCLUDES@ -o upsimage.cgi upsimage.c upsfetch.o cgilib.o @LDFLAGS@ @GRAPHICS_LIBS@ -lm $(LIBOBJ) clean: rm -f *~ *.o $(PROGS) $(SPROGS) $(CGIPROGS) |