diff options
| author | joerg <joerg@pkgsrc.org> | 2012-03-19 12:34:12 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-03-19 12:34:12 +0000 |
| commit | 2b1c8cecc647ec925183e8328f75056033c29d9f (patch) | |
| tree | a3955afe4cc63c2b002bc7b453f7fdc618bce538 /mk/bsd.pkg.use.mk | |
| parent | 91ce155c2c816847ac6ff504520a555611e2224f (diff) | |
| download | pkgsrc-2b1c8cecc647ec925183e8328f75056033c29d9f.tar.gz | |
Drop imake-check logic from X11 components' builtin.mk.
Always use xorg-cf-files and imake from pkgsrc, replacing xpkgwedge.
Always install man pages, not cat pages when using imake.
Unify the various imake PLIST variables in preparation for dropping.
Adjust xbattbar for the new expectations.
Diffstat (limited to 'mk/bsd.pkg.use.mk')
| -rw-r--r-- | mk/bsd.pkg.use.mk | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 9ed82b98d50..ce6b598b47f 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.50 2009/12/20 12:32:55 jmmv Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.51 2012/03/19 12:34:14 joerg Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -102,14 +102,3 @@ BUILD_DEPENDS+= libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../dev CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" .endif - -### USE_XPKGWEDGE - -.if (defined(USE_X11BASE) || \ - defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake) || \ - !empty(USE_TOOLS:Mimake\:*:Nimake\:pkgsrc)) && \ - empty(USE_TOOLS:Mitools) && \ - empty(PKGPATH:Mpkgtools/xpkgwedge) && \ - !empty(USE_XPKGWEDGE:M[yY][eE][sS]) -BUILD_DEPENDS+= xpkgwedge>=${_XPKGWEDGE_REQD:U1.15}:../../pkgtools/xpkgwedge -.endif |