diff options
| author | agc <agc@pkgsrc.org> | 2010-07-04 07:06:23 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2010-07-04 07:06:23 +0000 |
| commit | c1785f908b64dc90b72c58306ff1e35f3bf44169 (patch) | |
| tree | 388af7db675f4eefbd61575c786172c35b8ef703 /archivers | |
| parent | d9dae677017c4ed34ca890920c4670d1688aa3ba (diff) | |
| download | pkgsrc-c1785f908b64dc90b72c58306ff1e35f3bf44169.tar.gz | |
Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching
error, and to sync with reality.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/gcpio/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile index e138f6640a0..574bf92046a 100644 --- a/archivers/gcpio/Makefile +++ b/archivers/gcpio/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.38 2010/03/23 22:42:17 tez Exp $ +# $NetBSD: Makefile,v 1.38.4.1 2010/07/04 07:06:23 agc Exp $ # DISTNAME= cpio-2.6 PKGNAME= g${DISTNAME} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_GNU:=cpio/} @@ -27,8 +27,6 @@ CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes .include "../../mk/bsd.prefs.mk" -LIBS.NetBSD+= -lgnumalloc - .if defined(GNU_PROGRAM_PREFIX) && ${GNU_PROGRAM_PREFIX} == "" # pax installs a "cpio" also CONFLICTS+= pax-[0-9]* |