diff options
| author | rillig <rillig@pkgsrc.org> | 2006-05-21 11:17:28 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-05-21 11:17:28 +0000 |
| commit | 4d5e08012800018a5ab879558ef1d2c147e880ce (patch) | |
| tree | 8902cc988b64c32ba784b77302986660357bd537 /misc/dpkg | |
| parent | 0dc829fa71287dbb49b5c04959283b3fd20aafcc (diff) | |
| download | pkgsrc-4d5e08012800018a5ab879558ef1d2c147e880ce.tar.gz | |
Fixed pkglint warnings. Fixed the build (caused by GNU Make). Bumped
PKGREVISION.
Diffstat (limited to 'misc/dpkg')
| -rw-r--r-- | misc/dpkg/Makefile | 11 | ||||
| -rw-r--r-- | misc/dpkg/distinfo | 3 | ||||
| -rw-r--r-- | misc/dpkg/patches/patch-ae | 21 |
3 files changed, 28 insertions, 7 deletions
diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile index 9b4df6c7c4f..6256b5a9b88 100644 --- a/misc/dpkg/Makefile +++ b/misc/dpkg/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2006/05/18 20:29:59 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2006/05/21 11:17:28 rillig Exp $ # DISTNAME= ${PKGNAME_NOREV:S,-,_,} PKGNAME= dpkg-1.10.24 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/} @@ -11,16 +11,15 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://packages.debian.org/stable/base/dpkg.html COMMENT= Package maintenance system for Debian -BROKEN_IN= pkgsrc-2006Q1 - WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes +USE_LANGUAGES= c c++ USE_TOOLS+= gmake msgfmt perl -USE_NCURSES= # tigetstr() +USE_NCURSES= yes # needs tigetstr() -REPLACE_PERL= ${WRKSRC}/scripts/*.pl +REPLACE_PERL= scripts/*.pl split/*.pl ADMIN_DIR= ${PREFIX}/var/db diff --git a/misc/dpkg/distinfo b/misc/dpkg/distinfo index e66dd30cf3f..98403189cdd 100644 --- a/misc/dpkg/distinfo +++ b/misc/dpkg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 11:02:51 agc Exp $ +$NetBSD: distinfo,v 1.3 2006/05/21 11:17:28 rillig Exp $ SHA1 (dpkg_1.10.24.tar.gz) = bba3fa47662b776fae15dd2d9e667c6b08c2bea8 RMD160 (dpkg_1.10.24.tar.gz) = 8c315d4a8eb6cc5e142daf0293e0f7b3ddd2af01 @@ -7,3 +7,4 @@ SHA1 (patch-aa) = 62740602375270c50fd518bddfe9a713d85a148f SHA1 (patch-ab) = 545ade40a5b62161b31478eff12573c8418d06e4 SHA1 (patch-ac) = 130359aeeafc5c8bc10f38eac7335c2781f3c503 SHA1 (patch-ad) = 95c64b2d0c6872b75151f2e8ca4c3d0a3206b6a0 +SHA1 (patch-ae) = 0df7982b097b3476542df3e812ab22c33a4a5d28 diff --git a/misc/dpkg/patches/patch-ae b/misc/dpkg/patches/patch-ae new file mode 100644 index 00000000000..71f47814c13 --- /dev/null +++ b/misc/dpkg/patches/patch-ae @@ -0,0 +1,21 @@ +$NetBSD: patch-ae,v 1.1 2006/05/21 11:17:28 rillig Exp $ + +GNU Make does not strip the line-continuation backslashes before +executing the shell. This confuses Perl. + +In addition, it is bad style to pipe directly into the target file in +Make, since in a second run Make will assume the target file has been +updated properly. + +--- main/Makefile.in.orig 2004-10-27 11:06:43.000000000 +0200 ++++ main/Makefile.in 2006-05-21 13:06:28.000000000 +0200 +@@ -72,6 +72,6 @@ enquiry.o: archtable.h + + archtable.h: $(top_srcdir)/archtable + expand $< | \ +- perl -ne 'print " { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" \ +- if m/^(?!\s*#)\s*(\S+)(\s+)(\S+)(\s+)(\S+)\s*$$/' \ +- >$@ ++ perl -ne 'print " { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" if m/^(?!\s*#)\s*(\S+)(\s+)(\S+)(\s+)(\S+)\s*$$/' \ ++ >$@.tmp ++ mv $@.tmp $@ |