head 1.11; access; symbols pkgsrc-2013Q2:1.11.0.8 pkgsrc-2013Q2-base:1.11 pkgsrc-2012Q4:1.11.0.6 pkgsrc-2012Q4-base:1.11 pkgsrc-2011Q4:1.11.0.4 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q2:1.11.0.2 pkgsrc-2011Q2-base:1.11 pkgsrc-2010Q1:1.10.0.24 pkgsrc-2010Q1-base:1.10 pkgsrc-2009Q4:1.10.0.22 pkgsrc-2009Q4-base:1.10 pkgsrc-2009Q3:1.10.0.20 pkgsrc-2009Q3-base:1.10 pkgsrc-2009Q2:1.10.0.18 pkgsrc-2009Q2-base:1.10 pkgsrc-2009Q1:1.10.0.16 pkgsrc-2009Q1-base:1.10 pkgsrc-2008Q4:1.10.0.14 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.10.0.12 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.10 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.8 pkgsrc-2008Q2-base:1.10 cwrapper:1.10.0.6 pkgsrc-2008Q1:1.10.0.4 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.2 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.9.0.2 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.8.0.18 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.16 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.14 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.12 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.10 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.8 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.6 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.4 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.2 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.7.0.6 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.4 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.2 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.6.0.4 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.2 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1 netbsd-1-3-PATCH003:1.1; locks; strict; comment @# @; 1.11 date 2010.05.03.10.17.05; author is; state dead; branches; next 1.10; 1.10 date 2007.12.09.23.38.31; author wiz; state Exp; branches; next 1.9; 1.9 date 2007.08.17.20.55.34; author joerg; state Exp; branches; next 1.8; 1.8 date 2005.04.04.08.56.18; author adam; state Exp; branches; next 1.7; 1.7 date 2004.08.27.06.29.10; author jlam; state Exp; branches; next 1.6; 1.6 date 2003.12.11.16.05.40; author adam; state Exp; branches; next 1.5; 1.5 date 2003.05.22.16.16.04; author salo; state Exp; branches; next 1.4; 1.4 date 2001.02.28.10.26.02; author wiz; state Exp; branches 1.4.6.1; next 1.3; 1.3 date 2001.02.14.14.28.58; author is; state Exp; branches; next 1.2; 1.2 date 2000.09.26.02.46.38; author hubertf; state Exp; branches; next 1.1; 1.1 date 98.08.17.00.11.34; author kim; state Exp; branches; next ; 1.4.6.1 date 2003.06.19.01.09.33; author grant; state Exp; branches; next ; desc @@ 1.11 log @Forgotten patches. Sorry for the inconvenience caused. @ text @$NetBSD: patch-ab,v 1.10 2007/12/09 23:38:31 wiz Exp $ --- configure.orig 2006-02-27 16:36:50.000000000 +0000 +++ configure @@@@ -5940,7 +5940,7 @@@@ if [ $host_os3 = hpux ] ; then fi -if [ $host_vendor = linux ] ; then +if [ "$host_vendor" = linux ] ; then LDFLAGS="$LDFLAGS -z" fi @@@@ -6223,7 +6223,7 @@@@ else # 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 ${COMPILER_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 @@@@ -7283,7 +7283,7 @@@@ fi # 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 ${COMPILER_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. @@@@ -7740,6 +7740,8 @@@@ if test X$use_floppyd = Xyes; then fi FLOPPYD="floppyd floppyd_installtest" BINFLOPPYD="\$(DESTDIR)\$(bindir)/floppyd \$(DESTDIR)\$(bindir)/floppyd_installtest" + MANFLOPPYD="floppyd.1" + MANFLOPPYD_INSTTEST="floppyd_installtest.1" cat >>confdefs.h <<\_ACEOF #define USE_FLOPPYD 1 @@@@ -7748,6 +7750,8 @@@@ _ACEOF else FLOPPYD= BINFLOPPYD= + MANFLOPPYD= + MANFLOPPYD_INSTTEST= fi @@@@ -8403,6 +8407,8 @@@@ s,@@X_LIBS@@,$X_LIBS,;t t s,@@X_EXTRA_LIBS@@,$X_EXTRA_LIBS,;t t s,@@FLOPPYD@@,$FLOPPYD,;t t s,@@BINFLOPPYD@@,$BINFLOPPYD,;t t +s%@@MANFLOPPYD@@%$MANFLOPPYD%g +s%@@MANFLOPPYD_INSTTEST@@%$MANFLOPPYD_INSTTEST%g s,@@extraincludedir@@,$extraincludedir,;t t s,@@extralibdir@@,$extralibdir,;t t s,@@MACHDEPLIBS@@,$MACHDEPLIBS,;t t @ 1.10 log @Update to 3.9.11, provided by Sergey Svishchev in private mail: 3.9.11 is mostly a maintenance release which fixes a couple of bugs, and addresses warnings raised by gcc4, and merges some platform-specific patches (MingW, NetBSD, Redhat/Fedora, Cygwin, Solaris), and other patches (such as the new amuFormat.sh written in sh). @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Add support for DESTDIR and modular Xorg. XXX This should use the option framework for the floppyd. @ text @d3 1 a3 1 --- configure.orig 2005-02-28 23:10:33.000000000 +0100 d5 1 a5 1 @@@@ -5938,7 +5938,7 @@@@ if [ $host_os3 = hpux ] ; then d14 1 a14 1 @@@@ -6221,7 +6221,7 @@@@ else d23 1 a23 1 @@@@ -7281,7 +7281,7 @@@@ fi d32 1 a32 2 @@@@ -7737,7 +7737,9 @@@@ if test X$use_floppyd = Xyes; then exit 1 d35 1 a35 2 - BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest" + BINFLOPPYD="\${DESTDIR}\$(bindir)/floppyd \${DESTDIR}\$(bindir)/floppyd_installtest" d41 1 a41 1 @@@@ -7746,6 +7748,8 @@@@ _ACEOF d50 1 a50 1 @@@@ -8401,6 +8407,8 @@@@ s,@@X_LIBS@@,$X_LIBS,;t t @ 1.8 log @Changes 3.9.10: * Support for multiple drives in floppyd * Updated .spec file * Fixed some long name directory entry freeing bugs * Fixed duplicate FAT writing error. Fixed segfault on short images. * Mformat creates images of correct size. * CYGWIN compatibility (O_BINARY flag). * Cygwin patch for plain_io.c (no locking) * Fix a couple of memory leaks in config file parsing. Fix llong.h (redefined same symbol twice) * Fix a variable initialization problem in plain_io.c * New mclasserase command to erase memory cards C99 "compatibility" (cf http://www.mtools.linux.lu/download.html) * Fix rootskip and rate of XDF disks * Fix inverted IS_MFORMAT_ONLY conditon in plain_io.c * Moved putc after variable description (anybody knows about a -W flag so that gcc warns about these?) * Fixed mattrib -p (missing slash) * Added -m option to mformat to specify a non-standard mediabyte * Added -d options to mformat to specify number of FAT copies. Can also be set using the MTOOLS_NFATS environmental variable. @ text @d3 1 a3 1 --- configure.orig 2005-02-28 22:10:33.000000000 +0000 d32 2 a33 1 @@@@ -7738,6 +7738,8 @@@@ if test X$use_floppyd = Xyes; then d36 2 a37 1 BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest" d52 1 a52 1 @@@@ -8401,6 +8405,8 @@@@ s,@@X_LIBS@@,$X_LIBS,;t t @ 1.7 log @Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG, which are the full option names used to set rpath directives for the linker and the compiler, respectively. In places were we are invoking the linker, use "${LINKER_RPATH_FLAG} ", where the space is inserted in case the flag is a word, e.g. -rpath. The default values of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the compiler that you use. They may be overridden on a ${OPSYS}-specific basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG, respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2003/12/11 16:05:40 adam Exp $ d3 1 a3 1 --- configure.orig 2003-02-16 11:06:45.000000000 +0000 d5 1 a5 1 @@@@ -5202,7 +5202,7 @@@@ if [ $host_os3 = hpux ] ; then d14 1 a14 1 @@@@ -5471,7 +5471,7 @@@@ else d23 1 a23 1 @@@@ -6337,7 +6337,7 @@@@ fi d32 1 a32 1 @@@@ -6722,6 +6722,8 @@@@ if test X$use_floppyd = Xyes; then d41 1 a41 1 @@@@ -6730,6 +6732,8 @@@@ _ACEOF d50 1 a50 1 @@@@ -7327,6 +7331,8 @@@@ s,@@X_LIBS@@,$X_LIBS,;t t @ 1.6 log @Changes 3.9.9: * Large disk fixes, especially for Solaris * Floppyd robustness * Zip 250 support in mzip * Protect against division by zero when reading BSD disks * Fixed parsing of Unix filenames ending with slash * Fixes for floppyd to work with current protocol version of floppyd * Warn for invalid partition numbers * Support for geometry-less Atari disks * Support for byte-swapping disks * Fixed max numbers of sectors for FAT12 and FAT16 See ChangeLog for details @ text @d1 1 a1 1 $NetBSD$ d19 1 a19 1 + X_LIBS="$X_LIBS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries" d28 1 a28 1 + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries" @ 1.5 log @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 @ text @d3 3 a5 3 --- configure.orig 2000-05-28 12:22:06.000000000 +0200 +++ configure 2003-05-22 17:57:40.000000000 +0200 @@@@ -2626,7 +2626,7 @@@@ d14 1 a14 1 @@@@ -2908,7 +2908,7 @@@@ d22 2 a23 2 case "`(uname -sr) 2>/dev/null`" in @@@@ -3443,7 +3443,7 @@@@ d26 1 a26 1 ac_save_LDFLAGS="$LDFLAGS" d32 1 a32 1 @@@@ -3644,6 +3644,7 @@@@ d37 3 a39 1 cat >> confdefs.h <<\EOF d41 1 a41 2 EOF @@@@ -3651,6 +3652,7 @@@@ d46 1 d50 4 a53 4 @@@@ -3823,6 +3825,7 @@@@ s%@@X_EXTRA_LIBS@@%$X_EXTRA_LIBS%g s%@@FLOPPYD@@%$FLOPPYD%g s%@@BINFLOPPYD@@%$BINFLOPPYD%g d55 4 a58 3 s%@@extraincludedir@@%$extraincludedir%g s%@@extralibdir@@%$extralibdir%g s%@@MACHDEPLIBS@@%$MACHDEPLIBS%g @ 1.4 log @We want RCS Ids in the patches. This is one of the things pkglint checks, so _please_ use it. @ text @d2 3 a4 2 --- configure.orig Sun May 28 13:22:06 2000 +++ configure Wed Feb 14 13:47:25 2001 d19 1 a19 1 + X_LIBS="$X_LIBS -Wl,-R$x_libraries -L$x_libraries" d28 1 a28 1 + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,-R$x_libraries -L$x_libraries" d32 24 @ 1.4.6.1 log @Pull up revision 1.5 (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 @ text @d1 3 a3 4 $NetBSD: patch-ab,v 1.4 2001/02/28 10:26:02 wiz Exp $ --- configure.orig 2000-05-28 12:22:06.000000000 +0200 +++ configure 2003-05-22 17:57:40.000000000 +0200 d18 1 a18 1 + X_LIBS="$X_LIBS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries" d27 1 a27 1 + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries" a30 24 @@@@ -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 @ 1.3 log @Upgrade to version 3.9.7. Mostly from PR 12033 by Martti Kuparinen. @ text @d1 1 @ 1.2 log @ELF lib fix for floppyd, which is only built on systems that actually have X installed, so a USE_X11=yes would be overkill, as it prevents using mtools on systems that don't have X installed. @ text @d1 3 a3 5 $NetBSD$ --- configure.orig Tue Sep 26 04:39:41 2000 +++ configure @@@@ -2471,7 +2471,7 @@@@ d12 1 a12 1 @@@@ -2753,7 +2753,7 @@@@ d21 1 a21 1 @@@@ -3288,7 +3288,7 @@@@ @ 1.1 log @Fix a bug in configure. @ text @d3 3 a5 3 --- configure.ORIG Sun Aug 16 19:58:30 1998 +++ configure Sun Aug 16 20:00:49 1998 @@@@ -2550,7 +2550,7 @@@@ d14 18 @