diff options
| author | grant <grant> | 2003-06-19 01:10:19 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-06-19 01:10:19 +0000 |
| commit | 1d2e3e3c5e83fbd5227dbcd7c2ec3e6f82429dc1 (patch) | |
| tree | 822b58e5a9edefb95bb755724c61ef8f070a1e60 /sysutils | |
| parent | d10780be362196ea8dee333dd6dda5b7a8a495d1 (diff) | |
| download | pkgsrc-1d2e3e3c5e83fbd5227dbcd7c2ec3e6f82429dc1.tar.gz | |
Pull up revision 1.27 (requested by salo in ticket #1294):
PKGREVISION++
- fix device handling on NetBSD ELF (from Pavel Arnost via PR
pkg/21530)
- fix floppyd handling in better and simpler way
- don't hardcode -R, use RPATH_FLAG instead
- remove unused cruft, style nits
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/mtools/Makefile | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile index 61eb69a6b35..44b0703836e 100644 --- a/sysutils/mtools/Makefile +++ b/sysutils/mtools/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2002/02/18 15:14:41 seb Exp $ +# $NetBSD: Makefile,v 1.26.6.1 2003/06/19 01:10:19 grant Exp $ # DISTNAME= mtools-3.9.7 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.tux.org/pub/tux/knaff/mtools/ @@ -12,34 +12,22 @@ COMMENT= FAT (MS-DOS, Atari) disk access tools NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64 # LP64 problem -GNU_CONFIGURE= yes -USE_GMAKE= yes +GNU_CONFIGURE= YES +USE_GMAKE= YES INFO_FILES= mtools.info + TEXINFO_OVERRIDE= YES .include "../../mk/bsd.prefs.mk" -.ifdef MTOOLS_ENABLE_FLOPPYD -USE_X11= yes -CPPFLAGS+= -I${X11BASE}/include -CONFIGURE_ARGS+= --enable-floppyd -.endif - -PLIST_SRC= ${WRKDIR}/PLIST - -pre-patch: - @${LN} -s . ${WRKSRC}/mtools - -post-patch: - @${RM} ${WRKSRC}/mtools - -post-install: -.ifdef MTOOLS_ENABLE_FLOPPYD - ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} +.if defined(MTOOLS_ENABLE_FLOPPYD) && !empty(MTOOLS_ENABLE_FLOPPYD:M[Yy][Ee][Ss]) +USE_X11= YES +CPPFLAGS= -I${X11BASE}/include +CONFIGURE_ARGS= --enable-floppyd +PLIST_SUBST= NOFLOPPYD= .else - ${RM} -f ${PREFIX}/man/man1/floppyd.1 - ${RM} -f ${PREFIX}/bin/floppyd ${PREFIX}/bin/floppyd_installtest - ${GREP} -v /floppyd ${PKGDIR}/PLIST >${PLIST_SRC} +CONFIGURE_ARGS= --disable-floppyd +PLIST_SUBST= NOFLOPPYD="@comment " .endif .include "../../mk/texinfo.mk" |