diff options
author | salo <salo@pkgsrc.org> | 2003-05-22 16:16:03 +0000 |
---|---|---|
committer | salo <salo@pkgsrc.org> | 2003-05-22 16:16:03 +0000 |
commit | 414cf8210d2019d379149e36ab68f46490d411f5 (patch) | |
tree | 7dcfe573fcf26a521213093eb0af67500b110aeb /sysutils | |
parent | 24a781cea1ffe70c3bac2327340ce34ad9830d4c (diff) | |
download | pkgsrc-414cf8210d2019d379149e36ab68f46490d411f5.tar.gz |
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 | ||||
-rw-r--r-- | sysutils/mtools/PLIST | 8 | ||||
-rw-r--r-- | sysutils/mtools/distinfo | 7 | ||||
-rw-r--r-- | sysutils/mtools/patches/patch-aa | 16 | ||||
-rw-r--r-- | sysutils/mtools/patches/patch-ab | 35 | ||||
-rw-r--r-- | sysutils/mtools/patches/patch-ad | 13 |
6 files changed, 76 insertions, 39 deletions
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile index 61eb69a6b35..5649718d001 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.27 2003/05/22 16:16:03 salo 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" diff --git a/sysutils/mtools/PLIST b/sysutils/mtools/PLIST index 9cf16658443..e8bb6a8b07f 100644 --- a/sysutils/mtools/PLIST +++ b/sysutils/mtools/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:41 seb Exp $ -bin/floppyd -bin/floppyd_installtest +@comment $NetBSD: PLIST,v 1.3 2003/05/22 16:16:03 salo Exp $ +${NOFLOPPYD}bin/floppyd +${NOFLOPPYD}bin/floppyd_installtest bin/lz bin/mattrib bin/mbadblocks @@ -35,7 +35,7 @@ bin/uz @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mtools.info info/mtools.info @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mtools.info -man/man1/floppyd.1 +${NOFLOPPYD}man/man1/floppyd.1 man/man1/mattrib.1 man/man1/mbadblocks.1 man/man1/mcat.1 diff --git a/sysutils/mtools/distinfo b/sysutils/mtools/distinfo index 2357a7cf8d7..2917493a2af 100644 --- a/sysutils/mtools/distinfo +++ b/sysutils/mtools/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:29:06 agc Exp $ +$NetBSD: distinfo,v 1.3 2003/05/22 16:16:04 salo Exp $ SHA1 (mtools-3.9.7.tar.gz) = b54f8a7041854edb5c17b116b3d77e4d088aedfb Size (mtools-3.9.7.tar.gz) = 282769 bytes -SHA1 (patch-aa) = f8e023ba9a6e31f26815b93b73c4e9315b6bbc0e -SHA1 (patch-ab) = 3cbc521521f4584ef3aeda8ae5bd913b393cb710 +SHA1 (patch-aa) = 9effa09b809b1dc0dce231ea261785d52b51bf0d +SHA1 (patch-ab) = 7549dceacff03ad9116bb45fd30e60088cf8fa93 SHA1 (patch-ac) = 3b807b102f832095cb0e7734393655f99a205897 +SHA1 (patch-ad) = 4165cf8850f4e2d8e5d610133f2d776b7f2ccb90 SHA1 (patch-af) = 0e2e1037be4da5f7c876cb5c9f54950e4726f6d0 diff --git a/sysutils/mtools/patches/patch-aa b/sysutils/mtools/patches/patch-aa index 116270857fe..31da38ba690 100644 --- a/sysutils/mtools/patches/patch-aa +++ b/sysutils/mtools/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2001/02/28 10:26:02 wiz Exp $ ---- Makefile.in.orig Sun May 14 21:14:59 2000 -+++ Makefile.in Wed Feb 14 13:47:02 2001 +$NetBSD: patch-aa,v 1.6 2003/05/22 16:16:04 salo Exp $ + +--- Makefile.in.orig 2000-05-14 20:14:59.000000000 +0200 ++++ Makefile.in 2003-05-22 18:00:53.000000000 +0200 @@ -49,6 +49,7 @@ INSTALL = @INSTALL@ @@ -9,6 +10,15 @@ $NetBSD: patch-aa,v 1.5 2001/02/28 10:26:02 wiz Exp $ INSTALL_DATA = @INSTALL_DATA@ INSTALL_INFO = @INSTALL_INFO@ +@@ -56,7 +57,7 @@ + .SUFFIXES: .o .c + .SUFFIXES: .o .c + +-MAN1 = floppyd.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 \ ++MAN1 = @MANFLOPPYD@ mattrib.1 mbadblocks.1 mcat.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 \ + mdu.1 mformat.1 mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \ + mrd.1 mread.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1 + MAN1EXT = 1 @@ -256,7 +257,7 @@ install-scripts: $(bindir)/mtools @$(top_srcdir)/mkinstalldirs $(bindir) diff --git a/sysutils/mtools/patches/patch-ab b/sysutils/mtools/patches/patch-ab index aaaf5a2ced0..865b31fc88e 100644 --- a/sysutils/mtools/patches/patch-ab +++ b/sysutils/mtools/patches/patch-ab @@ -1,6 +1,7 @@ -$NetBSD: patch-ab,v 1.4 2001/02/28 10:26:02 wiz Exp $ ---- configure.orig Sun May 28 13:22:06 2000 -+++ configure Wed Feb 14 13:47:25 2001 +$NetBSD: patch-ab,v 1.5 2003/05/22 16:16:04 salo Exp $ + +--- configure.orig 2000-05-28 12:22:06.000000000 +0200 ++++ configure 2003-05-22 17:57:40.000000000 +0200 @@ -2626,7 +2626,7 @@ fi @@ -15,7 +16,7 @@ $NetBSD: patch-ab,v 1.4 2001/02/28 10:26:02 wiz Exp $ # It would also be nice to do this for all -L options, not just this one. if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" -+ X_LIBS="$X_LIBS -Wl,-R$x_libraries -L$x_libraries" ++ X_LIBS="$X_LIBS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . case "`(uname -sr) 2>/dev/null`" in @@ -24,7 +25,31 @@ $NetBSD: patch-ab,v 1.4 2001/02/28 10:26:02 wiz Exp $ # Check for libraries that X11R6 Xt/Xaw programs need. ac_save_LDFLAGS="$LDFLAGS" - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" -+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,-R$x_libraries -L$x_libraries" ++ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries" # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to # check for ICE first), but we must link in the order -lSM -lICE or # we get undefined symbols. So assume we have SM if we have ICE. +@@ -3644,6 +3644,7 @@ + fi + FLOPPYD="floppyd floppyd_installtest" + BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest" ++ MANFLOPPYD="floppyd.1" + cat >> confdefs.h <<\EOF + #define USE_FLOPPYD 1 + EOF +@@ -3651,6 +3652,7 @@ + else + FLOPPYD= + BINFLOPPYD= ++ MANFLOPPYD= + fi + + +@@ -3823,6 +3825,7 @@ + s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g + s%@FLOPPYD@%$FLOPPYD%g + s%@BINFLOPPYD@%$BINFLOPPYD%g ++s%@MANFLOPPYD@%$MANFLOPPYD%g + s%@extraincludedir@%$extraincludedir%g + s%@extralibdir@%$extralibdir%g + s%@MACHDEPLIBS@%$MACHDEPLIBS%g diff --git a/sysutils/mtools/patches/patch-ad b/sysutils/mtools/patches/patch-ad new file mode 100644 index 00000000000..bd205d67b07 --- /dev/null +++ b/sysutils/mtools/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.3 2003/05/22 16:16:04 salo Exp $ + +--- devices.c.orig 2000-05-28 12:20:54.000000000 +0200 ++++ devices.c 2003-05-22 17:35:16.000000000 +0200 +@@ -798,7 +798,7 @@ + #endif /* __FreeBSD__ */ + + /*** /jes -- for ALR 486 DX4/100 ***/ +-#if defined(OS_netbsd) ++#if defined(OS_netbsd) || defined(OS_netbsdelf) + #define predefined_devices + struct device devices[] = { + {"/dev/rfd0a", 'A', FHD312}, |