Index: head/sysutils/afio/files/patch-ab =================================================================== --- head/sysutils/afio/files/patch-ab (revision 363334) +++ head/sysutils/afio/files/patch-ab (nonexistent) @@ -1,83 +0,0 @@ -*** afio.c.orig Sat Dec 20 17:16:13 2003 ---- afio.c Sat Jan 21 17:31:23 2006 -*************** -*** 648,658 **** - daniel.andersson@sto.sema.se */ - fprintf (stderr, "Media size %ld is less than block size %d\n", - aruntil, arbsize); - #else - fprintf (stderr, "Media size %ld is less than block size %d\n", -! (unsigned long) aruntil, arbsize); - #endif - usage (); - } - if (arpad == 0) - arpad = arbsize; ---- 648,658 ---- - daniel.andersson@sto.sema.se */ - fprintf (stderr, "Media size %ld is less than block size %d\n", - aruntil, arbsize); - #else - fprintf (stderr, "Media size %ld is less than block size %d\n", -! (u_long) aruntil, arbsize); - #endif - usage (); - } - if (arpad == 0) - arpad = arbsize; -*************** -*** 3155,3168 **** - return (warn (name, syserr ())); - else - exists = 0; - } - -! if (mknod (name, asb->sb_mode, asb->sb_rdev) < 0 - && (errno != ENOENT - || dirneed (name) < 0 -! || mknod (name, asb->sb_mode, asb->sb_rdev) < 0)) - return (warn (name, syserr ())); - break; - case S_IFDIR: - if (exists) - { ---- 3155,3168 ---- - return (warn (name, syserr ())); - else - exists = 0; - } - -! if (mkfifo (name, asb->sb_mode) < 0 - && (errno != ENOENT - || dirneed (name) < 0 -! || mkfifo (name, asb->sb_mode) < 0)) - return (warn (name, syserr ())); - break; - case S_IFDIR: - if (exists) - { -*************** -*** 3194,3204 **** - || dirneed (name) < 0 - || mkfifo (name, asb->sb_mode) < 0)) - return (warn (name, syserr ())); - break; - #endif /* S_IFIFO */ -! #ifdef S_IFSOCK - case S_IFSOCK: - fd = 0; - if (exists) - if (perm != operm && chmod (name, perm) < 0) - return (warn (name, syserr ())); ---- 3194,3204 ---- - || dirneed (name) < 0 - || mkfifo (name, asb->sb_mode) < 0)) - return (warn (name, syserr ())); - break; - #endif /* S_IFIFO */ -! #ifdef S_IFSOCK && !defined (__FreeBSD__) - case S_IFSOCK: - fd = 0; - if (exists) - if (perm != operm && chmod (name, perm) < 0) - return (warn (name, syserr ())); Property changes on: head/sysutils/afio/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/afio/files/patch-ac =================================================================== --- head/sysutils/afio/files/patch-ac (revision 363334) +++ head/sysutils/afio/files/patch-ac (nonexistent) @@ -1,12 +0,0 @@ ---- afio.h.orig Sun Sep 20 04:04:54 1998 -+++ afio.h Wed Dec 9 01:33:32 1998 -@@ -1,5 +1,9 @@ - /* afio.h defines for afio. */ - -+#ifdef HAVE_PARAM_H -+#include -+#endif -+ - #ifdef SYSTIME - #include - #else /* SYSTIME */ Property changes on: head/sysutils/afio/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/afio/files/patch-ad =================================================================== --- head/sysutils/afio/files/patch-ad (revision 363334) +++ head/sysutils/afio/files/patch-ad (nonexistent) @@ -1,11 +0,0 @@ ---- compfile.c.orig Thu Nov 25 22:22:28 1999 -+++ compfile.c Thu Jan 27 14:36:31 2000 -@@ -207,7 +207,7 @@ - * version; - */ - --#if ( defined(sun) && defined(__svr4__) ) -+#if ( defined(sun) && defined(__svr4__) || defined(__FreeBSD__) ) - #include - #else - #include Property changes on: head/sysutils/afio/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/afio/files/patch-afio.c =================================================================== --- head/sysutils/afio/files/patch-afio.c (nonexistent) +++ head/sysutils/afio/files/patch-afio.c (revision 363335) @@ -0,0 +1,83 @@ +*** afio.c.orig Sat Dec 20 17:16:13 2003 +--- afio.c Sat Jan 21 17:31:23 2006 +*************** +*** 648,658 **** + daniel.andersson@sto.sema.se */ + fprintf (stderr, "Media size %ld is less than block size %d\n", + aruntil, arbsize); + #else + fprintf (stderr, "Media size %ld is less than block size %d\n", +! (unsigned long) aruntil, arbsize); + #endif + usage (); + } + if (arpad == 0) + arpad = arbsize; +--- 648,658 ---- + daniel.andersson@sto.sema.se */ + fprintf (stderr, "Media size %ld is less than block size %d\n", + aruntil, arbsize); + #else + fprintf (stderr, "Media size %ld is less than block size %d\n", +! (u_long) aruntil, arbsize); + #endif + usage (); + } + if (arpad == 0) + arpad = arbsize; +*************** +*** 3155,3168 **** + return (warn (name, syserr ())); + else + exists = 0; + } + +! if (mknod (name, asb->sb_mode, asb->sb_rdev) < 0 + && (errno != ENOENT + || dirneed (name) < 0 +! || mknod (name, asb->sb_mode, asb->sb_rdev) < 0)) + return (warn (name, syserr ())); + break; + case S_IFDIR: + if (exists) + { +--- 3155,3168 ---- + return (warn (name, syserr ())); + else + exists = 0; + } + +! if (mkfifo (name, asb->sb_mode) < 0 + && (errno != ENOENT + || dirneed (name) < 0 +! || mkfifo (name, asb->sb_mode) < 0)) + return (warn (name, syserr ())); + break; + case S_IFDIR: + if (exists) + { +*************** +*** 3194,3204 **** + || dirneed (name) < 0 + || mkfifo (name, asb->sb_mode) < 0)) + return (warn (name, syserr ())); + break; + #endif /* S_IFIFO */ +! #ifdef S_IFSOCK + case S_IFSOCK: + fd = 0; + if (exists) + if (perm != operm && chmod (name, perm) < 0) + return (warn (name, syserr ())); +--- 3194,3204 ---- + || dirneed (name) < 0 + || mkfifo (name, asb->sb_mode) < 0)) + return (warn (name, syserr ())); + break; + #endif /* S_IFIFO */ +! #ifdef S_IFSOCK && !defined (__FreeBSD__) + case S_IFSOCK: + fd = 0; + if (exists) + if (perm != operm && chmod (name, perm) < 0) + return (warn (name, syserr ())); Property changes on: head/sysutils/afio/files/patch-afio.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/afio/files/patch-afio.h =================================================================== --- head/sysutils/afio/files/patch-afio.h (nonexistent) +++ head/sysutils/afio/files/patch-afio.h (revision 363335) @@ -0,0 +1,12 @@ +--- afio.h.orig Sun Sep 20 04:04:54 1998 ++++ afio.h Wed Dec 9 01:33:32 1998 +@@ -1,5 +1,9 @@ + /* afio.h defines for afio. */ + ++#ifdef HAVE_PARAM_H ++#include ++#endif ++ + #ifdef SYSTIME + #include + #else /* SYSTIME */ Property changes on: head/sysutils/afio/files/patch-afio.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/afio/files/patch-compfile.c =================================================================== --- head/sysutils/afio/files/patch-compfile.c (nonexistent) +++ head/sysutils/afio/files/patch-compfile.c (revision 363335) @@ -0,0 +1,11 @@ +--- compfile.c.orig Thu Nov 25 22:22:28 1999 ++++ compfile.c Thu Jan 27 14:36:31 2000 +@@ -207,7 +207,7 @@ + * version; + */ + +-#if ( defined(sun) && defined(__svr4__) ) ++#if ( defined(sun) && defined(__svr4__) || defined(__FreeBSD__) ) + #include + #else + #include Property changes on: head/sysutils/afio/files/patch-compfile.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/asfsm/files/patch-aa =================================================================== --- head/sysutils/asfsm/files/patch-aa (revision 363334) +++ head/sysutils/asfsm/files/patch-aa (nonexistent) @@ -1,80 +0,0 @@ - -$FreeBSD$ - ---- asfsm.c.orig Sun Oct 18 12:02:09 1998 -+++ asfsm.c Thu Aug 15 23:19:02 2002 -@@ -2,10 +2,10 @@ - /* Author: David Muse 1997 */ - #include - #include --#include --#include --#include --#include -+#include -+#include -+#include -+#include - #ifdef SIXTEENBIT - #include "16bit/surreal.xpm" - #include "16bit/purplestoneswirl.xpm" -@@ -98,10 +98,10 @@ - int flag=0; - - /* figure out which "df -" command to use */ -- tempfile=popen("df -Bk","r"); -+ tempfile=popen("df -k","r"); - fscanf(tempfile,"%s",word); - if (!strcmp(word,"Filesystem")) { -- sprintf(dfcommand,"df -Bk"); -+ sprintf(dfcommand,"df -k"); - } else { - tempfile=popen("df -a","r"); - fscanf(tempfile,"%s",word); -@@ -135,27 +135,6 @@ - } - fclose(tempfile); - -- /* detect which user mount/unmount command to use */ -- /* by giving umnt a bum parameter (-h) and seeing if it */ -- /* returns anything about an illegal option or if it just says */ -- /* command not found. Different shells have different messages */ -- /* for not finding a command, and which behaves differently too, */ -- /* so this seems a reasonable way to do it. */ -- tempfile=popen("umnt -h > /usr/tmp/testumnt 2> /usr/tmp/testumnt; cat /usr/tmp/testumnt; rm /usr/tmp/testumnt","r"); -- while(!feof(tempfile)) { -- fscanf(tempfile,"%s",word); -- if (!strcmp("option",word)) { -- /* the response must have been -- umnt: ERROR: Illegal option -- h -- or something like it, the command exists */ -- sprintf(mountcmd,"mnt "); -- sprintf(umountcmd,"umnt "); -- flag=1; -- break; -- } -- } -- pclose(tempfile); -- - if (flag==0) { - /* otherwise, the mount/unmount commands must be used */ - sprintf(mountcmd,"mount "); -@@ -374,7 +353,8 @@ - fs[counter].percent, - fs[counter].mountdir); - if (strlen(fs[counter].mountdir)>0 && counter<23) { -- if (atoi(fs[counter].blocks)>0 || showzero==1) { -+ if ((atoi(fs[counter].blocks)>0 || showzero==1) && -+ (strcmp(fs[counter].mountdir, "/proc"))){ - counter++; - } - } else { -@@ -721,7 +701,7 @@ - }; - - if (!feof(fstabfile)) { -- if (buffer[0]!='#') { -+ if (buffer[0]!='#' && strncmp(buffer, "proc", 4)) { - strcpy(fstab[fstabcounter].filesystem, - ""); - strcpy(fstab[fstabcounter].mountdir,""); Property changes on: head/sysutils/asfsm/files/patch-aa ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/asfsm/files/patch-asfsm.c =================================================================== --- head/sysutils/asfsm/files/patch-asfsm.c (nonexistent) +++ head/sysutils/asfsm/files/patch-asfsm.c (revision 363335) @@ -0,0 +1,80 @@ + +$FreeBSD$ + +--- asfsm.c.orig Sun Oct 18 12:02:09 1998 ++++ asfsm.c Thu Aug 15 23:19:02 2002 +@@ -2,10 +2,10 @@ + /* Author: David Muse 1997 */ + #include + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #ifdef SIXTEENBIT + #include "16bit/surreal.xpm" + #include "16bit/purplestoneswirl.xpm" +@@ -98,10 +98,10 @@ + int flag=0; + + /* figure out which "df -" command to use */ +- tempfile=popen("df -Bk","r"); ++ tempfile=popen("df -k","r"); + fscanf(tempfile,"%s",word); + if (!strcmp(word,"Filesystem")) { +- sprintf(dfcommand,"df -Bk"); ++ sprintf(dfcommand,"df -k"); + } else { + tempfile=popen("df -a","r"); + fscanf(tempfile,"%s",word); +@@ -135,27 +135,6 @@ + } + fclose(tempfile); + +- /* detect which user mount/unmount command to use */ +- /* by giving umnt a bum parameter (-h) and seeing if it */ +- /* returns anything about an illegal option or if it just says */ +- /* command not found. Different shells have different messages */ +- /* for not finding a command, and which behaves differently too, */ +- /* so this seems a reasonable way to do it. */ +- tempfile=popen("umnt -h > /usr/tmp/testumnt 2> /usr/tmp/testumnt; cat /usr/tmp/testumnt; rm /usr/tmp/testumnt","r"); +- while(!feof(tempfile)) { +- fscanf(tempfile,"%s",word); +- if (!strcmp("option",word)) { +- /* the response must have been +- umnt: ERROR: Illegal option -- h +- or something like it, the command exists */ +- sprintf(mountcmd,"mnt "); +- sprintf(umountcmd,"umnt "); +- flag=1; +- break; +- } +- } +- pclose(tempfile); +- + if (flag==0) { + /* otherwise, the mount/unmount commands must be used */ + sprintf(mountcmd,"mount "); +@@ -374,7 +353,8 @@ + fs[counter].percent, + fs[counter].mountdir); + if (strlen(fs[counter].mountdir)>0 && counter<23) { +- if (atoi(fs[counter].blocks)>0 || showzero==1) { ++ if ((atoi(fs[counter].blocks)>0 || showzero==1) && ++ (strcmp(fs[counter].mountdir, "/proc"))){ + counter++; + } + } else { +@@ -721,7 +701,7 @@ + }; + + if (!feof(fstabfile)) { +- if (buffer[0]!='#') { ++ if (buffer[0]!='#' && strncmp(buffer, "proc", 4)) { + strcpy(fstab[fstabcounter].filesystem, + ""); + strcpy(fstab[fstabcounter].mountdir,""); Property changes on: head/sysutils/asfsm/files/patch-asfsm.c ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/bkpupsd/files/patch-ab =================================================================== --- head/sysutils/bkpupsd/files/patch-ab (revision 363334) +++ head/sysutils/bkpupsd/files/patch-ab (nonexistent) @@ -1,58 +0,0 @@ ---- src/bkpupsd.c.orig Sun Aug 3 20:11:23 1997 -+++ src/bkpupsd.c Fri Dec 15 00:53:52 2006 -@@ -27,14 +27,17 @@ - */ - - #include -+#include -+#include - #include - #include - #include -+#include - #include - #include - #include - #include --#include -+#include - - #define POWER_TIMEOUT 5*60 - #define DEFAULT_PORT "/dev/cuaa1" -@@ -44,16 +47,17 @@ - #define SH_RESTORED "/usr/local/libexec/bkpupsd/bkpups.restored" - #define SH_BATTLOW "/usr/local/libexec/bkpupsd/bkpups.battlow" - -+int makepid(char *s); -+void execomand(); -+ - int main(argc, argv) - int argc; - char **argv; - { - int fd; - int lstatus; -- int flags; - int rts_bit = TIOCM_RTS; - int dtr_bit = TIOCM_DTR; -- int rng_bit = TIOCM_RNG; - int pfail = 0; - int pfcount = 0; - int prcount = 0; -@@ -63,7 +67,6 @@ - char *sh_restored = SH_RESTORED; - char *sh_battlow = SH_BATTLOW; - char *ups_port = DEFAULT_PORT; -- static void execomand(); - - /* open ups port */ - if(argc > 2) { -@@ -179,7 +182,7 @@ - pid = getpid(); - if((fp = fopen(s, "w")) == NULL) - return -1; -- fprintf(fp, "%ld\n", pid); -+ fprintf(fp, "%lu\n", (u_long)pid); - fclose(fp); - return 0; - } Property changes on: head/sysutils/bkpupsd/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/bkpupsd/files/patch-src__bkpupsd.c =================================================================== --- head/sysutils/bkpupsd/files/patch-src__bkpupsd.c (nonexistent) +++ head/sysutils/bkpupsd/files/patch-src__bkpupsd.c (revision 363335) @@ -0,0 +1,58 @@ +--- src/bkpupsd.c.orig Sun Aug 3 20:11:23 1997 ++++ src/bkpupsd.c Fri Dec 15 00:53:52 2006 +@@ -27,14 +27,17 @@ + */ + + #include ++#include ++#include + #include + #include + #include ++#include + #include + #include + #include + #include +-#include ++#include + + #define POWER_TIMEOUT 5*60 + #define DEFAULT_PORT "/dev/cuaa1" +@@ -44,16 +47,17 @@ + #define SH_RESTORED "/usr/local/libexec/bkpupsd/bkpups.restored" + #define SH_BATTLOW "/usr/local/libexec/bkpupsd/bkpups.battlow" + ++int makepid(char *s); ++void execomand(); ++ + int main(argc, argv) + int argc; + char **argv; + { + int fd; + int lstatus; +- int flags; + int rts_bit = TIOCM_RTS; + int dtr_bit = TIOCM_DTR; +- int rng_bit = TIOCM_RNG; + int pfail = 0; + int pfcount = 0; + int prcount = 0; +@@ -63,7 +67,6 @@ + char *sh_restored = SH_RESTORED; + char *sh_battlow = SH_BATTLOW; + char *ups_port = DEFAULT_PORT; +- static void execomand(); + + /* open ups port */ + if(argc > 2) { +@@ -179,7 +182,7 @@ + pid = getpid(); + if((fp = fopen(s, "w")) == NULL) + return -1; +- fprintf(fp, "%ld\n", pid); ++ fprintf(fp, "%lu\n", (u_long)pid); + fclose(fp); + return 0; + } Property changes on: head/sysutils/bkpupsd/files/patch-src__bkpupsd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-readcd::readcd.1 =================================================================== --- head/sysutils/cdrtools/files/patch-readcd::readcd.1 (revision 363334) +++ head/sysutils/cdrtools/files/patch-readcd::readcd.1 (nonexistent) @@ -1,30 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- readcd/readcd.1.orig Mon Sep 29 14:53:05 2003 -+++ readcd/readcd.1 Mon Sep 29 15:10:06 2003 -@@ -432,9 +432,7 @@ - .SH FILES - .SH SEE ALSO - .BR cdrecord (1), --.BR mkisofs (1), --.BR scg (7), --.BR fbk (7), -+.BR mkisofs (8), - .BR rcmd (3), - .BR ssh (1). - Property changes on: head/sysutils/cdrtools/files/patch-readcd::readcd.1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl =================================================================== --- head/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl (revision 363334) +++ head/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl (nonexistent) @@ -1,19 +0,0 @@ ---- rscsi/rscsi.dfl.orig Sun Aug 17 11:50:57 2003 -+++ rscsi/rscsi.dfl Sun Aug 17 12:28:46 2003 -@@ -18,14 +18,13 @@ - # Each USER= entry adds the listed user to the users who may run rscsi - # - # A typical passwd entry looks like this: --# rscsi:x:1999:1000:Remote SCSI:/export/home/rscsi:/opt/schily/sbin/rscsi -+# rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/opt/schily/sbin/rscsi - # --# Add entries for all valid remote users to /export/home/rscsi/.rhosts -+# Add entries for all valid remote users to /usr/local/rscsi/.rhosts - # - # USER= entries are checked with a pattern matcher. USER=* matches all users. - # - USER=rscsi --#USER=joerg - - # - # Each ACCESS= entry adds a target or group of targets to the list of visible Property changes on: head/sysutils/cdrtools/files/patch-rscsi::rscsi.dfl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-ad =================================================================== --- head/sysutils/cdrtools/files/patch-ad (revision 363334) +++ head/sysutils/cdrtools/files/patch-ad (nonexistent) @@ -1,68 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006 -+++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006 -@@ -20,8 +20,9 @@ - ########################################################################### - - CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) --CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) --C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX) -+XCFLAGS:= $(CFLAGS) -+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) -+C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(XCFLAGS) $(G++OPTOPT) $(C++OPTX) - - CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS) - COPTS= -@@ -29,12 +30,10 @@ - CWOPTS= -Wall -Wtraditional - CWOPTS= -Wall -Wno-unknown-pragmas \ - -Wshadow -Wmissing-prototypes -Wstrict-prototypes --COPTOPT= -O - COPTDYN= -fpic - COPTGPROF= -pg - C++OPTS= - C++WOPTS= $(CWOPTS) --C++OPTOPT= $(COPTOPT) - C++OPTDYN= -fpic - C++OPTGPROF= -pg - -@@ -54,15 +53,15 @@ - - FLOAT_OPTIONS= - --CC= @echo " ==> COMPILING \"$@\""; gcc --CC++ = @echo " ==> COMPILING \"$@\""; g++ --LDCC= @echo " ==> LINKING \"$@\""; gcc --LDCC++ = @echo " ==> LINKING \"$@\""; g++ --DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc --DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; g++ -+CC_COM= $(CC) -+CC++ = $(CXX) -+LDCC= $(CC) -+LDCC++ = $(CXX) -+DYNLD= $(CC) -+DYNLDC++ = $(CXX) - - RMDEP= : --MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M -+MKDEP= $(CC) -M - MKDEP_OUT= --MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); g++ -M -+MKC++DEP= $(CXX) -M - MKC++DEP_OUT= Property changes on: head/sysutils/cdrtools/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-btcflash::btcflash.1 =================================================================== --- head/sysutils/cdrtools/files/patch-btcflash::btcflash.1 (revision 363334) +++ head/sysutils/cdrtools/files/patch-btcflash::btcflash.1 (nonexistent) @@ -1,10 +0,0 @@ ---- btcflash/btcflash.1.orig Wed Feb 8 23:13:24 2006 -+++ btcflash/btcflash.1 Thu Feb 16 14:54:32 2006 -@@ -293,7 +293,6 @@ - login shell. - .SH "SEE ALSO" - .BR cdrecord (1), --.BR scg (7), - .BR rcmd (3), - .BR ssh (1). - .SH NOTES Property changes on: head/sysutils/cdrtools/files/patch-btcflash::btcflash.1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 =================================================================== --- head/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 (revision 363334) +++ head/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 (nonexistent) @@ -1,29 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- scgcheck/scgcheck.1.orig Mon Sep 29 14:56:16 2003 -+++ scgcheck/scgcheck.1 Mon Sep 29 14:56:44 2003 -@@ -234,8 +234,7 @@ - .SH SEE ALSO - .BR cdrecord (1), - .BR readcd (1), --.BR mkisofs (1), --.BR scg (7). -+.BR mkisofs (8). - - .SH NOTES - .PP Property changes on: head/sysutils/cdrtools/files/patch-scgcheck::scgcheck.1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-cdrecord::README.rscsi =================================================================== --- head/sysutils/cdrtools/files/patch-cdrecord::README.rscsi (revision 363334) +++ head/sysutils/cdrtools/files/patch-cdrecord::README.rscsi (nonexistent) @@ -1,36 +0,0 @@ ---- cdrecord/README.rscsi.orig Sun Aug 17 11:31:39 2003 -+++ cdrecord/README.rscsi Sun Aug 17 14:38:57 2003 -@@ -18,24 +18,21 @@ - NOTE: In this case, rscsi must be installed suid root. - **** This is the preferred method **** - --To enable remote SCSI via the login shell method you should do the following: -- -- - Add an entry to /etc/passwd in the form: -+ The FreeBSD port automatically installs the rscsi binary suid -+ root and creates the user "rscsi". - -- rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi -- -- (modify this according to your OS). And don't forget to -- modify /etc/shadow the way it needs to be on your OS. -+To enable remote SCSI via the login shell method you should do the following: - -- - Create a home directory for this user and add a .rhosts file -- to allow access to all users you like. -+ - Make sure that there is an entry for rshd(8) in /etc/inetd.conf -+ and inetd(8) is running. - -- - Install rscsi suid root into /opt/schily/sbin -+ - Edit /usr/local/rscsi/.rhosts to allow access to all users you -+ like. - -- - Install a file /etc/default/rscsi and define access rights. -+ - Edit /usr/local/etc/rscsi and define access rights. - Without this file, rscsi will not work at all. - -- The template for this file is: rscsi/rscsi.dfl -+ The template for this file is: /usr/local/etc/rscsi.sample - - RSCSI Security: - Property changes on: head/sysutils/cdrtools/files/patch-cdrecord::README.rscsi ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-mkisofs::mkisofs.8 =================================================================== --- head/sysutils/cdrtools/files/patch-mkisofs::mkisofs.8 (revision 363334) +++ head/sysutils/cdrtools/files/patch-mkisofs::mkisofs.8 (nonexistent) @@ -1,20 +0,0 @@ ---- mkisofs/mkisofs.8.orig Mon Sep 29 15:11:48 2003 -+++ mkisofs/mkisofs.8 Mon Sep 29 15:19:01 2003 -@@ -1668,7 +1668,7 @@ - The format of the - .I magic - file is almost identical to the --.BR magic (4) -+.BR magic (5) - file used by the Linux - .BR file (1) - command - the routines for reading and decoding the -@@ -1707,7 +1707,7 @@ - .TE - .PP - The format of the file is described in the --.BR magic (4) -+.BR magic (5) - man page. The only difference here is that for each entry in the magic file, the - .I message - for the initial offset Property changes on: head/sysutils/cdrtools/files/patch-mkisofs::mkisofs.8 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-include::schily::sha2.h =================================================================== --- head/sysutils/cdrtools/files/patch-include::schily::sha2.h (revision 363334) +++ head/sysutils/cdrtools/files/patch-include::schily::sha2.h (nonexistent) @@ -1,14 +0,0 @@ ---- include/schily/sha2.h.orig 2009-08-09 14:29:59.000000000 +0200 -+++ include/schily/sha2.h 2012-10-20 14:25:05.000000000 +0200 -@@ -102,9 +102,11 @@ - - #ifdef HAVE_LONGLONG - extern void SHA384Init __PR((SHA2_CTX *)); -+#ifndef HAVE_PRAGMA_WEAK - extern void SHA384Transform __PR((UInt64_t state[8], const UInt8_t [SHA384_BLOCK_LENGTH])); - extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t)); - extern void SHA384Pad __PR((SHA2_CTX *)); -+#endif - extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], SHA2_CTX *)); - extern char *SHA384End __PR((SHA2_CTX *, char *)); - extern char *SHA384File __PR((const char *, char *)); Property changes on: head/sysutils/cdrtools/files/patch-include::schily::sha2.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 =================================================================== --- head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 (revision 363334) +++ head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 (nonexistent) @@ -1,28 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- cdrecord/cdrecord.1.orig Mon Sep 29 14:48:48 2003 -+++ cdrecord/cdrecord.1 Mon Sep 29 14:49:23 2003 -@@ -1738,8 +1738,6 @@ - .SH SEE ALSO - .BR cdda2wav (1), - .BR readcd (1), --.BR scg (7), --.BR fbk (7), - .BR mkisofs (8), - .BR rcmd (3), - .BR ssh (1). Property changes on: head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl =================================================================== --- head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl (revision 363334) +++ head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl (nonexistent) @@ -1,64 +0,0 @@ ---- cdrecord/cdrecord.dfl.orig Mon Aug 18 19:45:45 2003 -+++ cdrecord/cdrecord.dfl Mon Aug 18 19:46:32 2003 -@@ -3,7 +3,7 @@ - # This file is /etc/default/cdrecord - # It contains defaults that are used if no command line option - # or environment is present. --# -+# - # The default device, if not specified elswhere - # Note that since Sommer 2006, cdrecord by default searches for a - # single CD-ROM device. You should set CDR_DEVICE= together with -@@ -11,15 +11,14 @@ - # one CR-ROM drive in your system. - # - #CDR_DEVICE=yamaha --#CDR_DEVICE=default - --# -+# - # The default speed (speed=), if not specified elswhere - # - # Note that newer cdrecord versions do not default - # to speed=1. For MMC compliant drives, the default - # is to write at maximum speed, so it in general does --# not make sense to set up a default speed in /etc/default/cdrecord -+# not make sense to set up a default speed in /etc/default/cdrecord - # - #CDR_SPEED=40 - -@@ -34,7 +33,7 @@ - # Linux and Solaris have problems with bigger transfer sizes. - # If you are on FreeBSD, it is recommened to set CDR_TRANSFERSIZE=126k - # --#CDR_TRANSFERSIZE=32k -+CDR_TRANSFERSIZE=126k - - # - # The following definitions allow abstract device names. -@@ -56,14 +55,14 @@ - # - # drive name device speed fifosize driveropts transfersize - # --my-default= 1,0,0 -1 -1 burnfree 63k --sol-default= USCSI:1,0,0 -1 -1 burnfree --ricoh-u= USCSI:0,2,0 -1 -1 burnfree --teac= 1,3,0 -1 -1 "" --teac-max-ts= 1,3,0 -1 -1 "" 32k --panasonic= 1,4,0 -1 -1 "" --plextor= 1,4,0 -1 -1 "" --sanyo= 1,4,0 -1 -1 burnfree --yamaha= 1,5,0 -1 -1 "" --cdrom= 0,6,0 2 1m "" --remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree -+#my-default= 1,0,0 -1 -1 burnfree 63k -+#sol-default= USCSI:1,0,0 -1 -1 burnfree -+#ricoh-u= USCSI:0,2,0 -1 -1 burnfree -+#teac= 1,3,0 -1 -1 "" -+#teac-max-ts= 1,3,0 -1 -1 "" 32k -+#panasonic= 1,4,0 -1 -1 "" -+#plextor= 1,4,0 -1 -1 "" -+#sanyo= 1,4,0 -1 -1 burnfree -+#yamaha= 1,5,0 -1 -1 "" -+#cdrom= 0,6,0 2 1m "" -+#remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree Property changes on: head/sysutils/cdrtools/files/patch-cdrecord::cdrecord.dfl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul =================================================================== --- head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul (nonexistent) +++ head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul (revision 363335) @@ -0,0 +1,68 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006 ++++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006 +@@ -20,8 +20,9 @@ + ########################################################################### + + CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) +-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) +-C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX) ++XCFLAGS:= $(CFLAGS) ++CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) ++C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(XCFLAGS) $(G++OPTOPT) $(C++OPTX) + + CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS) + COPTS= +@@ -29,12 +30,10 @@ + CWOPTS= -Wall -Wtraditional + CWOPTS= -Wall -Wno-unknown-pragmas \ + -Wshadow -Wmissing-prototypes -Wstrict-prototypes +-COPTOPT= -O + COPTDYN= -fpic + COPTGPROF= -pg + C++OPTS= + C++WOPTS= $(CWOPTS) +-C++OPTOPT= $(COPTOPT) + C++OPTDYN= -fpic + C++OPTGPROF= -pg + +@@ -54,15 +53,15 @@ + + FLOAT_OPTIONS= + +-CC= @echo " ==> COMPILING \"$@\""; gcc +-CC++ = @echo " ==> COMPILING \"$@\""; g++ +-LDCC= @echo " ==> LINKING \"$@\""; gcc +-LDCC++ = @echo " ==> LINKING \"$@\""; g++ +-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc +-DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; g++ ++CC_COM= $(CC) ++CC++ = $(CXX) ++LDCC= $(CC) ++LDCC++ = $(CXX) ++DYNLD= $(CC) ++DYNLDC++ = $(CXX) + + RMDEP= : +-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M ++MKDEP= $(CC) -M + MKDEP_OUT= +-MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); g++ -M ++MKC++DEP= $(CXX) -M + MKC++DEP_OUT= Property changes on: head/sysutils/cdrtools/files/patch-RULES__cc-gcc.rul ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-btcflash__btcflash.1 =================================================================== --- head/sysutils/cdrtools/files/patch-btcflash__btcflash.1 (nonexistent) +++ head/sysutils/cdrtools/files/patch-btcflash__btcflash.1 (revision 363335) @@ -0,0 +1,10 @@ +--- btcflash/btcflash.1.orig Wed Feb 8 23:13:24 2006 ++++ btcflash/btcflash.1 Thu Feb 16 14:54:32 2006 +@@ -293,7 +293,6 @@ + login shell. + .SH "SEE ALSO" + .BR cdrecord (1), +-.BR scg (7), + .BR rcmd (3), + .BR ssh (1). + .SH NOTES Property changes on: head/sysutils/cdrtools/files/patch-btcflash__btcflash.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-cdrecord__README.rscsi =================================================================== --- head/sysutils/cdrtools/files/patch-cdrecord__README.rscsi (nonexistent) +++ head/sysutils/cdrtools/files/patch-cdrecord__README.rscsi (revision 363335) @@ -0,0 +1,36 @@ +--- cdrecord/README.rscsi.orig Sun Aug 17 11:31:39 2003 ++++ cdrecord/README.rscsi Sun Aug 17 14:38:57 2003 +@@ -18,24 +18,21 @@ + NOTE: In this case, rscsi must be installed suid root. + **** This is the preferred method **** + +-To enable remote SCSI via the login shell method you should do the following: +- +- - Add an entry to /etc/passwd in the form: ++ The FreeBSD port automatically installs the rscsi binary suid ++ root and creates the user "rscsi". + +- rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi +- +- (modify this according to your OS). And don't forget to +- modify /etc/shadow the way it needs to be on your OS. ++To enable remote SCSI via the login shell method you should do the following: + +- - Create a home directory for this user and add a .rhosts file +- to allow access to all users you like. ++ - Make sure that there is an entry for rshd(8) in /etc/inetd.conf ++ and inetd(8) is running. + +- - Install rscsi suid root into /opt/schily/sbin ++ - Edit /usr/local/rscsi/.rhosts to allow access to all users you ++ like. + +- - Install a file /etc/default/rscsi and define access rights. ++ - Edit /usr/local/etc/rscsi and define access rights. + Without this file, rscsi will not work at all. + +- The template for this file is: rscsi/rscsi.dfl ++ The template for this file is: /usr/local/etc/rscsi.sample + + RSCSI Security: + Property changes on: head/sysutils/cdrtools/files/patch-cdrecord__README.rscsi ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.1 =================================================================== --- head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.1 (nonexistent) +++ head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.1 (revision 363335) @@ -0,0 +1,28 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- cdrecord/cdrecord.1.orig Mon Sep 29 14:48:48 2003 ++++ cdrecord/cdrecord.1 Mon Sep 29 14:49:23 2003 +@@ -1738,8 +1738,6 @@ + .SH SEE ALSO + .BR cdda2wav (1), + .BR readcd (1), +-.BR scg (7), +-.BR fbk (7), + .BR mkisofs (8), + .BR rcmd (3), + .BR ssh (1). Property changes on: head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.dfl =================================================================== --- head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.dfl (nonexistent) +++ head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.dfl (revision 363335) @@ -0,0 +1,64 @@ +--- cdrecord/cdrecord.dfl.orig Mon Aug 18 19:45:45 2003 ++++ cdrecord/cdrecord.dfl Mon Aug 18 19:46:32 2003 +@@ -3,7 +3,7 @@ + # This file is /etc/default/cdrecord + # It contains defaults that are used if no command line option + # or environment is present. +-# ++# + # The default device, if not specified elswhere + # Note that since Sommer 2006, cdrecord by default searches for a + # single CD-ROM device. You should set CDR_DEVICE= together with +@@ -11,15 +11,14 @@ + # one CR-ROM drive in your system. + # + #CDR_DEVICE=yamaha +-#CDR_DEVICE=default + +-# ++# + # The default speed (speed=), if not specified elswhere + # + # Note that newer cdrecord versions do not default + # to speed=1. For MMC compliant drives, the default + # is to write at maximum speed, so it in general does +-# not make sense to set up a default speed in /etc/default/cdrecord ++# not make sense to set up a default speed in /etc/default/cdrecord + # + #CDR_SPEED=40 + +@@ -34,7 +33,7 @@ + # Linux and Solaris have problems with bigger transfer sizes. + # If you are on FreeBSD, it is recommened to set CDR_TRANSFERSIZE=126k + # +-#CDR_TRANSFERSIZE=32k ++CDR_TRANSFERSIZE=126k + + # + # The following definitions allow abstract device names. +@@ -56,14 +55,14 @@ + # + # drive name device speed fifosize driveropts transfersize + # +-my-default= 1,0,0 -1 -1 burnfree 63k +-sol-default= USCSI:1,0,0 -1 -1 burnfree +-ricoh-u= USCSI:0,2,0 -1 -1 burnfree +-teac= 1,3,0 -1 -1 "" +-teac-max-ts= 1,3,0 -1 -1 "" 32k +-panasonic= 1,4,0 -1 -1 "" +-plextor= 1,4,0 -1 -1 "" +-sanyo= 1,4,0 -1 -1 burnfree +-yamaha= 1,5,0 -1 -1 "" +-cdrom= 0,6,0 2 1m "" +-remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree ++#my-default= 1,0,0 -1 -1 burnfree 63k ++#sol-default= USCSI:1,0,0 -1 -1 burnfree ++#ricoh-u= USCSI:0,2,0 -1 -1 burnfree ++#teac= 1,3,0 -1 -1 "" ++#teac-max-ts= 1,3,0 -1 -1 "" 32k ++#panasonic= 1,4,0 -1 -1 "" ++#plextor= 1,4,0 -1 -1 "" ++#sanyo= 1,4,0 -1 -1 burnfree ++#yamaha= 1,5,0 -1 -1 "" ++#cdrom= 0,6,0 2 1m "" ++#remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree Property changes on: head/sysutils/cdrtools/files/patch-cdrecord__cdrecord.dfl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-include__schily__sha2.h =================================================================== --- head/sysutils/cdrtools/files/patch-include__schily__sha2.h (nonexistent) +++ head/sysutils/cdrtools/files/patch-include__schily__sha2.h (revision 363335) @@ -0,0 +1,14 @@ +--- include/schily/sha2.h.orig 2009-08-09 14:29:59.000000000 +0200 ++++ include/schily/sha2.h 2012-10-20 14:25:05.000000000 +0200 +@@ -102,9 +102,11 @@ + + #ifdef HAVE_LONGLONG + extern void SHA384Init __PR((SHA2_CTX *)); ++#ifndef HAVE_PRAGMA_WEAK + extern void SHA384Transform __PR((UInt64_t state[8], const UInt8_t [SHA384_BLOCK_LENGTH])); + extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t)); + extern void SHA384Pad __PR((SHA2_CTX *)); ++#endif + extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], SHA2_CTX *)); + extern char *SHA384End __PR((SHA2_CTX *, char *)); + extern char *SHA384File __PR((const char *, char *)); Property changes on: head/sysutils/cdrtools/files/patch-include__schily__sha2.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-mkisofs__mkisofs.8 =================================================================== --- head/sysutils/cdrtools/files/patch-mkisofs__mkisofs.8 (nonexistent) +++ head/sysutils/cdrtools/files/patch-mkisofs__mkisofs.8 (revision 363335) @@ -0,0 +1,20 @@ +--- mkisofs/mkisofs.8.orig Mon Sep 29 15:11:48 2003 ++++ mkisofs/mkisofs.8 Mon Sep 29 15:19:01 2003 +@@ -1668,7 +1668,7 @@ + The format of the + .I magic + file is almost identical to the +-.BR magic (4) ++.BR magic (5) + file used by the Linux + .BR file (1) + command - the routines for reading and decoding the +@@ -1707,7 +1707,7 @@ + .TE + .PP + The format of the file is described in the +-.BR magic (4) ++.BR magic (5) + man page. The only difference here is that for each entry in the magic file, the + .I message + for the initial offset Property changes on: head/sysutils/cdrtools/files/patch-mkisofs__mkisofs.8 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-readcd__readcd.1 =================================================================== --- head/sysutils/cdrtools/files/patch-readcd__readcd.1 (nonexistent) +++ head/sysutils/cdrtools/files/patch-readcd__readcd.1 (revision 363335) @@ -0,0 +1,30 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- readcd/readcd.1.orig Mon Sep 29 14:53:05 2003 ++++ readcd/readcd.1 Mon Sep 29 15:10:06 2003 +@@ -432,9 +432,7 @@ + .SH FILES + .SH SEE ALSO + .BR cdrecord (1), +-.BR mkisofs (1), +-.BR scg (7), +-.BR fbk (7), ++.BR mkisofs (8), + .BR rcmd (3), + .BR ssh (1). + Property changes on: head/sysutils/cdrtools/files/patch-readcd__readcd.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-rscsi__rscsi.dfl =================================================================== --- head/sysutils/cdrtools/files/patch-rscsi__rscsi.dfl (nonexistent) +++ head/sysutils/cdrtools/files/patch-rscsi__rscsi.dfl (revision 363335) @@ -0,0 +1,19 @@ +--- rscsi/rscsi.dfl.orig Sun Aug 17 11:50:57 2003 ++++ rscsi/rscsi.dfl Sun Aug 17 12:28:46 2003 +@@ -18,14 +18,13 @@ + # Each USER= entry adds the listed user to the users who may run rscsi + # + # A typical passwd entry looks like this: +-# rscsi:x:1999:1000:Remote SCSI:/export/home/rscsi:/opt/schily/sbin/rscsi ++# rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/opt/schily/sbin/rscsi + # +-# Add entries for all valid remote users to /export/home/rscsi/.rhosts ++# Add entries for all valid remote users to /usr/local/rscsi/.rhosts + # + # USER= entries are checked with a pattern matcher. USER=* matches all users. + # + USER=rscsi +-#USER=joerg + + # + # Each ACCESS= entry adds a target or group of targets to the list of visible Property changes on: head/sysutils/cdrtools/files/patch-rscsi__rscsi.dfl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools/files/patch-scgcheck__scgcheck.1 =================================================================== --- head/sysutils/cdrtools/files/patch-scgcheck__scgcheck.1 (nonexistent) +++ head/sysutils/cdrtools/files/patch-scgcheck__scgcheck.1 (revision 363335) @@ -0,0 +1,29 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- scgcheck/scgcheck.1.orig Mon Sep 29 14:56:16 2003 ++++ scgcheck/scgcheck.1 Mon Sep 29 14:56:44 2003 +@@ -234,8 +234,7 @@ + .SH SEE ALSO + .BR cdrecord (1), + .BR readcd (1), +-.BR mkisofs (1), +-.BR scg (7). ++.BR mkisofs (8). + + .SH NOTES + .PP Property changes on: head/sysutils/cdrtools/files/patch-scgcheck__scgcheck.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd =================================================================== --- head/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd (revision 363334) +++ head/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd (nonexistent) @@ -1,30 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- DEFAULTS/Defaults.freebsd.orig 2013-11-04 21:58:20.000000000 +0100 -+++ DEFAULTS/Defaults.freebsd 2014-02-03 01:16:19.000000000 +0100 -@@ -29,8 +29,8 @@ - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --DEFOSINCDIRS= /usr/local/include --LDPATH= -L/opt/schily/lib -L/usr/local/lib -+#DEFOSINCDIRS= /usr/local/include -+#LDPATH= -L/opt/schily/lib -L/usr/local/lib - #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) Will probably not work - - ########################################################################### Property changes on: head/sysutils/cdrtools-devel/files/patch-DEFAULTS::Defaults.freebsd ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-readcd::readcd.1 =================================================================== --- head/sysutils/cdrtools-devel/files/patch-readcd::readcd.1 (revision 363334) +++ head/sysutils/cdrtools-devel/files/patch-readcd::readcd.1 (nonexistent) @@ -1,30 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- readcd/readcd.1.orig Mon Sep 29 14:53:05 2003 -+++ readcd/readcd.1 Mon Sep 29 15:10:06 2003 -@@ -432,9 +432,7 @@ - .SH FILES - .SH SEE ALSO - .BR cdrecord (1), --.BR mkisofs (1), --.BR scg (7), --.BR fbk (7), -+.BR mkisofs (8), - .BR rcmd (3), - .BR ssh (1). - Property changes on: head/sysutils/cdrtools-devel/files/patch-readcd::readcd.1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl =================================================================== --- head/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl (revision 363334) +++ head/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl (nonexistent) @@ -1,19 +0,0 @@ ---- rscsi/rscsi.dfl.orig Sun Aug 17 11:50:57 2003 -+++ rscsi/rscsi.dfl Sun Aug 17 12:28:46 2003 -@@ -18,14 +18,13 @@ - # Each USER= entry adds the listed user to the users who may run rscsi - # - # A typical passwd entry looks like this: --# rscsi:x:1999:1000:Remote SCSI:/export/home/rscsi:/opt/schily/sbin/rscsi -+# rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/opt/schily/sbin/rscsi - # --# Add entries for all valid remote users to /export/home/rscsi/.rhosts -+# Add entries for all valid remote users to /usr/local/rscsi/.rhosts - # - # USER= entries are checked with a pattern matcher. USER=* matches all users. - # - USER=rscsi --#USER=joerg - - # - # Each ACCESS= entry adds a target or group of targets to the list of visible Property changes on: head/sysutils/cdrtools-devel/files/patch-rscsi::rscsi.dfl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-ad =================================================================== --- head/sysutils/cdrtools-devel/files/patch-ad (revision 363334) +++ head/sysutils/cdrtools-devel/files/patch-ad (nonexistent) @@ -1,84 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006 -+++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006 -@@ -22,8 +22,9 @@ - ########################################################################### - - CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) $(OSINCDIRS:%=-I%) $(OSDEFS) $(OSDEFSX) --CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) --C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX) -+XCFLAGS:= $(CFLAGS) -+CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) -+C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(CXXFLAGS) $(G++OPTOPT) $(C++OPTX) - - CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) - COPTS= -@@ -31,12 +32,10 @@ - CWOPTS= -Wall -Wtraditional - CWOPTS= -Wall -Wno-unknown-pragmas \ - -Wshadow -Wmissing-prototypes -Wstrict-prototypes --COPTOPT= -O - COPTDYN= -fpic - COPTGPROF= -pg - C++OPTS= - C++WOPTS= $(CWOPTS) --C++OPTOPT= $(COPTOPT) - C++OPTDYN= -fpic - C++OPTGPROF= -pg - -@@ -56,28 +55,18 @@ - - FLOAT_OPTIONS= - --__CC_COM= $(_UNIQ)$(CC) --___CC_COM= $(__CC_COM:$(_UNIQ)=$(CC_COM_DEF)) --CC_COM= $(___CC_COM:$(_UNIQ)%=%) -- --__CC++_COM= $(_UNIQ)$(CCC) --___CC++_COM= $(__CC++_COM:$(_UNIQ)=$(CC++_COM_DEF)) --CC++_COM= $(___CC++_COM:$(_UNIQ)%=%) -- --CC_COM_DEF= gcc --CC++_COM_DEF= g++ --CC= $(CC_COM_DEF) --CCC= $(CC++_COM_DEF) -- --CCCC= @echo " ==> COMPILING \"$@\""; $(CC_COM) --CC++ = @echo " ==> COMPILING \"$@\""; $(CC++_COM) --LDCC= @echo " ==> LINKING \"$@\""; $(CC_COM) --LDCC++ = @echo " ==> LINKING \"$@\""; $(CC++_COM) --DYNLD= @echo " ==> LINKING dynamic library \"$@\""; $(CC_COM) --DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; $(CC++_COM) -+CC_COM= $(CC) -+CC++_COM= $(CXX) -+ -+CCCC = $(CC_COM) -+CC++ = $(CC++_COM) -+LDCC= $(CC_COM) -+LDCC++ = $(CC++_COM) -+DYNLD= $(CC_COM) -+DYNLDC++ = $(CC++_COM) - - RMDEP= : --MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC_COM) -M -+MKDEP= $(CC_COM) -M - MKDEP_OUT= --MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC++_COM) -M -+MKC++DEP= $(CC++_COM) -M - MKC++DEP_OUT= Property changes on: head/sysutils/cdrtools-devel/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1 =================================================================== --- head/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1 (revision 363334) +++ head/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1 (nonexistent) @@ -1,10 +0,0 @@ ---- btcflash/btcflash.1.orig Wed Feb 8 23:13:24 2006 -+++ btcflash/btcflash.1 Thu Feb 16 14:54:32 2006 -@@ -293,7 +293,6 @@ - login shell. - .SH "SEE ALSO" - .BR cdrecord (1), --.BR scg (7), - .BR rcmd (3), - .BR ssh (1). - .SH NOTES Property changes on: head/sysutils/cdrtools-devel/files/patch-btcflash::btcflash.1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1 =================================================================== --- head/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1 (revision 363334) +++ head/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1 (nonexistent) @@ -1,29 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- scgcheck/scgcheck.1.orig Mon Sep 29 14:56:16 2003 -+++ scgcheck/scgcheck.1 Mon Sep 29 14:56:44 2003 -@@ -234,8 +234,7 @@ - .SH SEE ALSO - .BR cdrecord (1), - .BR readcd (1), --.BR mkisofs (1), --.BR scg (7). -+.BR mkisofs (8). - - .SH NOTES - .PP Property changes on: head/sysutils/cdrtools-devel/files/patch-scgcheck::scgcheck.1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-cdrecord::README.rscsi =================================================================== --- head/sysutils/cdrtools-devel/files/patch-cdrecord::README.rscsi (revision 363334) +++ head/sysutils/cdrtools-devel/files/patch-cdrecord::README.rscsi (nonexistent) @@ -1,36 +0,0 @@ ---- cdrecord/README.rscsi.orig Sun Aug 17 11:31:39 2003 -+++ cdrecord/README.rscsi Sun Aug 17 14:38:57 2003 -@@ -18,24 +18,21 @@ - NOTE: In this case, rscsi must be installed suid root. - **** This is the preferred method **** - --To enable remote SCSI via the login shell method you should do the following: -- -- - Add an entry to /etc/passwd in the form: -+ The FreeBSD port automatically installs the rscsi binary suid -+ root and creates the user "rscsi". - -- rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi -- -- (modify this according to your OS). And don't forget to -- modify /etc/shadow the way it needs to be on your OS. -+To enable remote SCSI via the login shell method you should do the following: - -- - Create a home directory for this user and add a .rhosts file -- to allow access to all users you like. -+ - Make sure that there is an entry for rshd(8) in /etc/inetd.conf -+ and inetd(8) is running. - -- - Install rscsi suid root into /opt/schily/sbin -+ - Edit /usr/local/rscsi/.rhosts to allow access to all users you -+ like. - -- - Install a file /etc/default/rscsi and define access rights. -+ - Edit /usr/local/etc/rscsi and define access rights. - Without this file, rscsi will not work at all. - -- The template for this file is: rscsi/rscsi.dfl -+ The template for this file is: /usr/local/etc/rscsi.sample - - RSCSI Security: - Property changes on: head/sysutils/cdrtools-devel/files/patch-cdrecord::README.rscsi ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-mkisofs::mkisofs.8 =================================================================== --- head/sysutils/cdrtools-devel/files/patch-mkisofs::mkisofs.8 (revision 363334) +++ head/sysutils/cdrtools-devel/files/patch-mkisofs::mkisofs.8 (nonexistent) @@ -1,20 +0,0 @@ ---- mkisofs/mkisofs.8.orig Mon Sep 29 15:11:48 2003 -+++ mkisofs/mkisofs.8 Mon Sep 29 15:19:01 2003 -@@ -1668,7 +1668,7 @@ - The format of the - .I magic - file is almost identical to the --.BR magic (4) -+.BR magic (5) - file used by the Linux - .BR file (1) - command - the routines for reading and decoding the -@@ -1707,7 +1707,7 @@ - .TE - .PP - The format of the file is described in the --.BR magic (4) -+.BR magic (5) - man page. The only difference here is that for each entry in the magic file, the - .I message - for the initial offset Property changes on: head/sysutils/cdrtools-devel/files/patch-mkisofs::mkisofs.8 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h =================================================================== --- head/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h (revision 363334) +++ head/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h (nonexistent) @@ -1,15 +0,0 @@ ---- include/schily/sha2.h.orig 2010-08-27 12:41:30.000000000 +0200 -+++ include/schily/sha2.h 2012-10-20 14:39:42.000000000 +0200 -@@ -104,10 +104,12 @@ - - #ifdef HAVE_LONGLONG - extern void SHA384Init __PR((SHA2_CTX *)); -+#ifndef HAVE_PRAGMA_WEAK - extern void SHA384Transform __PR((UInt64_t state[8], - const UInt8_t [SHA384_BLOCK_LENGTH])); - extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t)); - extern void SHA384Pad __PR((SHA2_CTX *)); -+#endif - extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], - SHA2_CTX *)); - extern char *SHA384End __PR((SHA2_CTX *, char *)); Property changes on: head/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1 =================================================================== --- head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1 (revision 363334) +++ head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1 (nonexistent) @@ -1,28 +0,0 @@ -########################################################################### -# This patch was contributed by Marius Strobl. -########################################################################### -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# See the file CDDL.Schily.txt in this distribution for details. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file CDDL.Schily.txt from this distribution. -########################################################################### -# The file CDDL.Schily.txt can be found in the original cdrtools tarball, -# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. -########################################################################### - ---- cdrecord/cdrecord.1.orig Mon Sep 29 14:48:48 2003 -+++ cdrecord/cdrecord.1 Mon Sep 29 14:49:23 2003 -@@ -1738,8 +1738,6 @@ - .SH SEE ALSO - .BR cdda2wav (1), - .BR readcd (1), --.BR scg (7), --.BR fbk (7), - .BR mkisofs (8), - .BR rcmd (3), - .BR ssh (1). Property changes on: head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl =================================================================== --- head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl (revision 363334) +++ head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl (nonexistent) @@ -1,64 +0,0 @@ ---- cdrecord/cdrecord.dfl.orig Mon Aug 18 19:45:45 2003 -+++ cdrecord/cdrecord.dfl Mon Aug 18 19:46:32 2003 -@@ -3,7 +3,7 @@ - # This file is /etc/default/cdrecord - # It contains defaults that are used if no command line option - # or environment is present. --# -+# - # The default device, if not specified elswhere - # Note that since Sommer 2006, cdrecord by default searches for a - # single CD-ROM device. You should set CDR_DEVICE= together with -@@ -11,15 +11,14 @@ - # one CR-ROM drive in your system. - # - #CDR_DEVICE=yamaha --#CDR_DEVICE=default - --# -+# - # The default speed (speed=), if not specified elswhere - # - # Note that newer cdrecord versions do not default - # to speed=1. For MMC compliant drives, the default - # is to write at maximum speed, so it in general does --# not make sense to set up a default speed in /etc/default/cdrecord -+# not make sense to set up a default speed in /etc/default/cdrecord - # - #CDR_SPEED=40 - -@@ -34,7 +33,7 @@ - # Linux and Solaris have problems with bigger transfer sizes. - # If you are on FreeBSD, it is recommened to set CDR_TRANSFERSIZE=126k - # --#CDR_TRANSFERSIZE=32k -+CDR_TRANSFERSIZE=126k - - # - # The following definitions allow abstract device names. -@@ -56,14 +55,14 @@ - # - # drive name device speed fifosize driveropts transfersize - # --my-default= 1,0,0 -1 -1 burnfree 63k --sol-default= USCSI:1,0,0 -1 -1 burnfree --ricoh-u= USCSI:0,2,0 -1 -1 burnfree --teac= 1,3,0 -1 -1 "" --teac-max-ts= 1,3,0 -1 -1 "" 32k --panasonic= 1,4,0 -1 -1 "" --plextor= 1,4,0 -1 -1 "" --sanyo= 1,4,0 -1 -1 burnfree --yamaha= 1,5,0 -1 -1 "" --cdrom= 0,6,0 2 1m "" --remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree -+#my-default= 1,0,0 -1 -1 burnfree 63k -+#sol-default= USCSI:1,0,0 -1 -1 burnfree -+#ricoh-u= USCSI:0,2,0 -1 -1 burnfree -+#teac= 1,3,0 -1 -1 "" -+#teac-max-ts= 1,3,0 -1 -1 "" 32k -+#panasonic= 1,4,0 -1 -1 "" -+#plextor= 1,4,0 -1 -1 "" -+#sanyo= 1,4,0 -1 -1 burnfree -+#yamaha= 1,5,0 -1 -1 "" -+#cdrom= 0,6,0 2 1m "" -+#remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree Property changes on: head/sysutils/cdrtools-devel/files/patch-cdrecord::cdrecord.dfl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd =================================================================== --- head/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd (nonexistent) +++ head/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd (revision 363335) @@ -0,0 +1,30 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- DEFAULTS/Defaults.freebsd.orig 2013-11-04 21:58:20.000000000 +0100 ++++ DEFAULTS/Defaults.freebsd 2014-02-03 01:16:19.000000000 +0100 +@@ -29,8 +29,8 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-DEFOSINCDIRS= /usr/local/include +-LDPATH= -L/opt/schily/lib -L/usr/local/lib ++#DEFOSINCDIRS= /usr/local/include ++#LDPATH= -L/opt/schily/lib -L/usr/local/lib + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) Will probably not work + + ########################################################################### Property changes on: head/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul =================================================================== --- head/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul (nonexistent) +++ head/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul (revision 363335) @@ -0,0 +1,84 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- RULES/cc-gcc.rul.orig Thu Jul 6 12:59:44 2006 ++++ RULES/cc-gcc.rul Sat Jul 22 03:55:52 2006 +@@ -22,8 +22,9 @@ + ########################################################################### + + CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) $(OSINCDIRS:%=-I%) $(OSDEFS) $(OSDEFSX) +-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) +-C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX) ++XCFLAGS:= $(CFLAGS) ++CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX) ++C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(CXXFLAGS) $(G++OPTOPT) $(C++OPTX) + + CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) + COPTS= +@@ -31,12 +32,10 @@ + CWOPTS= -Wall -Wtraditional + CWOPTS= -Wall -Wno-unknown-pragmas \ + -Wshadow -Wmissing-prototypes -Wstrict-prototypes +-COPTOPT= -O + COPTDYN= -fpic + COPTGPROF= -pg + C++OPTS= + C++WOPTS= $(CWOPTS) +-C++OPTOPT= $(COPTOPT) + C++OPTDYN= -fpic + C++OPTGPROF= -pg + +@@ -56,28 +55,18 @@ + + FLOAT_OPTIONS= + +-__CC_COM= $(_UNIQ)$(CC) +-___CC_COM= $(__CC_COM:$(_UNIQ)=$(CC_COM_DEF)) +-CC_COM= $(___CC_COM:$(_UNIQ)%=%) +- +-__CC++_COM= $(_UNIQ)$(CCC) +-___CC++_COM= $(__CC++_COM:$(_UNIQ)=$(CC++_COM_DEF)) +-CC++_COM= $(___CC++_COM:$(_UNIQ)%=%) +- +-CC_COM_DEF= gcc +-CC++_COM_DEF= g++ +-CC= $(CC_COM_DEF) +-CCC= $(CC++_COM_DEF) +- +-CCCC= @echo " ==> COMPILING \"$@\""; $(CC_COM) +-CC++ = @echo " ==> COMPILING \"$@\""; $(CC++_COM) +-LDCC= @echo " ==> LINKING \"$@\""; $(CC_COM) +-LDCC++ = @echo " ==> LINKING \"$@\""; $(CC++_COM) +-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; $(CC_COM) +-DYNLDC++ = @echo " ==> LINKING dynamic library \"$@\""; $(CC++_COM) ++CC_COM= $(CC) ++CC++_COM= $(CXX) ++ ++CCCC = $(CC_COM) ++CC++ = $(CC++_COM) ++LDCC= $(CC_COM) ++LDCC++ = $(CC++_COM) ++DYNLD= $(CC_COM) ++DYNLDC++ = $(CC++_COM) + + RMDEP= : +-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC_COM) -M ++MKDEP= $(CC_COM) -M + MKDEP_OUT= +-MKC++DEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC++_COM) -M ++MKC++DEP= $(CC++_COM) -M + MKC++DEP_OUT= Property changes on: head/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1 =================================================================== --- head/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1 (nonexistent) +++ head/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1 (revision 363335) @@ -0,0 +1,10 @@ +--- btcflash/btcflash.1.orig Wed Feb 8 23:13:24 2006 ++++ btcflash/btcflash.1 Thu Feb 16 14:54:32 2006 +@@ -293,7 +293,6 @@ + login shell. + .SH "SEE ALSO" + .BR cdrecord (1), +-.BR scg (7), + .BR rcmd (3), + .BR ssh (1). + .SH NOTES Property changes on: head/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi =================================================================== --- head/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi (nonexistent) +++ head/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi (revision 363335) @@ -0,0 +1,36 @@ +--- cdrecord/README.rscsi.orig Sun Aug 17 11:31:39 2003 ++++ cdrecord/README.rscsi Sun Aug 17 14:38:57 2003 +@@ -18,24 +18,21 @@ + NOTE: In this case, rscsi must be installed suid root. + **** This is the preferred method **** + +-To enable remote SCSI via the login shell method you should do the following: +- +- - Add an entry to /etc/passwd in the form: ++ The FreeBSD port automatically installs the rscsi binary suid ++ root and creates the user "rscsi". + +- rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi +- +- (modify this according to your OS). And don't forget to +- modify /etc/shadow the way it needs to be on your OS. ++To enable remote SCSI via the login shell method you should do the following: + +- - Create a home directory for this user and add a .rhosts file +- to allow access to all users you like. ++ - Make sure that there is an entry for rshd(8) in /etc/inetd.conf ++ and inetd(8) is running. + +- - Install rscsi suid root into /opt/schily/sbin ++ - Edit /usr/local/rscsi/.rhosts to allow access to all users you ++ like. + +- - Install a file /etc/default/rscsi and define access rights. ++ - Edit /usr/local/etc/rscsi and define access rights. + Without this file, rscsi will not work at all. + +- The template for this file is: rscsi/rscsi.dfl ++ The template for this file is: /usr/local/etc/rscsi.sample + + RSCSI Security: + Property changes on: head/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1 =================================================================== --- head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1 (nonexistent) +++ head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1 (revision 363335) @@ -0,0 +1,28 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- cdrecord/cdrecord.1.orig Mon Sep 29 14:48:48 2003 ++++ cdrecord/cdrecord.1 Mon Sep 29 14:49:23 2003 +@@ -1738,8 +1738,6 @@ + .SH SEE ALSO + .BR cdda2wav (1), + .BR readcd (1), +-.BR scg (7), +-.BR fbk (7), + .BR mkisofs (8), + .BR rcmd (3), + .BR ssh (1). Property changes on: head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl =================================================================== --- head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl (nonexistent) +++ head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl (revision 363335) @@ -0,0 +1,64 @@ +--- cdrecord/cdrecord.dfl.orig Mon Aug 18 19:45:45 2003 ++++ cdrecord/cdrecord.dfl Mon Aug 18 19:46:32 2003 +@@ -3,7 +3,7 @@ + # This file is /etc/default/cdrecord + # It contains defaults that are used if no command line option + # or environment is present. +-# ++# + # The default device, if not specified elswhere + # Note that since Sommer 2006, cdrecord by default searches for a + # single CD-ROM device. You should set CDR_DEVICE= together with +@@ -11,15 +11,14 @@ + # one CR-ROM drive in your system. + # + #CDR_DEVICE=yamaha +-#CDR_DEVICE=default + +-# ++# + # The default speed (speed=), if not specified elswhere + # + # Note that newer cdrecord versions do not default + # to speed=1. For MMC compliant drives, the default + # is to write at maximum speed, so it in general does +-# not make sense to set up a default speed in /etc/default/cdrecord ++# not make sense to set up a default speed in /etc/default/cdrecord + # + #CDR_SPEED=40 + +@@ -34,7 +33,7 @@ + # Linux and Solaris have problems with bigger transfer sizes. + # If you are on FreeBSD, it is recommened to set CDR_TRANSFERSIZE=126k + # +-#CDR_TRANSFERSIZE=32k ++CDR_TRANSFERSIZE=126k + + # + # The following definitions allow abstract device names. +@@ -56,14 +55,14 @@ + # + # drive name device speed fifosize driveropts transfersize + # +-my-default= 1,0,0 -1 -1 burnfree 63k +-sol-default= USCSI:1,0,0 -1 -1 burnfree +-ricoh-u= USCSI:0,2,0 -1 -1 burnfree +-teac= 1,3,0 -1 -1 "" +-teac-max-ts= 1,3,0 -1 -1 "" 32k +-panasonic= 1,4,0 -1 -1 "" +-plextor= 1,4,0 -1 -1 "" +-sanyo= 1,4,0 -1 -1 burnfree +-yamaha= 1,5,0 -1 -1 "" +-cdrom= 0,6,0 2 1m "" +-remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree ++#my-default= 1,0,0 -1 -1 burnfree 63k ++#sol-default= USCSI:1,0,0 -1 -1 burnfree ++#ricoh-u= USCSI:0,2,0 -1 -1 burnfree ++#teac= 1,3,0 -1 -1 "" ++#teac-max-ts= 1,3,0 -1 -1 "" 32k ++#panasonic= 1,4,0 -1 -1 "" ++#plextor= 1,4,0 -1 -1 "" ++#sanyo= 1,4,0 -1 -1 burnfree ++#yamaha= 1,5,0 -1 -1 "" ++#cdrom= 0,6,0 2 1m "" ++#remote= REMOTE:rscsi@somehost:1,0,0 16 16m burnfree Property changes on: head/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h =================================================================== --- head/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h (nonexistent) +++ head/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h (revision 363335) @@ -0,0 +1,15 @@ +--- include/schily/sha2.h.orig 2010-08-27 12:41:30.000000000 +0200 ++++ include/schily/sha2.h 2012-10-20 14:39:42.000000000 +0200 +@@ -104,10 +104,12 @@ + + #ifdef HAVE_LONGLONG + extern void SHA384Init __PR((SHA2_CTX *)); ++#ifndef HAVE_PRAGMA_WEAK + extern void SHA384Transform __PR((UInt64_t state[8], + const UInt8_t [SHA384_BLOCK_LENGTH])); + extern void SHA384Update __PR((SHA2_CTX *, const UInt8_t *, size_t)); + extern void SHA384Pad __PR((SHA2_CTX *)); ++#endif + extern void SHA384Final __PR((UInt8_t [SHA384_DIGEST_LENGTH], + SHA2_CTX *)); + extern char *SHA384End __PR((SHA2_CTX *, char *)); Property changes on: head/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8 =================================================================== --- head/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8 (nonexistent) +++ head/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8 (revision 363335) @@ -0,0 +1,20 @@ +--- mkisofs/mkisofs.8.orig Mon Sep 29 15:11:48 2003 ++++ mkisofs/mkisofs.8 Mon Sep 29 15:19:01 2003 +@@ -1668,7 +1668,7 @@ + The format of the + .I magic + file is almost identical to the +-.BR magic (4) ++.BR magic (5) + file used by the Linux + .BR file (1) + command - the routines for reading and decoding the +@@ -1707,7 +1707,7 @@ + .TE + .PP + The format of the file is described in the +-.BR magic (4) ++.BR magic (5) + man page. The only difference here is that for each entry in the magic file, the + .I message + for the initial offset Property changes on: head/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-readcd__readcd.1 =================================================================== --- head/sysutils/cdrtools-devel/files/patch-readcd__readcd.1 (nonexistent) +++ head/sysutils/cdrtools-devel/files/patch-readcd__readcd.1 (revision 363335) @@ -0,0 +1,30 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- readcd/readcd.1.orig Mon Sep 29 14:53:05 2003 ++++ readcd/readcd.1 Mon Sep 29 15:10:06 2003 +@@ -432,9 +432,7 @@ + .SH FILES + .SH SEE ALSO + .BR cdrecord (1), +-.BR mkisofs (1), +-.BR scg (7), +-.BR fbk (7), ++.BR mkisofs (8), + .BR rcmd (3), + .BR ssh (1). + Property changes on: head/sysutils/cdrtools-devel/files/patch-readcd__readcd.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl =================================================================== --- head/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl (nonexistent) +++ head/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl (revision 363335) @@ -0,0 +1,19 @@ +--- rscsi/rscsi.dfl.orig Sun Aug 17 11:50:57 2003 ++++ rscsi/rscsi.dfl Sun Aug 17 12:28:46 2003 +@@ -18,14 +18,13 @@ + # Each USER= entry adds the listed user to the users who may run rscsi + # + # A typical passwd entry looks like this: +-# rscsi:x:1999:1000:Remote SCSI:/export/home/rscsi:/opt/schily/sbin/rscsi ++# rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/opt/schily/sbin/rscsi + # +-# Add entries for all valid remote users to /export/home/rscsi/.rhosts ++# Add entries for all valid remote users to /usr/local/rscsi/.rhosts + # + # USER= entries are checked with a pattern matcher. USER=* matches all users. + # + USER=rscsi +-#USER=joerg + + # + # Each ACCESS= entry adds a target or group of targets to the list of visible Property changes on: head/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1 =================================================================== --- head/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1 (nonexistent) +++ head/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1 (revision 363335) @@ -0,0 +1,29 @@ +########################################################################### +# This patch was contributed by Marius Strobl. +########################################################################### +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# See the file CDDL.Schily.txt in this distribution for details. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file CDDL.Schily.txt from this distribution. +########################################################################### +# The file CDDL.Schily.txt can be found in the original cdrtools tarball, +# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/. +########################################################################### + +--- scgcheck/scgcheck.1.orig Mon Sep 29 14:56:16 2003 ++++ scgcheck/scgcheck.1 Mon Sep 29 14:56:44 2003 +@@ -234,8 +234,7 @@ + .SH SEE ALSO + .BR cdrecord (1), + .BR readcd (1), +-.BR mkisofs (1), +-.BR scg (7). ++.BR mkisofs (8). + + .SH NOTES + .PP Property changes on: head/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/consolehm/files/patch-aa =================================================================== --- head/sysutils/consolehm/files/patch-aa (revision 363334) +++ head/sysutils/consolehm/files/patch-aa (nonexistent) @@ -1,11 +0,0 @@ ---- chm.h.orig Wed May 31 19:42:57 2000 -+++ chm.h Mon Aug 1 04:41:00 2005 -@@ -19,7 +19,7 @@ - #include - - #ifdef HAVE_SMBUS -- #include -+ #include - int SMBUS = 1; - #else - int SMBUS = 0; Property changes on: head/sysutils/consolehm/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/consolehm/files/patch-ab =================================================================== --- head/sysutils/consolehm/files/patch-ab (revision 363334) +++ head/sysutils/consolehm/files/patch-ab (nonexistent) @@ -1,11 +0,0 @@ ---- configure.orig Fri Dec 22 22:50:52 2000 -+++ configure Mon Aug 1 04:41:04 2005 -@@ -1096,7 +1096,7 @@ - fi - done - --for ac_hdr in machine/smb.h -+for ac_hdr in dev/smbus/smb.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 Property changes on: head/sysutils/consolehm/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/consolehm/files/patch-ac =================================================================== --- head/sysutils/consolehm/files/patch-ac (revision 363334) +++ head/sysutils/consolehm/files/patch-ac (nonexistent) @@ -1,11 +0,0 @@ ---- configure.in.orig Sat Oct 16 22:26:10 1999 -+++ configure.in Mon Aug 1 04:41:12 2005 -@@ -12,7 +12,7 @@ - dnl Checks for header files. - AC_HEADER_STDC - AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h stdlib.h stdio.h string.h) --AC_CHECK_HEADERS(machine/smb.h,[AC_DEFINE(HAVE_SMBUS)]) -+AC_CHECK_HEADERS(dev/smbus/smb.h,[AC_DEFINE(HAVE_SMBUS)]) - dnl Checks for typedefs, structures, and compiler characteristics. - - dnl Checks for library functions. Property changes on: head/sysutils/consolehm/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/consolehm/files/patch-chm.h =================================================================== --- head/sysutils/consolehm/files/patch-chm.h (nonexistent) +++ head/sysutils/consolehm/files/patch-chm.h (revision 363335) @@ -0,0 +1,11 @@ +--- chm.h.orig Wed May 31 19:42:57 2000 ++++ chm.h Mon Aug 1 04:41:00 2005 +@@ -19,7 +19,7 @@ + #include + + #ifdef HAVE_SMBUS +- #include ++ #include + int SMBUS = 1; + #else + int SMBUS = 0; Property changes on: head/sysutils/consolehm/files/patch-chm.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/consolehm/files/patch-configure =================================================================== --- head/sysutils/consolehm/files/patch-configure (nonexistent) +++ head/sysutils/consolehm/files/patch-configure (revision 363335) @@ -0,0 +1,11 @@ +--- configure.orig Fri Dec 22 22:50:52 2000 ++++ configure Mon Aug 1 04:41:04 2005 +@@ -1096,7 +1096,7 @@ + fi + done + +-for ac_hdr in machine/smb.h ++for ac_hdr in dev/smbus/smb.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 Property changes on: head/sysutils/consolehm/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/consolehm/files/patch-configure.in =================================================================== --- head/sysutils/consolehm/files/patch-configure.in (nonexistent) +++ head/sysutils/consolehm/files/patch-configure.in (revision 363335) @@ -0,0 +1,11 @@ +--- configure.in.orig Sat Oct 16 22:26:10 1999 ++++ configure.in Mon Aug 1 04:41:12 2005 +@@ -12,7 +12,7 @@ + dnl Checks for header files. + AC_HEADER_STDC + AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h stdlib.h stdio.h string.h) +-AC_CHECK_HEADERS(machine/smb.h,[AC_DEFINE(HAVE_SMBUS)]) ++AC_CHECK_HEADERS(dev/smbus/smb.h,[AC_DEFINE(HAVE_SMBUS)]) + dnl Checks for typedefs, structures, and compiler characteristics. + + dnl Checks for library functions. Property changes on: head/sysutils/consolehm/files/patch-configure.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/copytape/Makefile =================================================================== --- head/sysutils/copytape/Makefile (revision 363334) +++ head/sysutils/copytape/Makefile (revision 363335) @@ -1,37 +1,37 @@ # Created by: Stephen J. Roznowski # $FreeBSD$ PORTNAME= copytape PORTVERSION= 1.0 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_COMP_SOURCES} MASTER_SITE_SUBDIR= unix/volume10 DISTNAME= copytape -EXTRACT_SUFX= .Z MAINTAINER= sjroz@verizon.net COMMENT= Program that is used to duplicate magtapes EXTRACT_DEPENDS= gunshar:${PORTSDIR}/archivers/sharutils NO_WRKSUBDIR= yes EXTRACT_CMD= zcat EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= | gunshar -d ${WRKDIR} +USES= tar:Z CFLAGS+= -Wno-return-type # XXX upstream puts CFLAGS in CC MAKE_ARGS+= CC="${CC} ${CFLAGS}" -ALL_TARGET= copytape +ALL_TARGET= copytape PLIST_FILES= bin/copytape \ - man/man1/copytape.1.gz \ - man/man5/copytape.5.gz + man/man1/copytape.1.gz \ + man/man5/copytape.5.gz do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/copytape ${STAGEDIR}${PREFIX}/bin/copytape - @${INSTALL_MAN} ${WRKSRC}/copytape.1 ${STAGEDIR}${PREFIX}/man/man1/copytape.1 - @${INSTALL_MAN} ${WRKSRC}/copytape.5 ${STAGEDIR}${PREFIX}/man/man5/copytape.5 + ${INSTALL_PROGRAM} ${WRKSRC}/copytape ${STAGEDIR}${PREFIX}/bin/copytape + ${INSTALL_MAN} ${WRKSRC}/copytape.1 ${STAGEDIR}${PREFIX}/man/man1/copytape.1 + ${INSTALL_MAN} ${WRKSRC}/copytape.5 ${STAGEDIR}${PREFIX}/man/man5/copytape.5 .include Index: head/sysutils/copytape/files/patch-aa =================================================================== --- head/sysutils/copytape/files/patch-aa (revision 363334) +++ head/sysutils/copytape/files/patch-aa (nonexistent) @@ -1,20 +0,0 @@ ---- copytape.c.orig Fri Oct 23 17:23:06 1998 -+++ copytape.c Fri Oct 23 17:23:46 1998 -@@ -36,7 +36,7 @@ - - extern int errno; - --#define BUFLEN 262144 /* max tape block size */ -+#define BUFLEN (1024*1024) /* max tape block size */ - #define TAPE_MARK -100 /* return record length if we read a - * tape mark */ - #define END_OF_TAPE -101 /* 2 consecutive tape marks */ -@@ -149,7 +149,7 @@ - len = input(from); - } while (len > 0); - if (len == FORMAT_ERROR) { -- perror(stderr, "copytape: format error on skip"); -+ perror("copytape: format error on skip"); - exit(-1); - }; - if (len == END_OF_TAPE) { Property changes on: head/sysutils/copytape/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/copytape/files/patch-ab =================================================================== --- head/sysutils/copytape/files/patch-ab (revision 363334) +++ head/sysutils/copytape/files/patch-ab (nonexistent) @@ -1,11 +0,0 @@ ---- copytape.c.orig 2013-10-16 06:54:00.000000000 -0400 -+++ copytape.c 2013-10-16 06:54:13.000000000 -0400 -@@ -29,6 +29,8 @@ - - - #include -+#include -+#include - #include - #include - #include Property changes on: head/sysutils/copytape/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/copytape/files/patch-copytape.c_1 =================================================================== --- head/sysutils/copytape/files/patch-copytape.c_1 (nonexistent) +++ head/sysutils/copytape/files/patch-copytape.c_1 (revision 363335) @@ -0,0 +1,20 @@ +--- copytape.c.orig Fri Oct 23 17:23:06 1998 ++++ copytape.c Fri Oct 23 17:23:46 1998 +@@ -36,7 +36,7 @@ + + extern int errno; + +-#define BUFLEN 262144 /* max tape block size */ ++#define BUFLEN (1024*1024) /* max tape block size */ + #define TAPE_MARK -100 /* return record length if we read a + * tape mark */ + #define END_OF_TAPE -101 /* 2 consecutive tape marks */ +@@ -149,7 +149,7 @@ + len = input(from); + } while (len > 0); + if (len == FORMAT_ERROR) { +- perror(stderr, "copytape: format error on skip"); ++ perror("copytape: format error on skip"); + exit(-1); + }; + if (len == END_OF_TAPE) { Property changes on: head/sysutils/copytape/files/patch-copytape.c_1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/copytape/files/patch-copytape.c_2 =================================================================== --- head/sysutils/copytape/files/patch-copytape.c_2 (nonexistent) +++ head/sysutils/copytape/files/patch-copytape.c_2 (revision 363335) @@ -0,0 +1,11 @@ +--- copytape.c.orig 2013-10-16 06:54:00.000000000 -0400 ++++ copytape.c 2013-10-16 06:54:13.000000000 -0400 +@@ -29,6 +29,8 @@ + + + #include ++#include ++#include + #include + #include + #include Property changes on: head/sysutils/copytape/files/patch-copytape.c_2 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/detach/files/patch-aa =================================================================== --- head/sysutils/detach/files/patch-aa (revision 363334) +++ head/sysutils/detach/files/patch-aa (nonexistent) @@ -1,10 +0,0 @@ ---- Makefile.orig Fri Oct 8 08:22:20 1999 -+++ Makefile Thu Jan 20 09:12:48 2000 -@@ -1,5 +1,5 @@ --CC = gcc --CFLAGS = -+CC ?= gcc -+CFLAGS ?= -O2 - LIBS = - INSTALL = install - INSTALLPREFIX = /usr/local Property changes on: head/sysutils/detach/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/detach/files/patch-Makefile =================================================================== --- head/sysutils/detach/files/patch-Makefile (nonexistent) +++ head/sysutils/detach/files/patch-Makefile (revision 363335) @@ -0,0 +1,10 @@ +--- Makefile.orig Fri Oct 8 08:22:20 1999 ++++ Makefile Thu Jan 20 09:12:48 2000 +@@ -1,5 +1,5 @@ +-CC = gcc +-CFLAGS = ++CC ?= gcc ++CFLAGS ?= -O2 + LIBS = + INSTALL = install + INSTALLPREFIX = /usr/local Property changes on: head/sysutils/detach/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/fetchlog/files/patch-aa =================================================================== --- head/sysutils/fetchlog/files/patch-aa (revision 363334) +++ head/sysutils/fetchlog/files/patch-aa (nonexistent) @@ -1,22 +0,0 @@ ---- Makefile.orig 2010-06-21 11:35:08.000000000 +0200 -+++ Makefile 2010-06-21 19:10:33.000000000 +0200 -@@ -23,8 +23,8 @@ - ### compiler - - ### gcc --CC=gcc --CFLAGS= -O -Werror -Wall -Wcast-qual -Wstrict-prototypes \ -+CC?=cc -+CFLAGS+= -O -Werror -Wall -Wcast-qual -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations -Winline -Wcast-align - ### cc - #CC=cc -@@ -57,7 +57,7 @@ - ### installdir - ### will use $INSTDIR/bin and $INSTDIR/man/man1, - ### both dirs have to exist for installation --INSTDIR=/usr/local -+INSTDIR=${PREFIX} - - ### ------------------------------------------------------------------------ - ### --- end of user settings ----------------------------------------------- Property changes on: head/sysutils/fetchlog/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/fetchlog/files/patch-Makefile =================================================================== --- head/sysutils/fetchlog/files/patch-Makefile (nonexistent) +++ head/sysutils/fetchlog/files/patch-Makefile (revision 363335) @@ -0,0 +1,22 @@ +--- Makefile.orig 2010-06-21 11:35:08.000000000 +0200 ++++ Makefile 2010-06-21 19:10:33.000000000 +0200 +@@ -23,8 +23,8 @@ + ### compiler + + ### gcc +-CC=gcc +-CFLAGS= -O -Werror -Wall -Wcast-qual -Wstrict-prototypes \ ++CC?=cc ++CFLAGS+= -O -Werror -Wall -Wcast-qual -Wstrict-prototypes \ + -Wmissing-prototypes -Wmissing-declarations -Winline -Wcast-align + ### cc + #CC=cc +@@ -57,7 +57,7 @@ + ### installdir + ### will use $INSTDIR/bin and $INSTDIR/man/man1, + ### both dirs have to exist for installation +-INSTDIR=/usr/local ++INSTDIR=${PREFIX} + + ### ------------------------------------------------------------------------ + ### --- end of user settings ----------------------------------------------- Property changes on: head/sysutils/fetchlog/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/fortunelock/Makefile =================================================================== --- head/sysutils/fortunelock/Makefile (revision 363334) +++ head/sysutils/fortunelock/Makefile (revision 363335) @@ -1,17 +1,17 @@ # Created by: Daniel Harris # $FreeBSD$ PORTNAME= fortunelock PORTVERSION= 0.1.2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= dannyboy MAINTAINER= ports@FreeBSD.org COMMENT= Locks a terminal while showing fortunes -USE_BZIP2= yes +USES= tar:bzip2 PLIST_FILES= bin/fortunelock man/man1/${PORTNAME}.1.gz .include Index: head/sysutils/fortunelock/files/patch-aa =================================================================== --- head/sysutils/fortunelock/files/patch-aa (revision 363334) +++ head/sysutils/fortunelock/files/patch-aa (nonexistent) @@ -1,28 +0,0 @@ ---- Makefile.orig 2000-04-21 05:15:07.000000000 +0800 -+++ Makefile 2013-11-09 19:38:12.000000000 +0800 -@@ -1,10 +1,10 @@ --CC=gcc --CFLAGS=-O3 -+CC?=gcc -+CFLAGS?=-O3 - #CFLAGS=-O3 -Wall -Wtraditional -Wstrict-prototypes -Wmissing-prototypes -pedantic -ansi - #CFLAGS=-g -Wall -Wtraditional -Wstrict-prototypes -Wmissing-prototypes -pedantic -ansi - TARGET=fortunelock - LIBS=-lncurses --PREFIXDIR=/usr/local -+PREFIX?=/usr/local - - all: $(TARGET) - -@@ -19,8 +19,8 @@ fortunelock.o: fortunelock.c fortunelock - - install: - strip fortunelock -- install -m 755 fortunelock $(PREFIXDIR)/bin -- install -m 644 fortunelock.1 $(PREFIXDIR)/man/man1 -+ install -c -m 755 fortunelock $(DESTDIR)$(PREFIX)/bin -+ install -c -m 644 fortunelock.1 $(DESTDIR)$(PREFIX)/man/man1 - - uninstall: -- rm -rf $(PREFIXDIR)/bin/fortunelock -+ rm -rf $(PREFIX)/bin/fortunelock Property changes on: head/sysutils/fortunelock/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/fortunelock/files/patch-Makefile =================================================================== --- head/sysutils/fortunelock/files/patch-Makefile (nonexistent) +++ head/sysutils/fortunelock/files/patch-Makefile (revision 363335) @@ -0,0 +1,28 @@ +--- Makefile.orig 2000-04-21 05:15:07.000000000 +0800 ++++ Makefile 2013-11-09 19:38:12.000000000 +0800 +@@ -1,10 +1,10 @@ +-CC=gcc +-CFLAGS=-O3 ++CC?=gcc ++CFLAGS?=-O3 + #CFLAGS=-O3 -Wall -Wtraditional -Wstrict-prototypes -Wmissing-prototypes -pedantic -ansi + #CFLAGS=-g -Wall -Wtraditional -Wstrict-prototypes -Wmissing-prototypes -pedantic -ansi + TARGET=fortunelock + LIBS=-lncurses +-PREFIXDIR=/usr/local ++PREFIX?=/usr/local + + all: $(TARGET) + +@@ -19,8 +19,8 @@ fortunelock.o: fortunelock.c fortunelock + + install: + strip fortunelock +- install -m 755 fortunelock $(PREFIXDIR)/bin +- install -m 644 fortunelock.1 $(PREFIXDIR)/man/man1 ++ install -c -m 755 fortunelock $(DESTDIR)$(PREFIX)/bin ++ install -c -m 644 fortunelock.1 $(DESTDIR)$(PREFIX)/man/man1 + + uninstall: +- rm -rf $(PREFIXDIR)/bin/fortunelock ++ rm -rf $(PREFIX)/bin/fortunelock Property changes on: head/sysutils/fortunelock/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/gkrellm2/files/patch-af =================================================================== --- head/sysutils/gkrellm2/files/patch-af (revision 363334) +++ head/sysutils/gkrellm2/files/patch-af (nonexistent) @@ -1,85 +0,0 @@ -Index: gkrellm.1 -diff -u gkrellm.1.orig gkrellm.1 ---- gkrellm.1.orig Mon Oct 13 13:01:37 2003 -+++ gkrellm.1 Mon Oct 13 15:24:10 2003 -@@ -1,4 +1,4 @@ --.TH gkrellm 1 "June 7, 2003" "GNU/Linux" "User's Manual" -+.TH gkrellm 1 "June 7, 2003" "FreeBSD" "User's Manual" - - .SH "NAME" - gkrellm \- The GNU Krell Monitors -@@ -416,7 +416,7 @@ - ppp is connecting, and the on state is the ppp link connected. - The phone line lock is determined by the existence of the modem - lock file --.IR /var/lock/LCK..modem, -+.IR /var/spool/lock/LCK..modem, - which assumes pppd is using - .IR /dev/modem. - However, if your pppd setup does not use -@@ -425,11 +425,11 @@ - .PP - .RS - .nf --ln -s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem -+ln -s /var/spool/lock/LCK..cuaaS ~/.gkrellm2/LCK..modem - .fi - .RE - .IP --where ttySx is the tty device your modem does use. The ppp on -+where cuaaS is the tty device your modem does use. The ppp on - state is detected by the existence of - .IR /var/run/pppX.pid - and the time stamp of this file is the base for the on line time. -@@ -1007,7 +1007,7 @@ - .nf - ~/.gkrellm2/themes - /usr/local/share/gkrellm2/themes --/usr/share/gkrellm2/themes -+/usr/X11R6/share/gkrellm2/themes - .fi - .RE - .PP -@@ -1018,7 +1018,7 @@ - .RS - .nf - ~/.themes/THEME_NAME/gkrellm2 --/usr/share/themes/THEME_NAME/gkrellm2 -+/usr/X11R6/share/themes/THEME_NAME/gkrellm2 - .fi - .RE - .PP -@@ -1046,7 +1046,7 @@ - The directories - .IR /usr/local/lib/gkrellm2/plugins - and --.IR /usr/lib/gkrellm2/plugins -+.IR /usr/X11R6/libexec/gkrellm2/plugins - are also searched for plugins to install. - .PP - Some plugins may be available only as source files and they will -@@ -1082,7 +1082,7 @@ - .I ~/.gkrellm2/plugins - User plugin directory. - .TP --.I /usr/lib/gkrellm2/plugins -+.I /usr/X11R6/libexec/gkrellm2/plugins - System wide plugin directory. - .TP - .I /usr/local/lib/gkrellm2/plugins -@@ -1094,13 +1094,13 @@ - .I ~/.themes/THEME_NAME/gkrellm2 - User theme packaged as part of a user Gtk theme. - .TP --.I /usr/share/gkrellm2/themes -+.I /usr/X11R6/share/gkrellm2/themes - System wide theme directory. - .TP - .I /usr/local/share/gkrellm2/themes - Local theme directory. - .TP --.I /usr/share/themes/THEME_NAME/gkrellm2 -+.I /usr/X11R6/share/themes/THEME_NAME/gkrellm2 - System wide theme packaged as part of a system wide Gtk theme. - - .SH "AUTHORS" Property changes on: head/sysutils/gkrellm2/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/gkrellm2/files/patch-src::sysdeps::bsd-common.c =================================================================== --- head/sysutils/gkrellm2/files/patch-src::sysdeps::bsd-common.c (revision 363334) +++ head/sysutils/gkrellm2/files/patch-src::sysdeps::bsd-common.c (nonexistent) @@ -1,15 +0,0 @@ -Index: src/sysdeps/bsd-common.c -diff -u -p src/sysdeps/bsd-common.c.orig src/sysdeps/bsd-common.c ---- src/sysdeps/bsd-common.c.orig 2010-09-15 01:27:35.000000000 +0900 -+++ src/sysdeps/bsd-common.c 2011-05-04 02:20:07.328745551 +0900 -@@ -64,6 +64,10 @@ gkrellm_sys_net_read_data(void) - { - if (ifa->ifa_addr->sa_family != AF_LINK) - continue; -+#ifdef IFF_CANTCONFIG -+ if ((ifa->ifa_flags & IFF_CANTCONFIG) != 0) -+ continue; -+#endif - ifd = (struct if_data *)ifa->ifa_data; - gkrellm_net_assign_data(ifa->ifa_name, - ifd->ifi_ibytes, ifd->ifi_obytes); Property changes on: head/sysutils/gkrellm2/files/patch-src::sysdeps::bsd-common.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/gkrellm2/files/patch-server::gkrellmd.h =================================================================== --- head/sysutils/gkrellm2/files/patch-server::gkrellmd.h (revision 363334) +++ head/sysutils/gkrellm2/files/patch-server::gkrellmd.h (nonexistent) @@ -1,17 +0,0 @@ -Index: server/gkrellmd.h -diff -u server/gkrellmd.h.orig server/gkrellmd.h ---- server/gkrellmd.h.orig 2008-10-04 06:52:48.000000000 +0900 -+++ server/gkrellmd.h 2008-10-04 19:55:03.000000000 +0900 -@@ -118,8 +118,12 @@ - #if !defined(GKRELLMD_SYSTEM_PLUGINS_DIR) - #define GKRELLMD_SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins-gkrellmd" - #endif -+ #if !defined(GKRELLMD_SYS_ETC) - #define GKRELLMD_SYS_ETC "/etc" -+ #endif -+ #if 0 - #define GKRELLMD_LOCAL_ETC "/usr/local/etc" -+ #endif - #endif // !defined(WIN32) - - Property changes on: head/sysutils/gkrellm2/files/patch-server::gkrellmd.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/gkrellm2/files/patch-src::configure =================================================================== --- head/sysutils/gkrellm2/files/patch-src::configure (revision 363334) +++ head/sysutils/gkrellm2/files/patch-src::configure (nonexistent) @@ -1,51 +0,0 @@ -Index: src/configure -diff -u src/configure.orig src/configure ---- src/configure.orig 2010-09-14 23:40:38.000000000 +0900 -+++ src/configure 2010-10-06 17:48:28.286565914 +0900 -@@ -46,8 +46,8 @@ - echo -n "Checking for OpenSSL... " - echo "Checking for OpenSSL... " 1>& 5 - --OPENSSL_INCLUDE="$(pkg-config openssl --cflags 2>& 5 || true)" --OPENSSL_LIBS="$(pkg-config openssl --libs 2>& 5 || true)" -+OPENSSL_INCLUDE="-I${OPENSSLINC}" -+OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" - if [ -z "$OPENSSL_LIBS" ] - then - echo "OpenSSL not found via pkg-config, using hardcoded library names" 1>& 5 -@@ -69,7 +69,7 @@ - } - EOF - --$CC ${CFLAGS} ${GTK_INCLUDE} ${OPENSSL_INCLUDE} -c test.c -o test.o 2>& 5 || true -+$CC ${GTK_INCLUDE} ${OPENSSL_INCLUDE} -c test.c -o test.o 2>& 5 || true - $CC test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${OPENSSL_LIBS} 2>& 5 || true - - if [ -x ./test ] && ./test -@@ -117,7 +117,7 @@ - } - EOF - --${CC} ${CFLAGS} ${GTK_INCLUDE} ${GNUTLS_INCLUDE} -c test.c -o test.o 2>& 5 || true -+${CC} ${GTK_INCLUDE} ${GNUTLS_INCLUDE} -c test.c -o test.o 2>& 5 || true - ${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${GNUTLS_LIBS} 2>& 5 || true - - if [ -x ./test ] && ./test -@@ -159,7 +159,7 @@ - } - EOF - --${CC} ${CFLAGS} ${GTK_INCLUDE} ${PKG_NTLM_INCLUDE} -c test.c -o test.o 2>& 5 || true -+${CC} ${GTK_INCLUDE} ${PKG_NTLM_INCLUDE} -c test.c -o test.o 2>& 5 || true - ${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${PKG_NTLM_LIBS} 2>& 5 || true - - if [ -x ./test ] && ./test -@@ -209,7 +209,7 @@ - } - EOF - --${CC} ${CFLAGS} ${GTK_INCLUDE} -c test.c -o test.o 2>& 5 || true -+${CC} ${GTK_INCLUDE} -c test.c -o test.o 2>& 5 || true - ${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} -lsensors 2>& 5 || true - - if [ -x ./test ] && ./test Property changes on: head/sysutils/gkrellm2/files/patch-src::configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/gkrellm2/files/patch-server::Makefile =================================================================== --- head/sysutils/gkrellm2/files/patch-server::Makefile (revision 363334) +++ head/sysutils/gkrellm2/files/patch-server::Makefile (nonexistent) @@ -1,122 +0,0 @@ -Index: server/Makefile -diff -u server/Makefile.orig server/Makefile ---- server/Makefile.orig 2010-10-03 01:21:01.000000000 +0900 -+++ server/Makefile 2014-06-18 01:15:19.903510437 +0900 -@@ -26,6 +26,7 @@ - MANMODE ?= 644 - MANDIRMODE ?= 755 - INSTALL ?= install -+PKGCONFIGDIR ?= $(INSTALLROOT)/lib/pkgconfig - LINK_FLAGS ?= -Wl,-E - EXTRAOBJS = - -@@ -57,18 +58,18 @@ - PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0` - PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0` - --GLIB12_INCLUDE = `glib-config --cflags` --GLIB12_LIB = `glib-config --libs glib gmodule` -+GLIB12_INCLUDE = `$(GLIB_CONFIG) --cflags` -+GLIB12_LIB = `$(GLIB_CONFIG) --libs glib gmodule` - --FLAGS = -O2 $(PKG_INCLUDE) -+FLAGS = $(PKG_INCLUDE) - - ifeq ($(glib12),1) -- FLAGS = -O2 $(GLIB12_INCLUDE) -+ FLAGS = $(GLIB12_INCLUDE) - endif - ifeq ($(glib12),yes) -- FLAGS = -O2 $(GLIB12_INCLUDE) -+ FLAGS = $(GLIB12_INCLUDE) - endif --FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGKRELLM_SERVER -+FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -I$(LOCALBASE)/include -DGKRELLM_SERVER - - LIBS = $(PKG_LIB) - ifeq ($(glib12),1) -@@ -115,20 +116,31 @@ - - all: gkrellmd - --gkrellmd: $(OBJS) $(EXTRAOBJS) -+gkrellmd: gkrellmd.pc $(OBJS) $(EXTRAOBJS) - $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd \ - $(LDFLAGS) $(LIBS) $(LINK_FLAGS) - --static: $(OBJS) $(EXTRAOBJS) -+static: gkrellmd.pc $(OBJS) $(EXTRAOBJS) - $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \ - $(LDFLAGS) $(LIBS) $(LINK_FLAGS) - -+gkrellmd.pc: Makefile -+ echo "prefix=$(INSTALLROOT)" > gkrellmd.pc -+ echo "Name: GKrellMd" >> gkrellmd.pc -+ echo "Description: Extensible GLIB system monitoring application server" >> gkrellmd.pc -+ echo "Version: $(VERSION)" >> gkrellmd.pc -+ echo "Requires: glib-2.0" >> gkrellmd.pc -+ echo "Cflags: -I$(INCLUDEDIR)" >> gkrellmd.pc -+ - freebsd2: - $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellmd - --freebsd3 freebsd: -+freebsd3 freebsd4: - $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellmd - -+freebsd5 freebsd6 freebsd7 freebsd8 freebsd: -+ $(MAKE) EXTRAOBJS= SYS_LIBS="-ldevstat -lmd" gkrellmd -+ - # Darwin target for systems that still have libkvm - darwin: - $(MAKE) STRIP= HAVE_GETADDRINFO=1 \ -@@ -176,27 +188,32 @@ - SYS_LIBS="-lws2_32 -lwtsapi32 -lpdh -lnetapi32 -liphlpapi -lintl" \ - gkrellmd - --install: install_bin install_inc install_man -+install: install_bin install_inc install_man install_gkrellmd.pc - - install_bin: -- $(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR) -- $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT) -+ $(INSTALL) -d -m $(INSTALLDIRMODE) $(DESTDIR)$(SINSTALLDIR) -+ $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT) - - install_inc: -- $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2 -- $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2 -+ $(INSTALL) -d -m $(INCLUDEDIRMODE) $(DESTDIR)$(INCLUDEDIR)/gkrellm2 -+ $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(DESTDIR)$(INCLUDEDIR)/gkrellm2 - - install_man: -- $(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR) -- $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1 -+ $(INSTALL) -d -m $(MANDIRMODE) $(DESTDIR)$(SMANDIR) -+ $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(DESTDIR)$(SMANDIR)/$(PACKAGE_D).8 - - install_cfg: -- $(INSTALL) -d -m $(CFGDIRMODE) $(CFGDIR) -- $(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(CFGDIR)/gkrellmd.conf -+ $(INSTALL) -d -m $(CFGDIRMODE) $(DESTDIR)$(CFGDIR) -+ $(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(DESTDIR)$(CFGDIR)/gkrellmd.conf -+ -+install_gkrellmd.pc: -+ $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR) -+ $(INSTALL) -c -m $(INCLUDEMODE) gkrellmd.pc $(DESTDIR)$(PKGCONFIGDIR) - - uninstall: - rm -f $(SINSTALLDIR)/$(PACKAGE_D) - rm -f $(SMANDIR)/$(PACKAGE_D).1 -+ rm -f $(PKGCONFIGDIR)/gkrellmd.pc - - install_darwin install_darwin9 install_macosx: - $(MAKE) install STRIP= -@@ -227,6 +244,7 @@ - clean: - $(RM) *.o *~ *.bak configure.h configure.log gkrellmd gkrellmd.exe \ - libgkrellmd.a core -+ $(RM) gkrellmd.pc - - SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \ - ../src/sysdeps/darwin.c \ Property changes on: head/sysutils/gkrellm2/files/patch-server::Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/gkrellm2/files/patch-gkrellm.1 =================================================================== --- head/sysutils/gkrellm2/files/patch-gkrellm.1 (nonexistent) +++ head/sysutils/gkrellm2/files/patch-gkrellm.1 (revision 363335) @@ -0,0 +1,85 @@ +Index: gkrellm.1 +diff -u gkrellm.1.orig gkrellm.1 +--- gkrellm.1.orig Mon Oct 13 13:01:37 2003 ++++ gkrellm.1 Mon Oct 13 15:24:10 2003 +@@ -1,4 +1,4 @@ +-.TH gkrellm 1 "June 7, 2003" "GNU/Linux" "User's Manual" ++.TH gkrellm 1 "June 7, 2003" "FreeBSD" "User's Manual" + + .SH "NAME" + gkrellm \- The GNU Krell Monitors +@@ -416,7 +416,7 @@ + ppp is connecting, and the on state is the ppp link connected. + The phone line lock is determined by the existence of the modem + lock file +-.IR /var/lock/LCK..modem, ++.IR /var/spool/lock/LCK..modem, + which assumes pppd is using + .IR /dev/modem. + However, if your pppd setup does not use +@@ -425,11 +425,11 @@ + .PP + .RS + .nf +-ln -s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem ++ln -s /var/spool/lock/LCK..cuaaS ~/.gkrellm2/LCK..modem + .fi + .RE + .IP +-where ttySx is the tty device your modem does use. The ppp on ++where cuaaS is the tty device your modem does use. The ppp on + state is detected by the existence of + .IR /var/run/pppX.pid + and the time stamp of this file is the base for the on line time. +@@ -1007,7 +1007,7 @@ + .nf + ~/.gkrellm2/themes + /usr/local/share/gkrellm2/themes +-/usr/share/gkrellm2/themes ++/usr/X11R6/share/gkrellm2/themes + .fi + .RE + .PP +@@ -1018,7 +1018,7 @@ + .RS + .nf + ~/.themes/THEME_NAME/gkrellm2 +-/usr/share/themes/THEME_NAME/gkrellm2 ++/usr/X11R6/share/themes/THEME_NAME/gkrellm2 + .fi + .RE + .PP +@@ -1046,7 +1046,7 @@ + The directories + .IR /usr/local/lib/gkrellm2/plugins + and +-.IR /usr/lib/gkrellm2/plugins ++.IR /usr/X11R6/libexec/gkrellm2/plugins + are also searched for plugins to install. + .PP + Some plugins may be available only as source files and they will +@@ -1082,7 +1082,7 @@ + .I ~/.gkrellm2/plugins + User plugin directory. + .TP +-.I /usr/lib/gkrellm2/plugins ++.I /usr/X11R6/libexec/gkrellm2/plugins + System wide plugin directory. + .TP + .I /usr/local/lib/gkrellm2/plugins +@@ -1094,13 +1094,13 @@ + .I ~/.themes/THEME_NAME/gkrellm2 + User theme packaged as part of a user Gtk theme. + .TP +-.I /usr/share/gkrellm2/themes ++.I /usr/X11R6/share/gkrellm2/themes + System wide theme directory. + .TP + .I /usr/local/share/gkrellm2/themes + Local theme directory. + .TP +-.I /usr/share/themes/THEME_NAME/gkrellm2 ++.I /usr/X11R6/share/themes/THEME_NAME/gkrellm2 + System wide theme packaged as part of a system wide Gtk theme. + + .SH "AUTHORS" Property changes on: head/sysutils/gkrellm2/files/patch-gkrellm.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/gkrellm2/files/patch-server__Makefile =================================================================== --- head/sysutils/gkrellm2/files/patch-server__Makefile (nonexistent) +++ head/sysutils/gkrellm2/files/patch-server__Makefile (revision 363335) @@ -0,0 +1,122 @@ +Index: server/Makefile +diff -u server/Makefile.orig server/Makefile +--- server/Makefile.orig 2010-10-03 01:21:01.000000000 +0900 ++++ server/Makefile 2014-06-18 01:15:19.903510437 +0900 +@@ -26,6 +26,7 @@ + MANMODE ?= 644 + MANDIRMODE ?= 755 + INSTALL ?= install ++PKGCONFIGDIR ?= $(INSTALLROOT)/lib/pkgconfig + LINK_FLAGS ?= -Wl,-E + EXTRAOBJS = + +@@ -57,18 +58,18 @@ + PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0` + PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0` + +-GLIB12_INCLUDE = `glib-config --cflags` +-GLIB12_LIB = `glib-config --libs glib gmodule` ++GLIB12_INCLUDE = `$(GLIB_CONFIG) --cflags` ++GLIB12_LIB = `$(GLIB_CONFIG) --libs glib gmodule` + +-FLAGS = -O2 $(PKG_INCLUDE) ++FLAGS = $(PKG_INCLUDE) + + ifeq ($(glib12),1) +- FLAGS = -O2 $(GLIB12_INCLUDE) ++ FLAGS = $(GLIB12_INCLUDE) + endif + ifeq ($(glib12),yes) +- FLAGS = -O2 $(GLIB12_INCLUDE) ++ FLAGS = $(GLIB12_INCLUDE) + endif +-FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGKRELLM_SERVER ++FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -I$(LOCALBASE)/include -DGKRELLM_SERVER + + LIBS = $(PKG_LIB) + ifeq ($(glib12),1) +@@ -115,20 +116,31 @@ + + all: gkrellmd + +-gkrellmd: $(OBJS) $(EXTRAOBJS) ++gkrellmd: gkrellmd.pc $(OBJS) $(EXTRAOBJS) + $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd \ + $(LDFLAGS) $(LIBS) $(LINK_FLAGS) + +-static: $(OBJS) $(EXTRAOBJS) ++static: gkrellmd.pc $(OBJS) $(EXTRAOBJS) + $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \ + $(LDFLAGS) $(LIBS) $(LINK_FLAGS) + ++gkrellmd.pc: Makefile ++ echo "prefix=$(INSTALLROOT)" > gkrellmd.pc ++ echo "Name: GKrellMd" >> gkrellmd.pc ++ echo "Description: Extensible GLIB system monitoring application server" >> gkrellmd.pc ++ echo "Version: $(VERSION)" >> gkrellmd.pc ++ echo "Requires: glib-2.0" >> gkrellmd.pc ++ echo "Cflags: -I$(INCLUDEDIR)" >> gkrellmd.pc ++ + freebsd2: + $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellmd + +-freebsd3 freebsd: ++freebsd3 freebsd4: + $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellmd + ++freebsd5 freebsd6 freebsd7 freebsd8 freebsd: ++ $(MAKE) EXTRAOBJS= SYS_LIBS="-ldevstat -lmd" gkrellmd ++ + # Darwin target for systems that still have libkvm + darwin: + $(MAKE) STRIP= HAVE_GETADDRINFO=1 \ +@@ -176,27 +188,32 @@ + SYS_LIBS="-lws2_32 -lwtsapi32 -lpdh -lnetapi32 -liphlpapi -lintl" \ + gkrellmd + +-install: install_bin install_inc install_man ++install: install_bin install_inc install_man install_gkrellmd.pc + + install_bin: +- $(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR) +- $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT) ++ $(INSTALL) -d -m $(INSTALLDIRMODE) $(DESTDIR)$(SINSTALLDIR) ++ $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT) + + install_inc: +- $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2 +- $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2 ++ $(INSTALL) -d -m $(INCLUDEDIRMODE) $(DESTDIR)$(INCLUDEDIR)/gkrellm2 ++ $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(DESTDIR)$(INCLUDEDIR)/gkrellm2 + + install_man: +- $(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR) +- $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1 ++ $(INSTALL) -d -m $(MANDIRMODE) $(DESTDIR)$(SMANDIR) ++ $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(DESTDIR)$(SMANDIR)/$(PACKAGE_D).8 + + install_cfg: +- $(INSTALL) -d -m $(CFGDIRMODE) $(CFGDIR) +- $(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(CFGDIR)/gkrellmd.conf ++ $(INSTALL) -d -m $(CFGDIRMODE) $(DESTDIR)$(CFGDIR) ++ $(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(DESTDIR)$(CFGDIR)/gkrellmd.conf ++ ++install_gkrellmd.pc: ++ $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR) ++ $(INSTALL) -c -m $(INCLUDEMODE) gkrellmd.pc $(DESTDIR)$(PKGCONFIGDIR) + + uninstall: + rm -f $(SINSTALLDIR)/$(PACKAGE_D) + rm -f $(SMANDIR)/$(PACKAGE_D).1 ++ rm -f $(PKGCONFIGDIR)/gkrellmd.pc + + install_darwin install_darwin9 install_macosx: + $(MAKE) install STRIP= +@@ -227,6 +244,7 @@ + clean: + $(RM) *.o *~ *.bak configure.h configure.log gkrellmd gkrellmd.exe \ + libgkrellmd.a core ++ $(RM) gkrellmd.pc + + SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \ + ../src/sysdeps/darwin.c \ Property changes on: head/sysutils/gkrellm2/files/patch-server__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/gkrellm2/files/patch-server__gkrellmd.h =================================================================== --- head/sysutils/gkrellm2/files/patch-server__gkrellmd.h (nonexistent) +++ head/sysutils/gkrellm2/files/patch-server__gkrellmd.h (revision 363335) @@ -0,0 +1,17 @@ +Index: server/gkrellmd.h +diff -u server/gkrellmd.h.orig server/gkrellmd.h +--- server/gkrellmd.h.orig 2008-10-04 06:52:48.000000000 +0900 ++++ server/gkrellmd.h 2008-10-04 19:55:03.000000000 +0900 +@@ -118,8 +118,12 @@ + #if !defined(GKRELLMD_SYSTEM_PLUGINS_DIR) + #define GKRELLMD_SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins-gkrellmd" + #endif ++ #if !defined(GKRELLMD_SYS_ETC) + #define GKRELLMD_SYS_ETC "/etc" ++ #endif ++ #if 0 + #define GKRELLMD_LOCAL_ETC "/usr/local/etc" ++ #endif + #endif // !defined(WIN32) + + Property changes on: head/sysutils/gkrellm2/files/patch-server__gkrellmd.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/gkrellm2/files/patch-src__configure =================================================================== --- head/sysutils/gkrellm2/files/patch-src__configure (nonexistent) +++ head/sysutils/gkrellm2/files/patch-src__configure (revision 363335) @@ -0,0 +1,51 @@ +Index: src/configure +diff -u src/configure.orig src/configure +--- src/configure.orig 2010-09-14 23:40:38.000000000 +0900 ++++ src/configure 2010-10-06 17:48:28.286565914 +0900 +@@ -46,8 +46,8 @@ + echo -n "Checking for OpenSSL... " + echo "Checking for OpenSSL... " 1>& 5 + +-OPENSSL_INCLUDE="$(pkg-config openssl --cflags 2>& 5 || true)" +-OPENSSL_LIBS="$(pkg-config openssl --libs 2>& 5 || true)" ++OPENSSL_INCLUDE="-I${OPENSSLINC}" ++OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" + if [ -z "$OPENSSL_LIBS" ] + then + echo "OpenSSL not found via pkg-config, using hardcoded library names" 1>& 5 +@@ -69,7 +69,7 @@ + } + EOF + +-$CC ${CFLAGS} ${GTK_INCLUDE} ${OPENSSL_INCLUDE} -c test.c -o test.o 2>& 5 || true ++$CC ${GTK_INCLUDE} ${OPENSSL_INCLUDE} -c test.c -o test.o 2>& 5 || true + $CC test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${OPENSSL_LIBS} 2>& 5 || true + + if [ -x ./test ] && ./test +@@ -117,7 +117,7 @@ + } + EOF + +-${CC} ${CFLAGS} ${GTK_INCLUDE} ${GNUTLS_INCLUDE} -c test.c -o test.o 2>& 5 || true ++${CC} ${GTK_INCLUDE} ${GNUTLS_INCLUDE} -c test.c -o test.o 2>& 5 || true + ${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${GNUTLS_LIBS} 2>& 5 || true + + if [ -x ./test ] && ./test +@@ -159,7 +159,7 @@ + } + EOF + +-${CC} ${CFLAGS} ${GTK_INCLUDE} ${PKG_NTLM_INCLUDE} -c test.c -o test.o 2>& 5 || true ++${CC} ${GTK_INCLUDE} ${PKG_NTLM_INCLUDE} -c test.c -o test.o 2>& 5 || true + ${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} ${PKG_NTLM_LIBS} 2>& 5 || true + + if [ -x ./test ] && ./test +@@ -209,7 +209,7 @@ + } + EOF + +-${CC} ${CFLAGS} ${GTK_INCLUDE} -c test.c -o test.o 2>& 5 || true ++${CC} ${GTK_INCLUDE} -c test.c -o test.o 2>& 5 || true + ${CC} test.o -o test ${LINK_FLAGS} ${GTK_LIBS} -lsensors 2>& 5 || true + + if [ -x ./test ] && ./test Property changes on: head/sysutils/gkrellm2/files/patch-src__configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c =================================================================== --- head/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c (nonexistent) +++ head/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c (revision 363335) @@ -0,0 +1,15 @@ +Index: src/sysdeps/bsd-common.c +diff -u -p src/sysdeps/bsd-common.c.orig src/sysdeps/bsd-common.c +--- src/sysdeps/bsd-common.c.orig 2010-09-15 01:27:35.000000000 +0900 ++++ src/sysdeps/bsd-common.c 2011-05-04 02:20:07.328745551 +0900 +@@ -64,6 +64,10 @@ gkrellm_sys_net_read_data(void) + { + if (ifa->ifa_addr->sa_family != AF_LINK) + continue; ++#ifdef IFF_CANTCONFIG ++ if ((ifa->ifa_flags & IFF_CANTCONFIG) != 0) ++ continue; ++#endif + ifd = (struct if_data *)ifa->ifa_data; + gkrellm_net_assign_data(ifa->ifa_name, + ifd->ifi_ibytes, ifd->ifi_obytes); Property changes on: head/sysutils/gkrellm2/files/patch-src__sysdeps__bsd-common.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/hfsutils/files/patch-ab =================================================================== --- head/sysutils/hfsutils/files/patch-ab (revision 363334) +++ head/sysutils/hfsutils/files/patch-ab (nonexistent) @@ -1,36 +0,0 @@ ---- Makefile.in.orig Tue Sep 1 02:40:14 1998 -+++ Makefile.in Wed Nov 4 17:32:21 1998 -@@ -64,7 +64,8 @@ - - CLITARGETS = hattrib hcd hcopy hdel hdir hformat hls hmkdir hmount hpwd \ - hrename hrmdir humount hvol --TCLTARGETS = hfssh hfs -+TCLTARGETS = hfssh -+TCLSCRIPTS = hfs - TKTARGETS = xhfs - - LIBHFS = libhfs/libhfs.a -@@ -96,7 +97,7 @@ - all :: @MAKE_TARGETS@ - - all_cli :: $(CLITARGETS) --all_tcl :: $(TCLTARGETS) -+all_tcl :: $(TCLTARGETS) $(TCLSCRIPTS) - all_tk :: $(TKTARGETS) - all_lib :: $(LIBHFS) $(LIBRSRC) - -@@ -129,9 +130,13 @@ - $(BININSTALL) $$file "$(BINDEST)/."; \ - done - -+ for file in $(TCLSCRIPTS); do \ -+ $(LIBINSTALL) $$file "$(BINDEST)/."; \ -+ done -+ - if [ -f "$(BINDEST)/hfs" ]; then \ - sed -e '1d' "$(BINDEST)/hfs" > "$(BINDEST)/hfs.new"; \ -- $(BININSTALL) "$(BINDEST)/hfs.new" "$(BINDEST)/hfs"; \ -+ $(LIBINSTALL) "$(BINDEST)/hfs.new" "$(BINDEST)/hfs"; \ - rm -f "$(BINDEST)/hfs.new"; \ - fi - Property changes on: head/sysutils/hfsutils/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/hfsutils/files/patch-Makefile.in =================================================================== --- head/sysutils/hfsutils/files/patch-Makefile.in (nonexistent) +++ head/sysutils/hfsutils/files/patch-Makefile.in (revision 363335) @@ -0,0 +1,36 @@ +--- Makefile.in.orig Tue Sep 1 02:40:14 1998 ++++ Makefile.in Wed Nov 4 17:32:21 1998 +@@ -64,7 +64,8 @@ + + CLITARGETS = hattrib hcd hcopy hdel hdir hformat hls hmkdir hmount hpwd \ + hrename hrmdir humount hvol +-TCLTARGETS = hfssh hfs ++TCLTARGETS = hfssh ++TCLSCRIPTS = hfs + TKTARGETS = xhfs + + LIBHFS = libhfs/libhfs.a +@@ -96,7 +97,7 @@ + all :: @MAKE_TARGETS@ + + all_cli :: $(CLITARGETS) +-all_tcl :: $(TCLTARGETS) ++all_tcl :: $(TCLTARGETS) $(TCLSCRIPTS) + all_tk :: $(TKTARGETS) + all_lib :: $(LIBHFS) $(LIBRSRC) + +@@ -129,9 +130,13 @@ + $(BININSTALL) $$file "$(BINDEST)/."; \ + done + ++ for file in $(TCLSCRIPTS); do \ ++ $(LIBINSTALL) $$file "$(BINDEST)/."; \ ++ done ++ + if [ -f "$(BINDEST)/hfs" ]; then \ + sed -e '1d' "$(BINDEST)/hfs" > "$(BINDEST)/hfs.new"; \ +- $(BININSTALL) "$(BINDEST)/hfs.new" "$(BINDEST)/hfs"; \ ++ $(LIBINSTALL) "$(BINDEST)/hfs.new" "$(BINDEST)/hfs"; \ + rm -f "$(BINDEST)/hfs.new"; \ + fi + Property changes on: head/sysutils/hfsutils/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/ipsc/files/patch-ae =================================================================== --- head/sysutils/ipsc/files/patch-ae (revision 363334) +++ head/sysutils/ipsc/files/patch-ae (nonexistent) @@ -1,8 +0,0 @@ ---- Makefile.orig Tue Jan 11 21:56:04 2000 -+++ Makefile Tue Jan 11 21:56:08 2000 -@@ -1,5 +1,3 @@ --CC = gcc --CFLAGS = -g -Wall -O2 - LIBS = -lm - - GNOMELIBS = `gnome-config --libs gnomeui` Property changes on: head/sysutils/ipsc/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/ipsc/files/patch-Makefile =================================================================== --- head/sysutils/ipsc/files/patch-Makefile (nonexistent) +++ head/sysutils/ipsc/files/patch-Makefile (revision 363335) @@ -0,0 +1,8 @@ +--- Makefile.orig Tue Jan 11 21:56:04 2000 ++++ Makefile Tue Jan 11 21:56:08 2000 +@@ -1,5 +1,3 @@ +-CC = gcc +-CFLAGS = -g -Wall -O2 + LIBS = -lm + + GNOMELIBS = `gnome-config --libs gnomeui` Property changes on: head/sysutils/ipsc/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/less/files/patch-aa =================================================================== --- head/sysutils/less/files/patch-aa (revision 363334) +++ head/sysutils/less/files/patch-aa (nonexistent) @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2010/10/30 02:29:59 -+++ Makefile.in 2010/10/30 02:32:04 -@@ -17,7 +17,7 @@ - EXEEXT = @EXEEXT@ - O=o - --LIBS = @LIBS@ -+LIBS = -ltermcap - - prefix = @prefix@ - exec_prefix = @exec_prefix@ Property changes on: head/sysutils/less/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/less/files/patch-ab =================================================================== --- head/sysutils/less/files/patch-ab (revision 363334) +++ head/sysutils/less/files/patch-ab (nonexistent) @@ -1,42 +0,0 @@ ---- charset.c.orig 2010/10/30 02:38:17 -+++ charset.c 2010/10/30 02:40:03 -@@ -408,6 +408,10 @@ - control_char(c) - LWCHAR c; - { -+#ifdef COLOR_LESS -+ if (c == ESC) -+ return 0; -+#endif - c &= 0377; - return (chardef[c] & IS_CONTROL_CHAR); - } -@@ -423,6 +427,20 @@ - /* {{ This buffer can be overrun if LESSBINFMT is a long string. }} */ - static char buf[32]; - -+#ifdef COLOR_LESS -+ if(c == ESC) -+ sprintf(buf, "%c", ESC); -+ else -+ { -+ c &= 0377; -+ if (!control_char(c)) -+ sprintf(buf, "%c", c); -+ else if (!control_char(c ^ 0100)) -+ sprintf(buf, "^%c", c ^ 0100); -+ else -+ sprintf(buf, binfmt, c); -+ } -+#else - c &= 0377; - if ((c < 128 || !utf_mode) && !control_char(c)) - SNPRINTF1(buf, sizeof(buf), "%c", (int) c); -@@ -446,6 +464,7 @@ - #endif - else - SNPRINTF1(buf, sizeof(buf), binfmt, c); -+#endif - return (buf); - } - Property changes on: head/sysutils/less/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/less/files/patch-Makefile.in =================================================================== --- head/sysutils/less/files/patch-Makefile.in (nonexistent) +++ head/sysutils/less/files/patch-Makefile.in (revision 363335) @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2010/10/30 02:29:59 ++++ Makefile.in 2010/10/30 02:32:04 +@@ -17,7 +17,7 @@ + EXEEXT = @EXEEXT@ + O=o + +-LIBS = @LIBS@ ++LIBS = -ltermcap + + prefix = @prefix@ + exec_prefix = @exec_prefix@ Property changes on: head/sysutils/less/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/less/files/patch-charset.c =================================================================== --- head/sysutils/less/files/patch-charset.c (nonexistent) +++ head/sysutils/less/files/patch-charset.c (revision 363335) @@ -0,0 +1,42 @@ +--- charset.c.orig 2010/10/30 02:38:17 ++++ charset.c 2010/10/30 02:40:03 +@@ -408,6 +408,10 @@ + control_char(c) + LWCHAR c; + { ++#ifdef COLOR_LESS ++ if (c == ESC) ++ return 0; ++#endif + c &= 0377; + return (chardef[c] & IS_CONTROL_CHAR); + } +@@ -423,6 +427,20 @@ + /* {{ This buffer can be overrun if LESSBINFMT is a long string. }} */ + static char buf[32]; + ++#ifdef COLOR_LESS ++ if(c == ESC) ++ sprintf(buf, "%c", ESC); ++ else ++ { ++ c &= 0377; ++ if (!control_char(c)) ++ sprintf(buf, "%c", c); ++ else if (!control_char(c ^ 0100)) ++ sprintf(buf, "^%c", c ^ 0100); ++ else ++ sprintf(buf, binfmt, c); ++ } ++#else + c &= 0377; + if ((c < 128 || !utf_mode) && !control_char(c)) + SNPRINTF1(buf, sizeof(buf), "%c", (int) c); +@@ -446,6 +464,7 @@ + #endif + else + SNPRINTF1(buf, sizeof(buf), binfmt, c); ++#endif + return (buf); + } + Property changes on: head/sysutils/less/files/patch-charset.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/linuxfdisk/Makefile =================================================================== --- head/sysutils/linuxfdisk/Makefile (revision 363334) +++ head/sysutils/linuxfdisk/Makefile (revision 363335) @@ -1,25 +1,24 @@ # Created by: netch@netch.kiev.ua # $FreeBSD$ PORTNAME= linuxfdisk PORTVERSION= 2.11z CATEGORIES= sysutils MASTER_SITES= http://ftp.sunet.se/pub/Linux/kernel.org/linux/utils/util-linux/v2.11/ \ http://ftp.be.debian.org/pub/linux/utils/util-linux/v2.11/ \ ftp://segfault.kiev.ua/pub/ DISTNAME= util-linux-${PORTVERSION} -EXTRACT_SUFX= .tar.bz2 MAINTAINER= netch@netch.kiev.ua COMMENT= Fdisk, a partition tables manipulator, from util-linux WRKSRC= ${WRKDIR}/util-linux-${PORTVERSION}/fdisk USES= tar:bzip2 ONLY_FOR_ARCHS= i386 amd64 pre-patch: @rm -f ${WRKSRC}/Makefile @cp ${FILESDIR}/linuxfdisk-Makefile ${WRKSRC}/Makefile @cp ${FILESDIR}/linuxfdisk-sys_bsd.c ${WRKSRC}/sys_bsd.c .include Index: head/sysutils/linuxfdisk/files/patch-aa =================================================================== --- head/sysutils/linuxfdisk/files/patch-aa (revision 363334) +++ head/sysutils/linuxfdisk/files/patch-aa (nonexistent) @@ -1,1131 +0,0 @@ -diff -rNu cfdisk.c cfdisk.c ---- cfdisk.c Tue Nov 26 18:44:33 2002 -+++ cfdisk.c Fri Jun 20 19:47:15 2003 -@@ -76,25 +76,14 @@ - #include - #include - #include --#include - - #include "nls.h" --#include "xstrncpy.h" - #include "common.h" - --#if defined(__GNUC__) || defined(HAS_LONG_LONG) --typedef long long ext2_loff_t; --#else --typedef long ext2_loff_t; --#endif -- --extern ext2_loff_t ext2_llseek(unsigned int fd, ext2_loff_t offset, -- unsigned int origin); -- - #define VERSION UTIL_LINUX_VERSION - --#define DEFAULT_DEVICE "/dev/hda" --#define ALTERNATE_DEVICE "/dev/sda" -+#define DEFAULT_DEVICE "/dev/ad0" -+#define ALTERNATE_DEVICE "/dev/da0" - - /* With K=1024 we have `binary' megabytes, gigabytes, etc. - Some misguided hackers like that. -@@ -324,7 +313,8 @@ - int logical = 0; - int logical_sectors[MAXIMUM_PARTS]; - --__sighandler_t old_SIGINT, old_SIGTERM; -+void (*old_SIGINT)(int); -+void (*old_SIGTERM)(int); - - int arrow_cursor = FALSE; - int display_units = MEGABYTES; -@@ -571,7 +561,7 @@ - - static void - read_sector(char *buffer, int sect_num) { -- if (ext2_llseek(fd, ((ext2_loff_t) sect_num)*SECTOR_SIZE, SEEK_SET) < 0) -+ if (lseek(fd, ((off_t) sect_num)*SECTOR_SIZE, SEEK_SET) < 0) - fatal(_("Cannot seek on disk drive"), 2); - if (read(fd, buffer, SECTOR_SIZE) != SECTOR_SIZE) - fatal(_("Cannot read disk drive"), 2); -@@ -579,7 +569,7 @@ - - static void - write_sector(char *buffer, int sect_num) { -- if (ext2_llseek(fd, ((ext2_loff_t) sect_num)*SECTOR_SIZE, SEEK_SET) < 0) -+ if (lseek(fd, ((off_t) sect_num)*SECTOR_SIZE, SEEK_SET) < 0) - fatal(_("Cannot seek on disk drive"), 2); - if (write(fd, buffer, SECTOR_SIZE) != SECTOR_SIZE) - fatal(_("Cannot write disk drive"), 2); -@@ -603,11 +593,11 @@ - #define DOS_OSTYPE_SZ 8 - #define DOS_LABEL_SZ 11 - #define DOS_FSTYPE_SZ 8 -- ext2_loff_t offset; -+ off_t offset; - -- offset = ((ext2_loff_t) p_info[i].first_sector + p_info[i].offset) -+ offset = ((off_t) p_info[i].first_sector + p_info[i].offset) - * SECTOR_SIZE; -- if (ext2_llseek(fd, offset, SEEK_SET) == offset -+ if (lseek(fd, offset, SEEK_SET) == offset - && read(fd, §or, sizeof(sector)) == sizeof(sector)) { - dos_copy_to_info(p_info[i].ostype, OSTYPESZ, - sector+DOS_OSTYPE_OFFSET, DOS_OSTYPE_SZ); -@@ -664,12 +654,12 @@ - } xfsb; - - char *label; -- ext2_loff_t offset; -+ off_t offset; - int j; - -- offset = ((ext2_loff_t) p_info[i].first_sector + p_info[i].offset) -+ offset = ((off_t) p_info[i].first_sector + p_info[i].offset) - * SECTOR_SIZE + 1024; -- if (ext2_llseek(fd, offset, SEEK_SET) == offset -+ if (lseek(fd, offset, SEEK_SET) == offset - && read(fd, &e2fsb, sizeof(e2fsb)) == sizeof(e2fsb) - && e2fsb.s_magic[0] + (e2fsb.s_magic[1]<<8) == EXT2_SUPER_MAGIC) { - label = e2fsb.s_volume_name; -@@ -684,9 +674,9 @@ - return; - } - -- offset = ((ext2_loff_t) p_info[i].first_sector + p_info[i].offset) -+ offset = ((off_t) p_info[i].first_sector + p_info[i].offset) - * SECTOR_SIZE + 0; -- if (ext2_llseek(fd, offset, SEEK_SET) == offset -+ if (lseek(fd, offset, SEEK_SET) == offset - && read(fd, &xfsb, sizeof(xfsb)) == sizeof(xfsb) - && !strcmp(xfsb.s_magic, XFS_SUPER_MAGIC)) { - label = xfsb.s_fname; -@@ -698,9 +688,9 @@ - } - - /* reiserfs? */ -- offset = ((ext2_loff_t) p_info[i].first_sector + p_info[i].offset) -+ offset = ((off_t) p_info[i].first_sector + p_info[i].offset) - * SECTOR_SIZE + REISERFS_DISK_OFFSET_IN_BYTES; -- if (ext2_llseek(fd, offset, SEEK_SET) == offset -+ if (lseek(fd, offset, SEEK_SET) == offset - && read(fd, &reiserfsb, 1024) == 1024 - && is_reiserfs_magic_string(&reiserfsb)) { - strncpy(p_info[i].fstype, "reiserfs", FSTYPESZ); -@@ -1140,7 +1130,7 @@ - print_warning(_("Menu item too long. Menu may look odd.")); - #endif - if (lenName >= sizeof(buff)) { /* truncate ridiculously long string */ -- xstrncpy(buff, mi, sizeof(buff)); -+ strlcpy(buff, mi, sizeof(buff)); - } else { - snprintf(buff, sizeof(buff), - (menuType & MENU_BUTTON) ? "[%*s%-*s]" : "%*s%-*s", -@@ -1605,17 +1595,7 @@ - opentype = O_RDWR; - opened = TRUE; - -- /* Blocks are visible in more than one way: -- e.g. as block on /dev/hda and as block on /dev/hda3 -- By a bug in the Linux buffer cache, we will see the old -- contents of /dev/hda when the change was made to /dev/hda3. -- In order to avoid this, discard all blocks on /dev/hda. -- Note that partition table blocks do not live in /dev/hdaN, -- so this only plays a role if we want to show volume labels. */ -- ioctl(fd, BLKFLSBUF); /* ignore errors */ -- /* e.g. Permission Denied */ -- -- if (ioctl(fd, BLKGETSIZE, &actual_size)) -+ if (sys_bsd_getsectors(fd, &actual_size)) - fatal(_("Cannot get disk size"), 3); - - read_sector(buffer.c.b, 0); -@@ -1824,7 +1804,7 @@ - if (is_bdev) { - sync(); - sleep(2); -- if (!ioctl(fd,BLKRRPART)) -+ if (!sys_bsd_ptsync(fd)) - changed = TRUE; - sync(); - sleep(4); -@@ -2850,9 +2830,11 @@ - int c; - int i, len; - -+#if 0 - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); -+#endif - - while ((c = getopt(argc, argv, "ac:gh:s:vzP:")) != -1) - switch (c) { -diff -rNu common.h common.h ---- common.h Thu May 9 02:50:35 2002 -+++ common.h Fri Jun 20 19:25:55 2003 -@@ -1,11 +1,10 @@ - /* common stuff for fdisk, cfdisk, sfdisk */ - --/* including fails */ --#include --#define BLKRRPART _IO(0x12,95) /* re-read partition table */ --#define BLKGETSIZE _IO(0x12,96) /* return device size */ --#define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ --#define BLKSSZGET _IO(0x12,104) /* get block device sector size */ -+#include -+typedef u_int16_t __u16; -+typedef u_int32_t __u32; -+typedef int16_t __s16; -+typedef u_int8_t __u8; - - /* including also fails */ - struct hd_geometry { -@@ -15,9 +14,6 @@ - unsigned long start; - }; - --#define HDIO_GETGEO 0x0301 /* get device geometry */ -- -- - struct systypes { - unsigned char type; - char *name; -@@ -26,3 +22,8 @@ - extern struct systypes i386_sys_types[]; - - extern char *partname(char *dev, int pno, int lth); -+ -+unsigned int sys_bsd_sectorsize(int fd); -+int sys_bsd_getsectors(int fd, unsigned long* s); -+int sys_bsd_ptsync(int fd); -+int sys_bsd_getgeometry(int, struct hd_geometry*); -diff -rNu fdisk.c fdisk.c ---- fdisk.c Sat Nov 23 18:05:24 2002 -+++ fdisk.c Fri Jun 20 19:25:55 2003 -@@ -37,11 +37,6 @@ - #include "fdisksgilabel.h" - #include "fdiskaixlabel.h" - --#include "../defines.h" --#ifdef HAVE_blkpg_h --#include --#endif -- - static void delete_partition(int i); - - #define hex_val(c) ({ \ -@@ -198,8 +193,8 @@ - " fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n" - " fdisk -s PARTITION Give partition size(s) in blocks\n" - " fdisk -v Give fdisk version\n" --"Here DISK is something like /dev/hdb or /dev/sda\n" --"and PARTITION is something like /dev/hda7\n" -+"Here DISK is something like /dev/ad1 or /dev/da0\n" -+"and PARTITION is something like /dev/ad0s7\n" - "-u: give Start and End in sector (instead of cylinder) units\n" - "-b 2048: (for certain MO disks) use 2048-byte sectors\n"); - break; -@@ -207,10 +202,8 @@ - /* msg in cases where fdisk used to probe */ - message = _( - "Usage: fdisk [-l] [-b SSZ] [-u] device\n" --"E.g.: fdisk /dev/hda (for the first IDE disk)\n" --" or: fdisk /dev/sdc (for the third SCSI disk)\n" --" or: fdisk /dev/eda (for the first PS/2 ESDI drive)\n" --" or: fdisk /dev/rd/c0d0 or: fdisk /dev/ida/c0d0 (for RAID devices)\n" -+"E.g.: fdisk /dev/ad0 (for the first IDE disk)\n" -+" or: fdisk /dev/da0 (for the third SCSI disk)\n" - " ...\n"); - break; - case unable_to_open: -@@ -231,7 +224,7 @@ - break; - case ioctl_error: - snprintf(error, sizeof(error), -- _("BLKGETSIZE ioctl failed on %s\n"), -+ _("DIOCGDINFO ioctl failed on %s\n"), - disk_device); - break; - case out_of_memory: -@@ -248,8 +241,8 @@ - - static void - seek_sector(int fd, uint secno) { -- ext2_loff_t offset = (ext2_loff_t) secno * sector_size; -- if (ext2_llseek(fd, offset, SEEK_SET) == (ext2_loff_t) -1) -+ off_t offset = (off_t) secno * sector_size; -+ if (lseek(fd, offset, SEEK_SET) == (off_t) -1) - fatal(unable_to_seek); - } - -@@ -725,53 +718,23 @@ - get_boot(create_empty_dos); - } - --#include --#define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) -- --static int --linux_version_code(void) { -- static int kernel_version = 0; -- struct utsname my_utsname; -- int p, q, r; -- -- if (!kernel_version && uname(&my_utsname) == 0) { -- p = atoi(strtok(my_utsname.release, ".")); -- q = atoi(strtok(NULL, ".")); -- r = atoi(strtok(NULL, ".")); -- kernel_version = MAKE_VERSION(p,q,r); -- } -- return kernel_version; --} -- - static void - get_sectorsize(int fd) { --#if defined(BLKSSZGET) -- if (!user_set_sector_size && -- linux_version_code() >= MAKE_VERSION(2,3,3)) { -- int arg; -- if (ioctl(fd, BLKSSZGET, &arg) == 0) -- sector_size = arg; -- if (sector_size != DEFAULT_SECTOR_SIZE) -- printf(_("Note: sector size is %d (not %d)\n"), -- sector_size, DEFAULT_SECTOR_SIZE); -- } --#else -- /* maybe the user specified it; and otherwise we still -- have the DEFAULT_SECTOR_SIZE default */ --#endif -+ unsigned int r = sys_bsd_sectorsize(fd); -+ if (r) -+ sector_size = r; -+ if (sector_size != DEFAULT_SECTOR_SIZE) -+ printf(_("Note: sector size is %d (not %d)\n"), -+ sector_size, DEFAULT_SECTOR_SIZE); - } - - static void - get_kernel_geometry(int fd) { --#ifdef HDIO_GETGEO -- struct hd_geometry geometry; -- -- if (!ioctl(fd, HDIO_GETGEO, &geometry)) { -- kern_heads = geometry.heads; -- kern_sectors = geometry.sectors; -- /* never use geometry.cylinders - it is truncated */ -+ struct hd_geometry h; -+ if (!sys_bsd_getgeometry(fd, &h)) { -+ kern_heads = h.heads; -+ kern_sectors = h.sectors; - } --#endif - } - - static void -@@ -813,7 +776,7 @@ - - get_sectorsize(fd); - sec_fac = sector_size / 512; -- guess_device_type(fd); -+ //guess_device_type(fd); - heads = cylinders = sectors = 0; - kern_heads = kern_sectors = 0; - pt_heads = pt_sectors = 0; -@@ -828,8 +791,11 @@ - pt_sectors ? pt_sectors : - kern_sectors ? kern_sectors : 63; - -- if (ioctl(fd, BLKGETSIZE, &longsectors)) -- longsectors = 0; -+ ;{ -+ unsigned long r; -+ if (sys_bsd_getsectors(fd, &r) == 0) -+ longsectors = r; -+ } - - sector_offset = 1; - if (dos_compatible_flag) -@@ -1404,7 +1370,7 @@ - * Jan. 1990 (version 1.2.1 by Gordon W. Ross Aug. 1990; Modified by S. - * Lubkin Oct. 1991). */ - --static void long2chs(ulong ls, uint *c, uint *h, uint *s) { -+static void long2chs(unsigned long ls, uint *c, uint *h, uint *s) { - int spc = heads * sectors; - - *c = ls / spc; -@@ -2102,16 +2068,8 @@ - printf(_("Calling ioctl() to re-read partition table.\n")); - sync(); - sleep(2); -- if ((i = ioctl(fd, BLKRRPART)) != 0) { -+ if ((i = sys_bsd_ptsync(fd)) != 0) { - error = errno; -- } else { -- /* some kernel versions (1.2.x) seem to have trouble -- rereading the partition table, but if asked to do it -- twice, the second time works. - biro@yggdrasil.com */ -- sync(); -- sleep(2); -- if ((i = ioctl(fd, BLKRRPART)) != 0) -- error = errno; - } - - if (i) { -@@ -2403,9 +2361,11 @@ - int j, c; - int optl = 0, opts = 0; - -+#if 0 - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); -+#endif - - /* - * Calls: -@@ -2455,7 +2415,7 @@ - break; - case 'V': - case 'v': -- printf("fdisk v" UTIL_LINUX_VERSION "\n"); -+ printf("fdisk v" "2.11z" "-freebsd-portbld" "\n"); - exit(0); - default: - fatal(usage); -@@ -2504,7 +2464,7 @@ - disk_device = argv[j]; - if ((fd = open(disk_device, type_open)) < 0) - fatal(unable_to_open); -- if (ioctl(fd, BLKGETSIZE, &size)) -+ if (sys_bsd_getsectors(fd, &size)) - fatal(ioctl_error); - close(fd); - if (opts == 1) -diff -rNu fdiskaixlabel.c fdiskaixlabel.c ---- fdiskaixlabel.c Tue Apr 18 15:21:28 2000 -+++ fdiskaixlabel.c Fri Jun 20 19:25:55 2003 -@@ -8,7 +8,7 @@ - #include /* strstr */ - #include /* write */ - --#include -+#include - - #include "common.h" - #include "fdisk.h" -diff -rNu fdiskaixlabel.h fdiskaixlabel.h ---- fdiskaixlabel.h Sun Feb 20 18:50:51 2000 -+++ fdiskaixlabel.h Fri Jun 20 19:25:55 2003 -@@ -1,4 +1,3 @@ --#include /* for __u32 etc */ - /* - * Copyright (C) Andreas Neuper, Sep 1998. - * This file may be redistributed under -diff -rNu fdiskbsdlabel.c fdiskbsdlabel.c ---- fdiskbsdlabel.c Thu Oct 31 15:43:42 2002 -+++ fdiskbsdlabel.c Fri Jun 20 19:25:55 2003 -@@ -566,7 +566,7 @@ - sector = get_start_sect(xbsd_part); - #endif - -- if (ext2_llseek (fd, (ext2_loff_t) sector * SECTOR_SIZE, SEEK_SET) == -1) -+ if (lseek (fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1) - fatal (unable_to_seek); - if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE)) - fatal (unable_to_write); -@@ -735,7 +735,7 @@ - sector = 0; - #endif - -- if (ext2_llseek (fd, (ext2_loff_t) sector * SECTOR_SIZE, SEEK_SET) == -1) -+ if (lseek (fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1) - fatal (unable_to_seek); - if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE)) - fatal (unable_to_read); -@@ -781,12 +781,12 @@ - - #if defined (__alpha__) && BSD_LABELSECTOR == 0 - alpha_bootblock_checksum (disklabelbuffer); -- if (ext2_llseek (fd, (ext2_loff_t) 0, SEEK_SET) == -1) -+ if (lseek (fd, (off_t) 0, SEEK_SET) == -1) - fatal (unable_to_seek); - if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE)) - fatal (unable_to_write); - #else -- if (ext2_llseek (fd, (ext2_loff_t) sector * SECTOR_SIZE + BSD_LABELOFFSET, -+ if (lseek (fd, (off_t) sector * SECTOR_SIZE + BSD_LABELOFFSET, - SEEK_SET) == -1) - fatal (unable_to_seek); - if (sizeof (struct xbsd_disklabel) != write (fd, d, sizeof (struct xbsd_disklabel))) -@@ -847,9 +847,11 @@ - - #if defined (__alpha__) - -+/* - #if !defined(__GLIBC__) - typedef unsigned long long u_int64_t; - #endif -+*/ - - void - alpha_bootblock_checksum (char *boot) -diff -rNu fdiskbsdlabel.h fdiskbsdlabel.h ---- fdiskbsdlabel.h Thu Oct 31 15:45:34 2002 -+++ fdiskbsdlabel.h Fri Jun 20 19:25:55 2003 -@@ -31,8 +31,6 @@ - * SUCH DAMAGE. - */ - --#include /* for __u32, __u16, __u8, __s16 */ -- - #ifndef BSD_DISKMAGIC - #define BSD_DISKMAGIC ((__u32) 0x82564557) - #endif -diff -rNu fdisksgilabel.c fdisksgilabel.c ---- fdisksgilabel.c Thu May 9 02:51:31 2002 -+++ fdisksgilabel.c Fri Jun 20 19:25:55 2003 -@@ -17,9 +17,8 @@ - #include /* stat */ - #include /* assert */ - --#include -+#include - #include "nls.h" --#include /* FLOPPY_MAJOR */ - - #include "common.h" - #include "fdisk.h" -@@ -382,7 +381,7 @@ - */ - sgiinfo*info = fill_sgiinfo(); /* fills the block appropriately */ - int infostartblock = SSWAP32( sgilabel->directory[0].vol_file_start ); -- if( ext2_llseek(fd, (ext2_loff_t)infostartblock* -+ if( lseek(fd, (off_t)infostartblock* - SECTOR_SIZE, SEEK_SET) < 0 ) - fatal(unable_to_seek); - if( write(fd, info, SECTOR_SIZE) != SECTOR_SIZE ) -@@ -735,11 +734,7 @@ - - other_endian = (BYTE_ORDER == LITTLE_ENDIAN); - --#ifdef HDIO_REQ -- if (!ioctl(fd, HDIO_REQ, &geometry)) --#else -- if (!ioctl(fd, HDIO_GETGEO, &geometry)) --#endif -+ if (!sys_bsd_getgeometry(fd, &geometry)) - { - heads = geometry.heads; - sectors = geometry.sectors; -diff -rNu fdisksgilabel.h fdisksgilabel.h ---- fdisksgilabel.h Tue Feb 20 12:26:53 2001 -+++ fdisksgilabel.h Fri Jun 20 19:25:55 2003 -@@ -1,4 +1,3 @@ --#include /* for __u32 etc */ - /* - * Copyright (C) Andreas Neuper, Sep 1998. - * This file may be modified and redistributed under -diff -rNu fdisksunlabel.c fdisksunlabel.c ---- fdisksunlabel.c Fri Nov 1 03:55:25 2002 -+++ fdisksunlabel.c Fri Jun 20 19:25:55 2003 -@@ -16,18 +16,18 @@ - #include /* write */ - #include /* ioctl */ - #include /* stat */ --#include /* major */ -+//#include /* major */ - - #include "nls.h" - --#include --#include "../defines.h" /* for HAVE_scsi_h */ -+#include -+//#include "../defines.h" /* for HAVE_scsi_h */ - #ifdef HAVE_scsi_h - #define u_char unsigned char - #include /* SCSI_IOCTL_GET_IDLUN */ - #undef u_char - #endif --#include /* FLOPPY_MAJOR */ -+//#include /* FLOPPY_MAJOR */ - - #include "common.h" - #include "fdisk.h" -@@ -71,6 +71,7 @@ - return SSWAP32(p.num_sectors); - } - -+#if 0 - #ifndef IDE0_MAJOR - #define IDE0_MAJOR 3 - #endif -@@ -97,6 +98,7 @@ - floppy = 0; - } - } -+#endif - - static void - set_sun_partition(int i, uint start, uint stop, int sysid) { -@@ -296,11 +298,7 @@ - } - } - if (!p || floppy) { --#ifdef HDIO_REQ -- if (!ioctl(fd, HDIO_REQ, &geometry)) { --#else -- if (!ioctl(fd, HDIO_GETGEO, &geometry)) { --#endif -+ if (!sys_bsd_getgeometry(fd, &geometry)) { - heads = geometry.heads; - sectors = geometry.sectors; - cylinders = geometry.cylinders; -diff -rNu fdisksunlabel.h fdisksunlabel.h ---- fdisksunlabel.h Tue Oct 3 00:42:10 2000 -+++ fdisksunlabel.h Fri Jun 20 19:25:55 2003 -@@ -1,4 +1,3 @@ --#include /* for __u16, __u32 */ - - typedef struct { - unsigned char info[128]; /* Informative text string */ -diff -rNu nls.h nls.h ---- nls.h Thu Jan 1 03:00:00 1970 -+++ nls.h Fri Jun 20 19:25:55 2003 -@@ -0,0 +1,2 @@ -+#define _(x) (x) -+#define N_(x) (x) -diff -rNu partname.c partname.c ---- partname.c Sun Jul 7 15:16:43 2002 -+++ partname.c Fri Jun 20 19:25:55 2003 -@@ -21,14 +21,16 @@ - p = ""; - - if (isdigit(dev[w-1])) -- p = "p"; -+ p = "s"; - -+#if 0 - /* devfs kludge - note: fdisk partition names are not supposed - to equal kernel names, so there is no reason to do this */ - if (strcmp (dev + w - 4, "disc") == 0) { - w -= 4; - p = "part"; - } -+#endif - - wp = strlen(p); - -diff -rNu sfdisk.8 sfdisk.8 ---- sfdisk.8 Fri Jun 20 20:37:34 2003 -+++ sfdisk.8 Fri Jun 20 20:43:24 2003 -@@ -9,9 +9,9 @@ - .SH NAME - sfdisk \- Partition table manipulator for Linux - .SH SYNOPSIS --.BR sfdisk " [options] device" -+.BR sfdisk-linux " [options] device" - .br --.BR "sfdisk \-s " [partition] -+.BR "sfdisk-linux \-s " [partition] - .SH DESCRIPTION - .B sfdisk - has four (main) uses: list the size of a partition, list the partitions -@@ -19,7 +19,7 @@ - repartition a device. - - .SS "List Sizes" --.BI "sfdisk \-s " partition -+.BI "sfdisk-linux \-s " partition - gives the size of - .I partition - in blocks. This may be useful in connection with programs like -@@ -27,16 +27,16 @@ - or so. Here - .I partition - is usually something like --.I /dev/hda1 -+.I /dev/ad0s1 - or --.IR /dev/sdb12 , -+.IR /dev/da2s12 , - but may also be an entire disk, like --.IR /dev/xda . -+.IR /dev/amrd0 . - .br - .RS - .nf - .if t .ft CW --% sfdisk \-s /dev/hda9 -+% sfdisk-linux \-s /dev/ad0s9 - 81599 - % - .if t .ft R -@@ -49,12 +49,12 @@ - .RS - .nf - .if t .ft CW --% sfdisk \-s --/dev/hda: 208896 --/dev/hdb: 1025136 --/dev/hdc: 1031063 --/dev/sda: 8877895 --/dev/sdb: 1758927 -+% sfdisk-linux \-s -+/dev/ad0: 208896 -+/dev/ad1: 1025136 -+/dev/ad2: 1031063 -+/dev/da0: 8877895 -+/dev/da1: 1758927 - total: 12901917 blocks - % - .if t .ft R -@@ -70,16 +70,16 @@ - .br - .nf - .if t .ft CW --% sfdisk \-l /dev/hdc -+% sfdisk-linux \-l /dev/ad2 - --Disk /dev/hdc: 16 heads, 63 sectors, 2045 cylinders -+Disk /dev/ad2: 16 heads, 63 sectors, 2045 cylinders - Units = cylinders of 516096 bytes, blocks of 1024 bytes, counting from 0 - - Device Boot Start End #cyls #blocks Id System --/dev/hdc1 0+ 406 407\- 205096+ 83 Linux native --/dev/hdc2 407 813 407 205128 83 Linux native --/dev/hdc3 814 2044 1231 620424 83 Linux native --/dev/hdc4 0 \- 0 0 0 Empty -+/dev/ad2s1 0+ 406 407\- 205096+ 83 Linux native -+/dev/ad2s2 407 813 407 205128 83 Linux native -+/dev/ad2s3 814 2044 1231 620424 83 Linux native -+/dev/ad2s4 0 \- 0 0 0 Empty - % - .if t .ft R - .fi -@@ -89,17 +89,17 @@ - - .SS "Check partitions" - The third type of invocation: --.BI "sfdisk \-V " device -+.BI "sfdisk-linux \-V " device - will apply various consistency checks to the partition tables on - .IR device . - It prints `OK' or complains. The \-V option can be used together - with \-l. In a shell script one might use --.BI "sfdisk \-V \-q " device -+.BI "sfdisk-linux \-V \-q " device - which only returns a status. - - .SS "Create partitions" - The fourth type of invocation: --.BI "sfdisk " device -+.BI "sfdisk-linux " device - will cause - .B sfdisk - to read the specification for the desired partitioning of -@@ -119,7 +119,7 @@ - .RS - .nf - .if t .ft CW --% sfdisk /dev/hdd \-O hdd-partition-sectors.save -+% sfdisk-linux /dev/ad3 \-O ad3-partition-sectors.save - \&... - % - .if t .ft R -@@ -132,7 +132,7 @@ - .RS - .nf - .if t .ft CW --% sfdisk /dev/hdd \-I hdd-partition-sectors.save -+% sfdisk-linux /dev/ad3 \-I ad3-partition-sectors.save - % - .if t .ft R - .fi -@@ -176,8 +176,8 @@ - .br - .nf - .if t .ft CW -- % sfdisk -d /dev/hda > hda.out -- % sfdisk /dev/hda < hda.out -+ % sfdisk-linux -d /dev/ad0 > ad0.out -+ % sfdisk-linux /dev/ad0 < ad0.out - .if t .ft R - .fi - will correct the bad last extended partition that the OS/2 -@@ -194,14 +194,14 @@ - .br - .nf - .if t .ft CW -- % sfdisk /dev/hdb \-N5 -+ % sfdisk-linux /dev/ad1 \-N5 - ,,,* - % - .if t .ft R - .fi --will make the fifth partition on /dev/hdb bootable (`active') -+will make the fifth partition on /dev/ad1 bootable (`active') - and change nothing else. (Probably this fifth partition --is called /dev/hdb5, but you are free to call it something else, -+is called /dev/ad1s5, but you are free to call it something else, - like `/my_equipment/disks/2/5' or so). - .TP - .BI \-A "number" -@@ -216,13 +216,13 @@ - .br - .nf - .if t .ft CW -- % sfdisk --print-id /dev/hdb 5 -+ % sfdisk-linux --print-id /dev/ad1 5 - 6 -- % sfdisk --change-id /dev/hdb 5 83 -+ % sfdisk-linux --change-id /dev/ad1 5 83 - OK - .if t .ft R - .fi --first reports that /dev/hdb5 has Id 6, and then changes that into 83. -+first reports that /dev/ad1s5 has Id 6, and then changes that into 83. - .TP - .BR \-uS " or " \-uB " or " \-uC " or " \-uM - Accept or report in units of sectors (blocks, cylinders, megabytes, -@@ -420,7 +420,7 @@ - .RS - .nf - .if t .ft CW --sfdisk /dev/hdc << EOF -+sfdisk-linux /dev/ad2 << EOF - 0,407 - ,407 - ; -@@ -429,7 +429,7 @@ - .if t .ft R - .fi - .RE --will partition /dev/hdc just as indicated above. -+will partition /dev/ad2 just as indicated above. - - With the \-x option, the number of input lines must be a multiple of 4: - you have to list the two empty partitions that you never want -@@ -456,9 +456,9 @@ - .B dd - to zero the first 512 bytes of that partition before using DOS FORMAT to - format the partition. For example, if you were using sfdisk to make a DOS --partition table entry for /dev/hda1, then (after exiting sfdisk and -+partition table entry for /dev/ad0s1, then (after exiting sfdisk and - rebooting Linux so that the partition table information is valid) you --would use the command "dd if=/dev/zero of=/dev/hda1 bs=512 count=1" to zero -+would use the command "dd if=/dev/zero of=/dev/ad0s1 bs=512 count=1" to zero - the first 512 bytes of the partition. - .B BE EXTREMELY CAREFUL - if you use the -@@ -508,7 +508,7 @@ - - .SH BUGS - A corresponding interactive --.B cfdisk -+.B cfdisk-linux - (with curses interface) is still lacking. - .LP - There are too many options. -@@ -519,7 +519,7 @@ - A. E. Brouwer (aeb@cwi.nl) - - .SH "SEE ALSO" --.BR cfdisk (8), -+.BR cfdisk-linux (8), -+.BR fdisk-linux (8), - .BR fdisk (8), --.BR mkfs (8), --.BR parted (8) -+.BR newfs (8) -diff -rNu cfdisk.8 cfdisk.8 ---- cfdisk.8 Sun Jul 7 15:28:27 2002 -+++ cfdisk.8 Fri Jun 20 20:57:52 2003 -@@ -15,7 +15,7 @@ - .SH NAME - cfdisk \- Curses based disk partition table manipulator for Linux - .SH SYNOPSIS --.BI "cfdisk [ \-agvz ] [ \-c " cylinders " ] [ \-h " heads " ]" -+.BI "cfdisk-linux [ \-agvz ] [ \-c " cylinders " ] [ \-h " heads " ]" - .BI "[ \-s " sectors-per-track " ] [ -P " opt " ] [ " device " ]" - .SH DESCRIPTION - .B cfdisk -@@ -26,12 +26,10 @@ - .sp - .nf - .RS --/dev/hda [default] --/dev/hdb --/dev/sda --/dev/sdb --/dev/sdc --/dev/sdd -+/dev/ad0 [default] -+/dev/ad1 -+/dev/da0 -+/dev/da1 - .RE - .fi - -@@ -132,9 +130,9 @@ - .B dd - to zero the first 512 bytes of that partition before using DOS FORMAT to - format the partition. For example, if you were using cfdisk to make a DOS --partition table entry for /dev/hda1, then (after exiting fdisk or cfdisk -+partition table entry for /dev/ad0s1, then (after exiting fdisk or cfdisk - and rebooting Linux so that the partition table information is valid) you --would use the command "dd if=/dev/zero of=/dev/hda1 bs=512 count=1" to zero -+would use the command "dd if=/dev/zero of=/dev/ad0s1 bs=512 count=1" to zero - the first 512 bytes of the partition. Note: - - .B BE EXTREMELY CAREFUL -@@ -418,10 +416,10 @@ - 0: No errors; 1: Invocation error; 2: I/O error; - 3: cannot get geometry; 4: bad partition table on disk. - .SH "SEE ALSO" -+.BR fdisk-linux (8), -+.BR newfs (8), - .BR fdisk (8), --.BR mkfs (8), --.BR parted (8), --.BR sfdisk (8) -+.BR sfdisk-linux (8) - .SH BUGS - The current version does not support multiple disks. - .SH AUTHOR -diff -rNu fdisk.8 fdisk.8 ---- fdisk.8 Tue Aug 6 17:33:33 2002 -+++ fdisk.8 Fri Jun 20 21:01:24 2003 -@@ -5,14 +5,14 @@ - .SH NAME - fdisk \- Partition table manipulator for Linux - .SH SYNOPSIS --.BI "fdisk [\-u] [\-b " sectorsize ] -+.BI "fdisk-linux [\-u] [\-b " sectorsize ] - .BI "[\-C " cyls "] [\-H " heads "] [\-S " sects "] " device - .sp --.BI "fdisk \-l [\-u] [" "device ..." ] -+.BI "fdisk-linux \-l [\-u] [" "device ..." ] - .sp --.BI "fdisk \-s " "partition ..." -+.BI "fdisk-linux \-s " "partition ..." - .sp --.BI "fdisk \-v -+.BI "fdisk-linux \-v - .SH DESCRIPTION - Hard disks can be divided into one or more logical disks called - .IR partitions . -@@ -48,26 +48,22 @@ - .br - .nf - .RS --/dev/hda --/dev/hdb --/dev/sda --/dev/sdb -+/dev/ad0 -+/dev/ad1 -+/dev/da0 -+/dev/da1 - .RE - .fi --(/dev/hd[a-h] for IDE disks, /dev/sd[a-p] for SCSI disks, --/dev/ed[a-d] for ESDI disks, /dev/xd[ab] for XT disks). -+(/dev/adN for IDE disks, /dev/daN for SCSI disks, N=0,1,2...) - A device name refers to the entire disk. - - The - .I partition - is a - .I device --name followed by a partition number. For example, --.B /dev/hda1 -+name followed by 's' and a partition number. For example, -+.B /dev/ad0s1 - is the first partition on the first IDE hard disk in the system. --IDE disks can have up to 63 partitions, SCSI disks up to 15. --See also --.IR /usr/src/linux/Documentation/devices.txt . - - A BSD/SUN type disklabel can describe 8 partitions, - the third of which should be a `whole disk' partition. -@@ -132,7 +128,7 @@ - Partitions beginning in cylinder 1 cannot begin on a cylinder boundary, but - this is unlikely to cause difficulty unless you have OS/2 on your machine. - --A sync() and a BLKRRPART ioctl() (reread partition table from disk) -+A sync() and a sys_bsd_ptsync() (reread partition table from disk) - are performed before exiting when the partition table has been updated. - Long ago it used to be necessary to reboot after the use of fdisk. - I do not think this is the case anymore - indeed, rebooting too quickly -@@ -242,7 +238,7 @@ - .\" Andreas Neuper (ANeuper@GUUG.de) - .\" and many others. - .SH "SEE ALSO" --.BR cfdisk (8), --.BR mkfs (8), --.BR parted (8), --.BR sfdisk (8) -+.BR cfdisk_linux (8), -+.BR newfs (8), -+.BR fdisk (8), -+.BR sfdisk_linux (8) -diff -rNu sfdisk.c sfdisk.c ---- sfdisk.c Tue Jan 28 20:18:03 2003 -+++ sfdisk.c Tue Jun 24 01:10:28 2003 -@@ -42,11 +42,9 @@ - #include /* ERANGE */ - #include /* index() */ - #include --#include -+#include "getopt.h" - #include - #include --#include --#include /* _syscall */ - #include "nls.h" - #include "common.h" - -@@ -130,23 +128,14 @@ - * - * Note: we use 512-byte sectors here, irrespective of the hardware ss. - */ --#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) --static --_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo, -- loff_t *, res, uint, wh); --#endif - - static int - sseek(char *dev, unsigned int fd, unsigned long s) { -- loff_t in, out; -- in = ((loff_t) s << 9); -+ off_t in, out; -+ in = ((off_t) s << 9); - out = 1; - --#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) -- if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0) { --#else - if ((out = lseek(fd, in, SEEK_SET)) != in) { --#endif - perror("llseek"); - error(_("seek error on %s - cannot seek to %lu\n"), dev, s); - return 0; -@@ -399,12 +388,13 @@ - long size; - struct geometry R; - -- if (ioctl(fd, BLKGETSIZE, &size)) { -+ if (sys_bsd_getsectors(fd, (unsigned long*) &size)) { - size = 0; - if (!silent) - printf(_("Disk %s: cannot get size\n"), dev); - } -- if (ioctl(fd, HDIO_GETGEO, &g)) { -+ g.start = 0; /* XXX ?????????? */ -+ if (sys_bsd_getgeometry(fd, &g)) { - g.heads = g.sectors = g.cylinders = g.start = 0; - if (!silent) - printf(_("Disk %s: cannot get geometry\n"), dev); -@@ -721,8 +711,8 @@ - /* tell the kernel to reread the partition tables */ - static int - reread_ioctl(int fd) { -- if(ioctl(fd, BLKRRPART)) { -- perror("BLKRRPART"); -+ if(sys_bsd_ptsync(fd)) { -+ perror("sys_bsd_ptsync"); - return -1; - } - return 0; -@@ -1428,22 +1418,6 @@ - z->partno = pno; - } - --#define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) -- --static int --linux_version_code(void) { -- struct utsname my_utsname; -- int p, q, r; -- -- if (uname(&my_utsname) == 0) { -- p = atoi(strtok(my_utsname.release, ".")); -- q = atoi(strtok(NULL, ".")); -- r = atoi(strtok(NULL, ".")); -- return MAKE_VERSION(p,q,r); -- } -- return 0; --} -- - static int - msdos_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) { - int i; -@@ -1452,7 +1426,10 @@ - struct sector *s; - struct part_desc *partitions = &(z->partitions[0]); - int pno = z->partno; -- int bsd_later = (linux_version_code() >= MAKE_VERSION(2,3,40)); -+ /* Under FreeBSD, "bsd later" is always true because BSD partitions -+ * in MBR or MBREXT partitions doesn't be listed immediately. -+ */ -+ int bsd_later = 1; - - if (!(s = get_sector(dev, fd, start))) - return 0; -@@ -1501,6 +1478,8 @@ - } - extended_partition(dev, fd, &partitions[i], z); - } -+#if 0 -+/* FreeBSD port: don't count partitions as they won't be list as slices */ - if (!bsd_later && is_bsd(partitions[i].p.sys_type)) { - if (!partitions[i].size) { - printf(_("strange..., a BSD partition of size 0?\n")); -@@ -1508,8 +1487,11 @@ - } - bsd_partition(dev, fd, &partitions[i], z); - } -+#endif - } - -+#if 0 -+/* FreeBSD port: don't count partitions as they won't be list as slices */ - if (bsd_later) { - for (i=0; i<4; i++) { - if (is_bsd(partitions[i].p.sys_type)) { -@@ -1521,6 +1503,7 @@ - } - } - } -+#endif - - return 1; - } -@@ -2413,9 +2396,11 @@ - char *activatearg = 0; - char *unhidearg = 0; - -+#if 0 - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); -+#endif - - if (argc < 1) - fatal(_("no command?\n")); -@@ -2668,10 +2653,10 @@ - if (fd < 0) - return; - -- if(ioctl(fd, BLKGETSIZE, &size)) { -+ if(sys_bsd_getsectors(fd, (unsigned long*) &size)) { - if(!silent) { - perror(dev); -- fatal(_("BLKGETSIZE ioctl failed for %s\n"), dev); -+ fatal(_("sys_bsd_getsectors() failed for %s\n"), dev); - } - return; - } Property changes on: head/sysutils/linuxfdisk/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/linuxfdisk/files/patch-FreeBSD =================================================================== --- head/sysutils/linuxfdisk/files/patch-FreeBSD (nonexistent) +++ head/sysutils/linuxfdisk/files/patch-FreeBSD (revision 363335) @@ -0,0 +1,1131 @@ +diff -rNu cfdisk.c cfdisk.c +--- cfdisk.c Tue Nov 26 18:44:33 2002 ++++ cfdisk.c Fri Jun 20 19:47:15 2003 +@@ -76,25 +76,14 @@ + #include + #include + #include +-#include + + #include "nls.h" +-#include "xstrncpy.h" + #include "common.h" + +-#if defined(__GNUC__) || defined(HAS_LONG_LONG) +-typedef long long ext2_loff_t; +-#else +-typedef long ext2_loff_t; +-#endif +- +-extern ext2_loff_t ext2_llseek(unsigned int fd, ext2_loff_t offset, +- unsigned int origin); +- + #define VERSION UTIL_LINUX_VERSION + +-#define DEFAULT_DEVICE "/dev/hda" +-#define ALTERNATE_DEVICE "/dev/sda" ++#define DEFAULT_DEVICE "/dev/ad0" ++#define ALTERNATE_DEVICE "/dev/da0" + + /* With K=1024 we have `binary' megabytes, gigabytes, etc. + Some misguided hackers like that. +@@ -324,7 +313,8 @@ + int logical = 0; + int logical_sectors[MAXIMUM_PARTS]; + +-__sighandler_t old_SIGINT, old_SIGTERM; ++void (*old_SIGINT)(int); ++void (*old_SIGTERM)(int); + + int arrow_cursor = FALSE; + int display_units = MEGABYTES; +@@ -571,7 +561,7 @@ + + static void + read_sector(char *buffer, int sect_num) { +- if (ext2_llseek(fd, ((ext2_loff_t) sect_num)*SECTOR_SIZE, SEEK_SET) < 0) ++ if (lseek(fd, ((off_t) sect_num)*SECTOR_SIZE, SEEK_SET) < 0) + fatal(_("Cannot seek on disk drive"), 2); + if (read(fd, buffer, SECTOR_SIZE) != SECTOR_SIZE) + fatal(_("Cannot read disk drive"), 2); +@@ -579,7 +569,7 @@ + + static void + write_sector(char *buffer, int sect_num) { +- if (ext2_llseek(fd, ((ext2_loff_t) sect_num)*SECTOR_SIZE, SEEK_SET) < 0) ++ if (lseek(fd, ((off_t) sect_num)*SECTOR_SIZE, SEEK_SET) < 0) + fatal(_("Cannot seek on disk drive"), 2); + if (write(fd, buffer, SECTOR_SIZE) != SECTOR_SIZE) + fatal(_("Cannot write disk drive"), 2); +@@ -603,11 +593,11 @@ + #define DOS_OSTYPE_SZ 8 + #define DOS_LABEL_SZ 11 + #define DOS_FSTYPE_SZ 8 +- ext2_loff_t offset; ++ off_t offset; + +- offset = ((ext2_loff_t) p_info[i].first_sector + p_info[i].offset) ++ offset = ((off_t) p_info[i].first_sector + p_info[i].offset) + * SECTOR_SIZE; +- if (ext2_llseek(fd, offset, SEEK_SET) == offset ++ if (lseek(fd, offset, SEEK_SET) == offset + && read(fd, §or, sizeof(sector)) == sizeof(sector)) { + dos_copy_to_info(p_info[i].ostype, OSTYPESZ, + sector+DOS_OSTYPE_OFFSET, DOS_OSTYPE_SZ); +@@ -664,12 +654,12 @@ + } xfsb; + + char *label; +- ext2_loff_t offset; ++ off_t offset; + int j; + +- offset = ((ext2_loff_t) p_info[i].first_sector + p_info[i].offset) ++ offset = ((off_t) p_info[i].first_sector + p_info[i].offset) + * SECTOR_SIZE + 1024; +- if (ext2_llseek(fd, offset, SEEK_SET) == offset ++ if (lseek(fd, offset, SEEK_SET) == offset + && read(fd, &e2fsb, sizeof(e2fsb)) == sizeof(e2fsb) + && e2fsb.s_magic[0] + (e2fsb.s_magic[1]<<8) == EXT2_SUPER_MAGIC) { + label = e2fsb.s_volume_name; +@@ -684,9 +674,9 @@ + return; + } + +- offset = ((ext2_loff_t) p_info[i].first_sector + p_info[i].offset) ++ offset = ((off_t) p_info[i].first_sector + p_info[i].offset) + * SECTOR_SIZE + 0; +- if (ext2_llseek(fd, offset, SEEK_SET) == offset ++ if (lseek(fd, offset, SEEK_SET) == offset + && read(fd, &xfsb, sizeof(xfsb)) == sizeof(xfsb) + && !strcmp(xfsb.s_magic, XFS_SUPER_MAGIC)) { + label = xfsb.s_fname; +@@ -698,9 +688,9 @@ + } + + /* reiserfs? */ +- offset = ((ext2_loff_t) p_info[i].first_sector + p_info[i].offset) ++ offset = ((off_t) p_info[i].first_sector + p_info[i].offset) + * SECTOR_SIZE + REISERFS_DISK_OFFSET_IN_BYTES; +- if (ext2_llseek(fd, offset, SEEK_SET) == offset ++ if (lseek(fd, offset, SEEK_SET) == offset + && read(fd, &reiserfsb, 1024) == 1024 + && is_reiserfs_magic_string(&reiserfsb)) { + strncpy(p_info[i].fstype, "reiserfs", FSTYPESZ); +@@ -1140,7 +1130,7 @@ + print_warning(_("Menu item too long. Menu may look odd.")); + #endif + if (lenName >= sizeof(buff)) { /* truncate ridiculously long string */ +- xstrncpy(buff, mi, sizeof(buff)); ++ strlcpy(buff, mi, sizeof(buff)); + } else { + snprintf(buff, sizeof(buff), + (menuType & MENU_BUTTON) ? "[%*s%-*s]" : "%*s%-*s", +@@ -1605,17 +1595,7 @@ + opentype = O_RDWR; + opened = TRUE; + +- /* Blocks are visible in more than one way: +- e.g. as block on /dev/hda and as block on /dev/hda3 +- By a bug in the Linux buffer cache, we will see the old +- contents of /dev/hda when the change was made to /dev/hda3. +- In order to avoid this, discard all blocks on /dev/hda. +- Note that partition table blocks do not live in /dev/hdaN, +- so this only plays a role if we want to show volume labels. */ +- ioctl(fd, BLKFLSBUF); /* ignore errors */ +- /* e.g. Permission Denied */ +- +- if (ioctl(fd, BLKGETSIZE, &actual_size)) ++ if (sys_bsd_getsectors(fd, &actual_size)) + fatal(_("Cannot get disk size"), 3); + + read_sector(buffer.c.b, 0); +@@ -1824,7 +1804,7 @@ + if (is_bdev) { + sync(); + sleep(2); +- if (!ioctl(fd,BLKRRPART)) ++ if (!sys_bsd_ptsync(fd)) + changed = TRUE; + sync(); + sleep(4); +@@ -2850,9 +2830,11 @@ + int c; + int i, len; + ++#if 0 + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); ++#endif + + while ((c = getopt(argc, argv, "ac:gh:s:vzP:")) != -1) + switch (c) { +diff -rNu common.h common.h +--- common.h Thu May 9 02:50:35 2002 ++++ common.h Fri Jun 20 19:25:55 2003 +@@ -1,11 +1,10 @@ + /* common stuff for fdisk, cfdisk, sfdisk */ + +-/* including fails */ +-#include +-#define BLKRRPART _IO(0x12,95) /* re-read partition table */ +-#define BLKGETSIZE _IO(0x12,96) /* return device size */ +-#define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ +-#define BLKSSZGET _IO(0x12,104) /* get block device sector size */ ++#include ++typedef u_int16_t __u16; ++typedef u_int32_t __u32; ++typedef int16_t __s16; ++typedef u_int8_t __u8; + + /* including also fails */ + struct hd_geometry { +@@ -15,9 +14,6 @@ + unsigned long start; + }; + +-#define HDIO_GETGEO 0x0301 /* get device geometry */ +- +- + struct systypes { + unsigned char type; + char *name; +@@ -26,3 +22,8 @@ + extern struct systypes i386_sys_types[]; + + extern char *partname(char *dev, int pno, int lth); ++ ++unsigned int sys_bsd_sectorsize(int fd); ++int sys_bsd_getsectors(int fd, unsigned long* s); ++int sys_bsd_ptsync(int fd); ++int sys_bsd_getgeometry(int, struct hd_geometry*); +diff -rNu fdisk.c fdisk.c +--- fdisk.c Sat Nov 23 18:05:24 2002 ++++ fdisk.c Fri Jun 20 19:25:55 2003 +@@ -37,11 +37,6 @@ + #include "fdisksgilabel.h" + #include "fdiskaixlabel.h" + +-#include "../defines.h" +-#ifdef HAVE_blkpg_h +-#include +-#endif +- + static void delete_partition(int i); + + #define hex_val(c) ({ \ +@@ -198,8 +193,8 @@ + " fdisk -l [-b SSZ] [-u] DISK List partition table(s)\n" + " fdisk -s PARTITION Give partition size(s) in blocks\n" + " fdisk -v Give fdisk version\n" +-"Here DISK is something like /dev/hdb or /dev/sda\n" +-"and PARTITION is something like /dev/hda7\n" ++"Here DISK is something like /dev/ad1 or /dev/da0\n" ++"and PARTITION is something like /dev/ad0s7\n" + "-u: give Start and End in sector (instead of cylinder) units\n" + "-b 2048: (for certain MO disks) use 2048-byte sectors\n"); + break; +@@ -207,10 +202,8 @@ + /* msg in cases where fdisk used to probe */ + message = _( + "Usage: fdisk [-l] [-b SSZ] [-u] device\n" +-"E.g.: fdisk /dev/hda (for the first IDE disk)\n" +-" or: fdisk /dev/sdc (for the third SCSI disk)\n" +-" or: fdisk /dev/eda (for the first PS/2 ESDI drive)\n" +-" or: fdisk /dev/rd/c0d0 or: fdisk /dev/ida/c0d0 (for RAID devices)\n" ++"E.g.: fdisk /dev/ad0 (for the first IDE disk)\n" ++" or: fdisk /dev/da0 (for the third SCSI disk)\n" + " ...\n"); + break; + case unable_to_open: +@@ -231,7 +224,7 @@ + break; + case ioctl_error: + snprintf(error, sizeof(error), +- _("BLKGETSIZE ioctl failed on %s\n"), ++ _("DIOCGDINFO ioctl failed on %s\n"), + disk_device); + break; + case out_of_memory: +@@ -248,8 +241,8 @@ + + static void + seek_sector(int fd, uint secno) { +- ext2_loff_t offset = (ext2_loff_t) secno * sector_size; +- if (ext2_llseek(fd, offset, SEEK_SET) == (ext2_loff_t) -1) ++ off_t offset = (off_t) secno * sector_size; ++ if (lseek(fd, offset, SEEK_SET) == (off_t) -1) + fatal(unable_to_seek); + } + +@@ -725,53 +718,23 @@ + get_boot(create_empty_dos); + } + +-#include +-#define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) +- +-static int +-linux_version_code(void) { +- static int kernel_version = 0; +- struct utsname my_utsname; +- int p, q, r; +- +- if (!kernel_version && uname(&my_utsname) == 0) { +- p = atoi(strtok(my_utsname.release, ".")); +- q = atoi(strtok(NULL, ".")); +- r = atoi(strtok(NULL, ".")); +- kernel_version = MAKE_VERSION(p,q,r); +- } +- return kernel_version; +-} +- + static void + get_sectorsize(int fd) { +-#if defined(BLKSSZGET) +- if (!user_set_sector_size && +- linux_version_code() >= MAKE_VERSION(2,3,3)) { +- int arg; +- if (ioctl(fd, BLKSSZGET, &arg) == 0) +- sector_size = arg; +- if (sector_size != DEFAULT_SECTOR_SIZE) +- printf(_("Note: sector size is %d (not %d)\n"), +- sector_size, DEFAULT_SECTOR_SIZE); +- } +-#else +- /* maybe the user specified it; and otherwise we still +- have the DEFAULT_SECTOR_SIZE default */ +-#endif ++ unsigned int r = sys_bsd_sectorsize(fd); ++ if (r) ++ sector_size = r; ++ if (sector_size != DEFAULT_SECTOR_SIZE) ++ printf(_("Note: sector size is %d (not %d)\n"), ++ sector_size, DEFAULT_SECTOR_SIZE); + } + + static void + get_kernel_geometry(int fd) { +-#ifdef HDIO_GETGEO +- struct hd_geometry geometry; +- +- if (!ioctl(fd, HDIO_GETGEO, &geometry)) { +- kern_heads = geometry.heads; +- kern_sectors = geometry.sectors; +- /* never use geometry.cylinders - it is truncated */ ++ struct hd_geometry h; ++ if (!sys_bsd_getgeometry(fd, &h)) { ++ kern_heads = h.heads; ++ kern_sectors = h.sectors; + } +-#endif + } + + static void +@@ -813,7 +776,7 @@ + + get_sectorsize(fd); + sec_fac = sector_size / 512; +- guess_device_type(fd); ++ //guess_device_type(fd); + heads = cylinders = sectors = 0; + kern_heads = kern_sectors = 0; + pt_heads = pt_sectors = 0; +@@ -828,8 +791,11 @@ + pt_sectors ? pt_sectors : + kern_sectors ? kern_sectors : 63; + +- if (ioctl(fd, BLKGETSIZE, &longsectors)) +- longsectors = 0; ++ ;{ ++ unsigned long r; ++ if (sys_bsd_getsectors(fd, &r) == 0) ++ longsectors = r; ++ } + + sector_offset = 1; + if (dos_compatible_flag) +@@ -1404,7 +1370,7 @@ + * Jan. 1990 (version 1.2.1 by Gordon W. Ross Aug. 1990; Modified by S. + * Lubkin Oct. 1991). */ + +-static void long2chs(ulong ls, uint *c, uint *h, uint *s) { ++static void long2chs(unsigned long ls, uint *c, uint *h, uint *s) { + int spc = heads * sectors; + + *c = ls / spc; +@@ -2102,16 +2068,8 @@ + printf(_("Calling ioctl() to re-read partition table.\n")); + sync(); + sleep(2); +- if ((i = ioctl(fd, BLKRRPART)) != 0) { ++ if ((i = sys_bsd_ptsync(fd)) != 0) { + error = errno; +- } else { +- /* some kernel versions (1.2.x) seem to have trouble +- rereading the partition table, but if asked to do it +- twice, the second time works. - biro@yggdrasil.com */ +- sync(); +- sleep(2); +- if ((i = ioctl(fd, BLKRRPART)) != 0) +- error = errno; + } + + if (i) { +@@ -2403,9 +2361,11 @@ + int j, c; + int optl = 0, opts = 0; + ++#if 0 + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); ++#endif + + /* + * Calls: +@@ -2455,7 +2415,7 @@ + break; + case 'V': + case 'v': +- printf("fdisk v" UTIL_LINUX_VERSION "\n"); ++ printf("fdisk v" "2.11z" "-freebsd-portbld" "\n"); + exit(0); + default: + fatal(usage); +@@ -2504,7 +2464,7 @@ + disk_device = argv[j]; + if ((fd = open(disk_device, type_open)) < 0) + fatal(unable_to_open); +- if (ioctl(fd, BLKGETSIZE, &size)) ++ if (sys_bsd_getsectors(fd, &size)) + fatal(ioctl_error); + close(fd); + if (opts == 1) +diff -rNu fdiskaixlabel.c fdiskaixlabel.c +--- fdiskaixlabel.c Tue Apr 18 15:21:28 2000 ++++ fdiskaixlabel.c Fri Jun 20 19:25:55 2003 +@@ -8,7 +8,7 @@ + #include /* strstr */ + #include /* write */ + +-#include ++#include + + #include "common.h" + #include "fdisk.h" +diff -rNu fdiskaixlabel.h fdiskaixlabel.h +--- fdiskaixlabel.h Sun Feb 20 18:50:51 2000 ++++ fdiskaixlabel.h Fri Jun 20 19:25:55 2003 +@@ -1,4 +1,3 @@ +-#include /* for __u32 etc */ + /* + * Copyright (C) Andreas Neuper, Sep 1998. + * This file may be redistributed under +diff -rNu fdiskbsdlabel.c fdiskbsdlabel.c +--- fdiskbsdlabel.c Thu Oct 31 15:43:42 2002 ++++ fdiskbsdlabel.c Fri Jun 20 19:25:55 2003 +@@ -566,7 +566,7 @@ + sector = get_start_sect(xbsd_part); + #endif + +- if (ext2_llseek (fd, (ext2_loff_t) sector * SECTOR_SIZE, SEEK_SET) == -1) ++ if (lseek (fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1) + fatal (unable_to_seek); + if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE)) + fatal (unable_to_write); +@@ -735,7 +735,7 @@ + sector = 0; + #endif + +- if (ext2_llseek (fd, (ext2_loff_t) sector * SECTOR_SIZE, SEEK_SET) == -1) ++ if (lseek (fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1) + fatal (unable_to_seek); + if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE)) + fatal (unable_to_read); +@@ -781,12 +781,12 @@ + + #if defined (__alpha__) && BSD_LABELSECTOR == 0 + alpha_bootblock_checksum (disklabelbuffer); +- if (ext2_llseek (fd, (ext2_loff_t) 0, SEEK_SET) == -1) ++ if (lseek (fd, (off_t) 0, SEEK_SET) == -1) + fatal (unable_to_seek); + if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE)) + fatal (unable_to_write); + #else +- if (ext2_llseek (fd, (ext2_loff_t) sector * SECTOR_SIZE + BSD_LABELOFFSET, ++ if (lseek (fd, (off_t) sector * SECTOR_SIZE + BSD_LABELOFFSET, + SEEK_SET) == -1) + fatal (unable_to_seek); + if (sizeof (struct xbsd_disklabel) != write (fd, d, sizeof (struct xbsd_disklabel))) +@@ -847,9 +847,11 @@ + + #if defined (__alpha__) + ++/* + #if !defined(__GLIBC__) + typedef unsigned long long u_int64_t; + #endif ++*/ + + void + alpha_bootblock_checksum (char *boot) +diff -rNu fdiskbsdlabel.h fdiskbsdlabel.h +--- fdiskbsdlabel.h Thu Oct 31 15:45:34 2002 ++++ fdiskbsdlabel.h Fri Jun 20 19:25:55 2003 +@@ -31,8 +31,6 @@ + * SUCH DAMAGE. + */ + +-#include /* for __u32, __u16, __u8, __s16 */ +- + #ifndef BSD_DISKMAGIC + #define BSD_DISKMAGIC ((__u32) 0x82564557) + #endif +diff -rNu fdisksgilabel.c fdisksgilabel.c +--- fdisksgilabel.c Thu May 9 02:51:31 2002 ++++ fdisksgilabel.c Fri Jun 20 19:25:55 2003 +@@ -17,9 +17,8 @@ + #include /* stat */ + #include /* assert */ + +-#include ++#include + #include "nls.h" +-#include /* FLOPPY_MAJOR */ + + #include "common.h" + #include "fdisk.h" +@@ -382,7 +381,7 @@ + */ + sgiinfo*info = fill_sgiinfo(); /* fills the block appropriately */ + int infostartblock = SSWAP32( sgilabel->directory[0].vol_file_start ); +- if( ext2_llseek(fd, (ext2_loff_t)infostartblock* ++ if( lseek(fd, (off_t)infostartblock* + SECTOR_SIZE, SEEK_SET) < 0 ) + fatal(unable_to_seek); + if( write(fd, info, SECTOR_SIZE) != SECTOR_SIZE ) +@@ -735,11 +734,7 @@ + + other_endian = (BYTE_ORDER == LITTLE_ENDIAN); + +-#ifdef HDIO_REQ +- if (!ioctl(fd, HDIO_REQ, &geometry)) +-#else +- if (!ioctl(fd, HDIO_GETGEO, &geometry)) +-#endif ++ if (!sys_bsd_getgeometry(fd, &geometry)) + { + heads = geometry.heads; + sectors = geometry.sectors; +diff -rNu fdisksgilabel.h fdisksgilabel.h +--- fdisksgilabel.h Tue Feb 20 12:26:53 2001 ++++ fdisksgilabel.h Fri Jun 20 19:25:55 2003 +@@ -1,4 +1,3 @@ +-#include /* for __u32 etc */ + /* + * Copyright (C) Andreas Neuper, Sep 1998. + * This file may be modified and redistributed under +diff -rNu fdisksunlabel.c fdisksunlabel.c +--- fdisksunlabel.c Fri Nov 1 03:55:25 2002 ++++ fdisksunlabel.c Fri Jun 20 19:25:55 2003 +@@ -16,18 +16,18 @@ + #include /* write */ + #include /* ioctl */ + #include /* stat */ +-#include /* major */ ++//#include /* major */ + + #include "nls.h" + +-#include +-#include "../defines.h" /* for HAVE_scsi_h */ ++#include ++//#include "../defines.h" /* for HAVE_scsi_h */ + #ifdef HAVE_scsi_h + #define u_char unsigned char + #include /* SCSI_IOCTL_GET_IDLUN */ + #undef u_char + #endif +-#include /* FLOPPY_MAJOR */ ++//#include /* FLOPPY_MAJOR */ + + #include "common.h" + #include "fdisk.h" +@@ -71,6 +71,7 @@ + return SSWAP32(p.num_sectors); + } + ++#if 0 + #ifndef IDE0_MAJOR + #define IDE0_MAJOR 3 + #endif +@@ -97,6 +98,7 @@ + floppy = 0; + } + } ++#endif + + static void + set_sun_partition(int i, uint start, uint stop, int sysid) { +@@ -296,11 +298,7 @@ + } + } + if (!p || floppy) { +-#ifdef HDIO_REQ +- if (!ioctl(fd, HDIO_REQ, &geometry)) { +-#else +- if (!ioctl(fd, HDIO_GETGEO, &geometry)) { +-#endif ++ if (!sys_bsd_getgeometry(fd, &geometry)) { + heads = geometry.heads; + sectors = geometry.sectors; + cylinders = geometry.cylinders; +diff -rNu fdisksunlabel.h fdisksunlabel.h +--- fdisksunlabel.h Tue Oct 3 00:42:10 2000 ++++ fdisksunlabel.h Fri Jun 20 19:25:55 2003 +@@ -1,4 +1,3 @@ +-#include /* for __u16, __u32 */ + + typedef struct { + unsigned char info[128]; /* Informative text string */ +diff -rNu nls.h nls.h +--- nls.h Thu Jan 1 03:00:00 1970 ++++ nls.h Fri Jun 20 19:25:55 2003 +@@ -0,0 +1,2 @@ ++#define _(x) (x) ++#define N_(x) (x) +diff -rNu partname.c partname.c +--- partname.c Sun Jul 7 15:16:43 2002 ++++ partname.c Fri Jun 20 19:25:55 2003 +@@ -21,14 +21,16 @@ + p = ""; + + if (isdigit(dev[w-1])) +- p = "p"; ++ p = "s"; + ++#if 0 + /* devfs kludge - note: fdisk partition names are not supposed + to equal kernel names, so there is no reason to do this */ + if (strcmp (dev + w - 4, "disc") == 0) { + w -= 4; + p = "part"; + } ++#endif + + wp = strlen(p); + +diff -rNu sfdisk.8 sfdisk.8 +--- sfdisk.8 Fri Jun 20 20:37:34 2003 ++++ sfdisk.8 Fri Jun 20 20:43:24 2003 +@@ -9,9 +9,9 @@ + .SH NAME + sfdisk \- Partition table manipulator for Linux + .SH SYNOPSIS +-.BR sfdisk " [options] device" ++.BR sfdisk-linux " [options] device" + .br +-.BR "sfdisk \-s " [partition] ++.BR "sfdisk-linux \-s " [partition] + .SH DESCRIPTION + .B sfdisk + has four (main) uses: list the size of a partition, list the partitions +@@ -19,7 +19,7 @@ + repartition a device. + + .SS "List Sizes" +-.BI "sfdisk \-s " partition ++.BI "sfdisk-linux \-s " partition + gives the size of + .I partition + in blocks. This may be useful in connection with programs like +@@ -27,16 +27,16 @@ + or so. Here + .I partition + is usually something like +-.I /dev/hda1 ++.I /dev/ad0s1 + or +-.IR /dev/sdb12 , ++.IR /dev/da2s12 , + but may also be an entire disk, like +-.IR /dev/xda . ++.IR /dev/amrd0 . + .br + .RS + .nf + .if t .ft CW +-% sfdisk \-s /dev/hda9 ++% sfdisk-linux \-s /dev/ad0s9 + 81599 + % + .if t .ft R +@@ -49,12 +49,12 @@ + .RS + .nf + .if t .ft CW +-% sfdisk \-s +-/dev/hda: 208896 +-/dev/hdb: 1025136 +-/dev/hdc: 1031063 +-/dev/sda: 8877895 +-/dev/sdb: 1758927 ++% sfdisk-linux \-s ++/dev/ad0: 208896 ++/dev/ad1: 1025136 ++/dev/ad2: 1031063 ++/dev/da0: 8877895 ++/dev/da1: 1758927 + total: 12901917 blocks + % + .if t .ft R +@@ -70,16 +70,16 @@ + .br + .nf + .if t .ft CW +-% sfdisk \-l /dev/hdc ++% sfdisk-linux \-l /dev/ad2 + +-Disk /dev/hdc: 16 heads, 63 sectors, 2045 cylinders ++Disk /dev/ad2: 16 heads, 63 sectors, 2045 cylinders + Units = cylinders of 516096 bytes, blocks of 1024 bytes, counting from 0 + + Device Boot Start End #cyls #blocks Id System +-/dev/hdc1 0+ 406 407\- 205096+ 83 Linux native +-/dev/hdc2 407 813 407 205128 83 Linux native +-/dev/hdc3 814 2044 1231 620424 83 Linux native +-/dev/hdc4 0 \- 0 0 0 Empty ++/dev/ad2s1 0+ 406 407\- 205096+ 83 Linux native ++/dev/ad2s2 407 813 407 205128 83 Linux native ++/dev/ad2s3 814 2044 1231 620424 83 Linux native ++/dev/ad2s4 0 \- 0 0 0 Empty + % + .if t .ft R + .fi +@@ -89,17 +89,17 @@ + + .SS "Check partitions" + The third type of invocation: +-.BI "sfdisk \-V " device ++.BI "sfdisk-linux \-V " device + will apply various consistency checks to the partition tables on + .IR device . + It prints `OK' or complains. The \-V option can be used together + with \-l. In a shell script one might use +-.BI "sfdisk \-V \-q " device ++.BI "sfdisk-linux \-V \-q " device + which only returns a status. + + .SS "Create partitions" + The fourth type of invocation: +-.BI "sfdisk " device ++.BI "sfdisk-linux " device + will cause + .B sfdisk + to read the specification for the desired partitioning of +@@ -119,7 +119,7 @@ + .RS + .nf + .if t .ft CW +-% sfdisk /dev/hdd \-O hdd-partition-sectors.save ++% sfdisk-linux /dev/ad3 \-O ad3-partition-sectors.save + \&... + % + .if t .ft R +@@ -132,7 +132,7 @@ + .RS + .nf + .if t .ft CW +-% sfdisk /dev/hdd \-I hdd-partition-sectors.save ++% sfdisk-linux /dev/ad3 \-I ad3-partition-sectors.save + % + .if t .ft R + .fi +@@ -176,8 +176,8 @@ + .br + .nf + .if t .ft CW +- % sfdisk -d /dev/hda > hda.out +- % sfdisk /dev/hda < hda.out ++ % sfdisk-linux -d /dev/ad0 > ad0.out ++ % sfdisk-linux /dev/ad0 < ad0.out + .if t .ft R + .fi + will correct the bad last extended partition that the OS/2 +@@ -194,14 +194,14 @@ + .br + .nf + .if t .ft CW +- % sfdisk /dev/hdb \-N5 ++ % sfdisk-linux /dev/ad1 \-N5 + ,,,* + % + .if t .ft R + .fi +-will make the fifth partition on /dev/hdb bootable (`active') ++will make the fifth partition on /dev/ad1 bootable (`active') + and change nothing else. (Probably this fifth partition +-is called /dev/hdb5, but you are free to call it something else, ++is called /dev/ad1s5, but you are free to call it something else, + like `/my_equipment/disks/2/5' or so). + .TP + .BI \-A "number" +@@ -216,13 +216,13 @@ + .br + .nf + .if t .ft CW +- % sfdisk --print-id /dev/hdb 5 ++ % sfdisk-linux --print-id /dev/ad1 5 + 6 +- % sfdisk --change-id /dev/hdb 5 83 ++ % sfdisk-linux --change-id /dev/ad1 5 83 + OK + .if t .ft R + .fi +-first reports that /dev/hdb5 has Id 6, and then changes that into 83. ++first reports that /dev/ad1s5 has Id 6, and then changes that into 83. + .TP + .BR \-uS " or " \-uB " or " \-uC " or " \-uM + Accept or report in units of sectors (blocks, cylinders, megabytes, +@@ -420,7 +420,7 @@ + .RS + .nf + .if t .ft CW +-sfdisk /dev/hdc << EOF ++sfdisk-linux /dev/ad2 << EOF + 0,407 + ,407 + ; +@@ -429,7 +429,7 @@ + .if t .ft R + .fi + .RE +-will partition /dev/hdc just as indicated above. ++will partition /dev/ad2 just as indicated above. + + With the \-x option, the number of input lines must be a multiple of 4: + you have to list the two empty partitions that you never want +@@ -456,9 +456,9 @@ + .B dd + to zero the first 512 bytes of that partition before using DOS FORMAT to + format the partition. For example, if you were using sfdisk to make a DOS +-partition table entry for /dev/hda1, then (after exiting sfdisk and ++partition table entry for /dev/ad0s1, then (after exiting sfdisk and + rebooting Linux so that the partition table information is valid) you +-would use the command "dd if=/dev/zero of=/dev/hda1 bs=512 count=1" to zero ++would use the command "dd if=/dev/zero of=/dev/ad0s1 bs=512 count=1" to zero + the first 512 bytes of the partition. + .B BE EXTREMELY CAREFUL + if you use the +@@ -508,7 +508,7 @@ + + .SH BUGS + A corresponding interactive +-.B cfdisk ++.B cfdisk-linux + (with curses interface) is still lacking. + .LP + There are too many options. +@@ -519,7 +519,7 @@ + A. E. Brouwer (aeb@cwi.nl) + + .SH "SEE ALSO" +-.BR cfdisk (8), ++.BR cfdisk-linux (8), ++.BR fdisk-linux (8), + .BR fdisk (8), +-.BR mkfs (8), +-.BR parted (8) ++.BR newfs (8) +diff -rNu cfdisk.8 cfdisk.8 +--- cfdisk.8 Sun Jul 7 15:28:27 2002 ++++ cfdisk.8 Fri Jun 20 20:57:52 2003 +@@ -15,7 +15,7 @@ + .SH NAME + cfdisk \- Curses based disk partition table manipulator for Linux + .SH SYNOPSIS +-.BI "cfdisk [ \-agvz ] [ \-c " cylinders " ] [ \-h " heads " ]" ++.BI "cfdisk-linux [ \-agvz ] [ \-c " cylinders " ] [ \-h " heads " ]" + .BI "[ \-s " sectors-per-track " ] [ -P " opt " ] [ " device " ]" + .SH DESCRIPTION + .B cfdisk +@@ -26,12 +26,10 @@ + .sp + .nf + .RS +-/dev/hda [default] +-/dev/hdb +-/dev/sda +-/dev/sdb +-/dev/sdc +-/dev/sdd ++/dev/ad0 [default] ++/dev/ad1 ++/dev/da0 ++/dev/da1 + .RE + .fi + +@@ -132,9 +130,9 @@ + .B dd + to zero the first 512 bytes of that partition before using DOS FORMAT to + format the partition. For example, if you were using cfdisk to make a DOS +-partition table entry for /dev/hda1, then (after exiting fdisk or cfdisk ++partition table entry for /dev/ad0s1, then (after exiting fdisk or cfdisk + and rebooting Linux so that the partition table information is valid) you +-would use the command "dd if=/dev/zero of=/dev/hda1 bs=512 count=1" to zero ++would use the command "dd if=/dev/zero of=/dev/ad0s1 bs=512 count=1" to zero + the first 512 bytes of the partition. Note: + + .B BE EXTREMELY CAREFUL +@@ -418,10 +416,10 @@ + 0: No errors; 1: Invocation error; 2: I/O error; + 3: cannot get geometry; 4: bad partition table on disk. + .SH "SEE ALSO" ++.BR fdisk-linux (8), ++.BR newfs (8), + .BR fdisk (8), +-.BR mkfs (8), +-.BR parted (8), +-.BR sfdisk (8) ++.BR sfdisk-linux (8) + .SH BUGS + The current version does not support multiple disks. + .SH AUTHOR +diff -rNu fdisk.8 fdisk.8 +--- fdisk.8 Tue Aug 6 17:33:33 2002 ++++ fdisk.8 Fri Jun 20 21:01:24 2003 +@@ -5,14 +5,14 @@ + .SH NAME + fdisk \- Partition table manipulator for Linux + .SH SYNOPSIS +-.BI "fdisk [\-u] [\-b " sectorsize ] ++.BI "fdisk-linux [\-u] [\-b " sectorsize ] + .BI "[\-C " cyls "] [\-H " heads "] [\-S " sects "] " device + .sp +-.BI "fdisk \-l [\-u] [" "device ..." ] ++.BI "fdisk-linux \-l [\-u] [" "device ..." ] + .sp +-.BI "fdisk \-s " "partition ..." ++.BI "fdisk-linux \-s " "partition ..." + .sp +-.BI "fdisk \-v ++.BI "fdisk-linux \-v + .SH DESCRIPTION + Hard disks can be divided into one or more logical disks called + .IR partitions . +@@ -48,26 +48,22 @@ + .br + .nf + .RS +-/dev/hda +-/dev/hdb +-/dev/sda +-/dev/sdb ++/dev/ad0 ++/dev/ad1 ++/dev/da0 ++/dev/da1 + .RE + .fi +-(/dev/hd[a-h] for IDE disks, /dev/sd[a-p] for SCSI disks, +-/dev/ed[a-d] for ESDI disks, /dev/xd[ab] for XT disks). ++(/dev/adN for IDE disks, /dev/daN for SCSI disks, N=0,1,2...) + A device name refers to the entire disk. + + The + .I partition + is a + .I device +-name followed by a partition number. For example, +-.B /dev/hda1 ++name followed by 's' and a partition number. For example, ++.B /dev/ad0s1 + is the first partition on the first IDE hard disk in the system. +-IDE disks can have up to 63 partitions, SCSI disks up to 15. +-See also +-.IR /usr/src/linux/Documentation/devices.txt . + + A BSD/SUN type disklabel can describe 8 partitions, + the third of which should be a `whole disk' partition. +@@ -132,7 +128,7 @@ + Partitions beginning in cylinder 1 cannot begin on a cylinder boundary, but + this is unlikely to cause difficulty unless you have OS/2 on your machine. + +-A sync() and a BLKRRPART ioctl() (reread partition table from disk) ++A sync() and a sys_bsd_ptsync() (reread partition table from disk) + are performed before exiting when the partition table has been updated. + Long ago it used to be necessary to reboot after the use of fdisk. + I do not think this is the case anymore - indeed, rebooting too quickly +@@ -242,7 +238,7 @@ + .\" Andreas Neuper (ANeuper@GUUG.de) + .\" and many others. + .SH "SEE ALSO" +-.BR cfdisk (8), +-.BR mkfs (8), +-.BR parted (8), +-.BR sfdisk (8) ++.BR cfdisk_linux (8), ++.BR newfs (8), ++.BR fdisk (8), ++.BR sfdisk_linux (8) +diff -rNu sfdisk.c sfdisk.c +--- sfdisk.c Tue Jan 28 20:18:03 2003 ++++ sfdisk.c Tue Jun 24 01:10:28 2003 +@@ -42,11 +42,9 @@ + #include /* ERANGE */ + #include /* index() */ + #include +-#include ++#include "getopt.h" + #include + #include +-#include +-#include /* _syscall */ + #include "nls.h" + #include "common.h" + +@@ -130,23 +128,14 @@ + * + * Note: we use 512-byte sectors here, irrespective of the hardware ss. + */ +-#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) +-static +-_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo, +- loff_t *, res, uint, wh); +-#endif + + static int + sseek(char *dev, unsigned int fd, unsigned long s) { +- loff_t in, out; +- in = ((loff_t) s << 9); ++ off_t in, out; ++ in = ((off_t) s << 9); + out = 1; + +-#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) +- if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0) { +-#else + if ((out = lseek(fd, in, SEEK_SET)) != in) { +-#endif + perror("llseek"); + error(_("seek error on %s - cannot seek to %lu\n"), dev, s); + return 0; +@@ -399,12 +388,13 @@ + long size; + struct geometry R; + +- if (ioctl(fd, BLKGETSIZE, &size)) { ++ if (sys_bsd_getsectors(fd, (unsigned long*) &size)) { + size = 0; + if (!silent) + printf(_("Disk %s: cannot get size\n"), dev); + } +- if (ioctl(fd, HDIO_GETGEO, &g)) { ++ g.start = 0; /* XXX ?????????? */ ++ if (sys_bsd_getgeometry(fd, &g)) { + g.heads = g.sectors = g.cylinders = g.start = 0; + if (!silent) + printf(_("Disk %s: cannot get geometry\n"), dev); +@@ -721,8 +711,8 @@ + /* tell the kernel to reread the partition tables */ + static int + reread_ioctl(int fd) { +- if(ioctl(fd, BLKRRPART)) { +- perror("BLKRRPART"); ++ if(sys_bsd_ptsync(fd)) { ++ perror("sys_bsd_ptsync"); + return -1; + } + return 0; +@@ -1428,22 +1418,6 @@ + z->partno = pno; + } + +-#define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) +- +-static int +-linux_version_code(void) { +- struct utsname my_utsname; +- int p, q, r; +- +- if (uname(&my_utsname) == 0) { +- p = atoi(strtok(my_utsname.release, ".")); +- q = atoi(strtok(NULL, ".")); +- r = atoi(strtok(NULL, ".")); +- return MAKE_VERSION(p,q,r); +- } +- return 0; +-} +- + static int + msdos_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) { + int i; +@@ -1452,7 +1426,10 @@ + struct sector *s; + struct part_desc *partitions = &(z->partitions[0]); + int pno = z->partno; +- int bsd_later = (linux_version_code() >= MAKE_VERSION(2,3,40)); ++ /* Under FreeBSD, "bsd later" is always true because BSD partitions ++ * in MBR or MBREXT partitions doesn't be listed immediately. ++ */ ++ int bsd_later = 1; + + if (!(s = get_sector(dev, fd, start))) + return 0; +@@ -1501,6 +1478,8 @@ + } + extended_partition(dev, fd, &partitions[i], z); + } ++#if 0 ++/* FreeBSD port: don't count partitions as they won't be list as slices */ + if (!bsd_later && is_bsd(partitions[i].p.sys_type)) { + if (!partitions[i].size) { + printf(_("strange..., a BSD partition of size 0?\n")); +@@ -1508,8 +1487,11 @@ + } + bsd_partition(dev, fd, &partitions[i], z); + } ++#endif + } + ++#if 0 ++/* FreeBSD port: don't count partitions as they won't be list as slices */ + if (bsd_later) { + for (i=0; i<4; i++) { + if (is_bsd(partitions[i].p.sys_type)) { +@@ -1521,6 +1503,7 @@ + } + } + } ++#endif + + return 1; + } +@@ -2413,9 +2396,11 @@ + char *activatearg = 0; + char *unhidearg = 0; + ++#if 0 + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); ++#endif + + if (argc < 1) + fatal(_("no command?\n")); +@@ -2668,10 +2653,10 @@ + if (fd < 0) + return; + +- if(ioctl(fd, BLKGETSIZE, &size)) { ++ if(sys_bsd_getsectors(fd, (unsigned long*) &size)) { + if(!silent) { + perror(dev); +- fatal(_("BLKGETSIZE ioctl failed for %s\n"), dev); ++ fatal(_("sys_bsd_getsectors() failed for %s\n"), dev); + } + return; + } Property changes on: head/sysutils/linuxfdisk/files/patch-FreeBSD ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/lmmon/files/patch-aa =================================================================== --- head/sysutils/lmmon/files/patch-aa (revision 363334) +++ head/sysutils/lmmon/files/patch-aa (nonexistent) @@ -1,12 +0,0 @@ ---- Makefile.in.orig Sun Aug 6 21:31:45 2000 -+++ Makefile.in Sun Aug 6 21:32:10 2000 -@@ -3,6 +3,9 @@ - DEFINES+= -DHAVE_CONFIG_H - CFLAGS+= -Wall $(DEFINES) - LDFLAGS+= -lcurses -+.if $(ARCH) == "alpha" -+LDFLAGS+= -lio -+.endif - - HEADERS= lmmon.h - SRCS= lmmon.c Property changes on: head/sysutils/lmmon/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/lmmon/files/patch-Makefile.in =================================================================== --- head/sysutils/lmmon/files/patch-Makefile.in (nonexistent) +++ head/sysutils/lmmon/files/patch-Makefile.in (revision 363335) @@ -0,0 +1,12 @@ +--- Makefile.in.orig Sun Aug 6 21:31:45 2000 ++++ Makefile.in Sun Aug 6 21:32:10 2000 +@@ -3,6 +3,9 @@ + DEFINES+= -DHAVE_CONFIG_H + CFLAGS+= -Wall $(DEFINES) + LDFLAGS+= -lcurses ++.if $(ARCH) == "alpha" ++LDFLAGS+= -lio ++.endif + + HEADERS= lmmon.h + SRCS= lmmon.c Property changes on: head/sysutils/lmmon/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/logtool/files/patch-ab =================================================================== --- head/sysutils/logtool/files/patch-ab (revision 363334) +++ head/sysutils/logtool/files/patch-ab (nonexistent) @@ -1,10 +0,0 @@ ---- logtool/includes.h.orig Wed Jan 10 04:18:00 2001 -+++ src/includes.h Wed Jan 10 04:20:00 2001 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - Property changes on: head/sysutils/logtool/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/logtool/files/patch-src__includes.h =================================================================== --- head/sysutils/logtool/files/patch-src__includes.h (nonexistent) +++ head/sysutils/logtool/files/patch-src__includes.h (revision 363335) @@ -0,0 +1,10 @@ +--- logtool/includes.h.orig Wed Jan 10 04:18:00 2001 ++++ src/includes.h Wed Jan 10 04:20:00 2001 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + Property changes on: head/sysutils/logtool/files/patch-src__includes.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/mgeupsd/files/patch-aa =================================================================== --- head/sysutils/mgeupsd/files/patch-aa (revision 363334) +++ head/sysutils/mgeupsd/files/patch-aa (nonexistent) @@ -1,47 +0,0 @@ ---- mgeupsd.c.old Sat Dec 26 02:42:52 1998 -+++ mgeupsd.c Sat Mar 17 23:59:09 2001 -@@ -33,9 +33,9 @@ - #define BS_TDP 12 - - /* status file for init */ --#define PWRFILE "/etc/powerstatus" -+#define PWRFILE "/var/run/powerstatus" - /* Linux usual */ --#define LOCKDIR "/var/lock" -+#define LOCKDIR "/var/run" - #define RUNDIR "/var/run" - char lockfile[40] = {0,}; - char pidfile[40] = {0,}; -@@ -640,7 +640,7 @@ - else - { - #ifndef TEST -- if (kill (init_pid, SIGPWR)) -+ if (kill (init_pid, SIGUSR2)) - syslog (LOG_CRIT, "Process %u doesn not exist! Can't send SIGPWR", init_pid); - #endif - } -@@ -677,7 +677,7 @@ - else - { - #ifndef TEST -- if (kill (init_pid, SIGPWR)) -+ if (kill (init_pid, SIGINT)) - syslog (LOG_CRIT, "Process %u doesn not exist! Can't send SIGPWR", init_pid); - #endif - } -@@ -711,7 +711,7 @@ - else - { - #ifndef TEST -- if (kill (init_pid, SIGPWR)) -+ if (kill (init_pid, SIGHUP)) - syslog (LOG_CRIT, "Process %u doesn not exist! Can't send SIGPWR", init_pid); - #endif - } -@@ -758,4 +758,5 @@ - } - } /* while(1) */ - } -+ return 0; - } Property changes on: head/sysutils/mgeupsd/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/mgeupsd/files/patch-ab =================================================================== --- head/sysutils/mgeupsd/files/patch-ab (revision 363334) +++ head/sysutils/mgeupsd/files/patch-ab (nonexistent) @@ -1,13 +0,0 @@ ---- Makefile.orig 1998-12-25 17:10:57.000000000 +0800 -+++ Makefile 2013-11-15 23:04:20.000000000 +0800 -@@ -8,8 +8,8 @@ mgeupsd: mgeupsd.o - $(CC) $(LDFLAGS) -o $@ $< - - install: mgeupsd -- install mgeupsd /sbin -- install mgeupsd.8 /usr/man/man8 -+ install -c mgeupsd $(DESTDIR)${PREFIX}/sbin -+ install -c mgeupsd.8 $(DESTDIR)${PREFIX}/man/man8 - - clean: - rm -f *.o mgeupsd Property changes on: head/sysutils/mgeupsd/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/mgeupsd/files/patch-Makefile =================================================================== --- head/sysutils/mgeupsd/files/patch-Makefile (nonexistent) +++ head/sysutils/mgeupsd/files/patch-Makefile (revision 363335) @@ -0,0 +1,13 @@ +--- Makefile.orig 1998-12-25 17:10:57.000000000 +0800 ++++ Makefile 2013-11-15 23:04:20.000000000 +0800 +@@ -8,8 +8,8 @@ mgeupsd: mgeupsd.o + $(CC) $(LDFLAGS) -o $@ $< + + install: mgeupsd +- install mgeupsd /sbin +- install mgeupsd.8 /usr/man/man8 ++ install -c mgeupsd $(DESTDIR)${PREFIX}/sbin ++ install -c mgeupsd.8 $(DESTDIR)${PREFIX}/man/man8 + + clean: + rm -f *.o mgeupsd Property changes on: head/sysutils/mgeupsd/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/mgeupsd/files/patch-mgeupsd.c =================================================================== --- head/sysutils/mgeupsd/files/patch-mgeupsd.c (nonexistent) +++ head/sysutils/mgeupsd/files/patch-mgeupsd.c (revision 363335) @@ -0,0 +1,47 @@ +--- mgeupsd.c.old Sat Dec 26 02:42:52 1998 ++++ mgeupsd.c Sat Mar 17 23:59:09 2001 +@@ -33,9 +33,9 @@ + #define BS_TDP 12 + + /* status file for init */ +-#define PWRFILE "/etc/powerstatus" ++#define PWRFILE "/var/run/powerstatus" + /* Linux usual */ +-#define LOCKDIR "/var/lock" ++#define LOCKDIR "/var/run" + #define RUNDIR "/var/run" + char lockfile[40] = {0,}; + char pidfile[40] = {0,}; +@@ -640,7 +640,7 @@ + else + { + #ifndef TEST +- if (kill (init_pid, SIGPWR)) ++ if (kill (init_pid, SIGUSR2)) + syslog (LOG_CRIT, "Process %u doesn not exist! Can't send SIGPWR", init_pid); + #endif + } +@@ -677,7 +677,7 @@ + else + { + #ifndef TEST +- if (kill (init_pid, SIGPWR)) ++ if (kill (init_pid, SIGINT)) + syslog (LOG_CRIT, "Process %u doesn not exist! Can't send SIGPWR", init_pid); + #endif + } +@@ -711,7 +711,7 @@ + else + { + #ifndef TEST +- if (kill (init_pid, SIGPWR)) ++ if (kill (init_pid, SIGHUP)) + syslog (LOG_CRIT, "Process %u doesn not exist! Can't send SIGPWR", init_pid); + #endif + } +@@ -758,4 +758,5 @@ + } + } /* while(1) */ + } ++ return 0; + } Property changes on: head/sysutils/mgeupsd/files/patch-mgeupsd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/monitord/files/patch-ab =================================================================== --- head/sysutils/monitord/files/patch-ab (revision 363334) +++ head/sysutils/monitord/files/patch-ab (nonexistent) @@ -1,29 +0,0 @@ ---- monitord.c.orig 2003-01-16 21:39:44.000000000 +0000 -+++ monitord.c 2011-11-24 23:12:13.468148722 +0000 -@@ -85,8 +85,8 @@ - setsid (); - break; - } -- default: -- exit(1); -+ default: // The parent exits -+ exit(0); - } - - /* Read the configuration file, saving it in *file[] and return the number of lines -@@ -454,13 +454,13 @@ - - struct timeval *tp; - struct timezone *tzp; -- const time_t *time; -+ time_t *time; - char *buf; - - buf = (char *) malloc ( (size_t) _BUFSIZE ); // init the time buffer - tp = (struct timeval *) malloc ( (size_t) sizeof (struct timeval) ); // init the time buffer - tzp = (struct timezone *) malloc ( (size_t) sizeof (struct timezone) ); // init the timezone buffer -- time = (const time_t *) malloc ( (size_t) sizeof (time_t) ); // init the timezone buffer -+ time = (time_t *) malloc ( (size_t) sizeof (time_t) ); // init the timezone buffer - - /* Get time of day in seconds since Epoch */ - gettimeofday (tp, tzp); Property changes on: head/sysutils/monitord/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/monitord/files/patch-monitord.c =================================================================== --- head/sysutils/monitord/files/patch-monitord.c (nonexistent) +++ head/sysutils/monitord/files/patch-monitord.c (revision 363335) @@ -0,0 +1,29 @@ +--- monitord.c.orig 2003-01-16 21:39:44.000000000 +0000 ++++ monitord.c 2011-11-24 23:12:13.468148722 +0000 +@@ -85,8 +85,8 @@ + setsid (); + break; + } +- default: +- exit(1); ++ default: // The parent exits ++ exit(0); + } + + /* Read the configuration file, saving it in *file[] and return the number of lines +@@ -454,13 +454,13 @@ + + struct timeval *tp; + struct timezone *tzp; +- const time_t *time; ++ time_t *time; + char *buf; + + buf = (char *) malloc ( (size_t) _BUFSIZE ); // init the time buffer + tp = (struct timeval *) malloc ( (size_t) sizeof (struct timeval) ); // init the time buffer + tzp = (struct timezone *) malloc ( (size_t) sizeof (struct timezone) ); // init the timezone buffer +- time = (const time_t *) malloc ( (size_t) sizeof (time_t) ); // init the timezone buffer ++ time = (time_t *) malloc ( (size_t) sizeof (time_t) ); // init the timezone buffer + + /* Get time of day in seconds since Epoch */ + gettimeofday (tp, tzp); Property changes on: head/sysutils/monitord/files/patch-monitord.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/most/files/patch-aa =================================================================== --- head/sysutils/most/files/patch-aa (revision 363334) +++ head/sysutils/most/files/patch-aa (nonexistent) @@ -1,29 +0,0 @@ ---- src/Makefile.in Fri Dec 20 23:32:56 2002 -+++ src/Makefile.in Wed Mar 10 17:11:10 2004 -@@ -22,5 +22,5 @@ - BIN_DIR = $(prefix)/bin - MAN_DIR = $(prefix)/man --DOC_DIR = $(prefix)/doc/most -+DOC_DIR = $(prefix)/share/doc/most - SYS_INITFILE = @sysconfdir@/most.conf - MKINSDIR = ../autoconf/mkinsdir.sh -@@ -69,5 +69,7 @@ - /bin/rm -rf $(OBJDIR) Makefile sysconf.h - installdirs: -+.if !defined(NOPORTDOCS) - $(MKINSDIR) $(DEST_DOCDIR) -+.endif - $(MKINSDIR) $(DEST_MANDIR)/man1 - $(MKINSDIR) $(DEST_BINDIR) -@@ -75,4 +77,5 @@ - $(INSTALL) -s $(OBJDIR)/most $(DEST_BINDIR) - $(INSTALL_DATA) ../most.1 $(DEST_MANDIR)/man1 -+.if !defined(NOPORTDOCS) - @for i in $(DOC_FILES); \ - do \ -@@ -84,4 +87,5 @@ - fi; \ - done -+.endif - # The symlinks target is for my own private use. It simply creates the object - # directory as a symbolic link to a local disk instead of an NFS mounted one. Property changes on: head/sysutils/most/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/most/files/patch-src__Makefile.in =================================================================== --- head/sysutils/most/files/patch-src__Makefile.in (nonexistent) +++ head/sysutils/most/files/patch-src__Makefile.in (revision 363335) @@ -0,0 +1,29 @@ +--- src/Makefile.in Fri Dec 20 23:32:56 2002 ++++ src/Makefile.in Wed Mar 10 17:11:10 2004 +@@ -22,5 +22,5 @@ + BIN_DIR = $(prefix)/bin + MAN_DIR = $(prefix)/man +-DOC_DIR = $(prefix)/doc/most ++DOC_DIR = $(prefix)/share/doc/most + SYS_INITFILE = @sysconfdir@/most.conf + MKINSDIR = ../autoconf/mkinsdir.sh +@@ -69,5 +69,7 @@ + /bin/rm -rf $(OBJDIR) Makefile sysconf.h + installdirs: ++.if !defined(NOPORTDOCS) + $(MKINSDIR) $(DEST_DOCDIR) ++.endif + $(MKINSDIR) $(DEST_MANDIR)/man1 + $(MKINSDIR) $(DEST_BINDIR) +@@ -75,4 +77,5 @@ + $(INSTALL) -s $(OBJDIR)/most $(DEST_BINDIR) + $(INSTALL_DATA) ../most.1 $(DEST_MANDIR)/man1 ++.if !defined(NOPORTDOCS) + @for i in $(DOC_FILES); \ + do \ +@@ -84,4 +87,5 @@ + fi; \ + done ++.endif + # The symlinks target is for my own private use. It simply creates the object + # directory as a symbolic link to a local disk instead of an NFS mounted one. Property changes on: head/sysutils/most/files/patch-src__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/paicc/files/patch-aa =================================================================== --- head/sysutils/paicc/files/patch-aa (revision 363334) +++ head/sysutils/paicc/files/patch-aa (nonexistent) @@ -1,47 +0,0 @@ ---- Makefile.orig Mon Sep 2 19:13:20 1996 -+++ Makefile Sat Apr 28 16:34:34 2001 -@@ -13,8 +13,8 @@ - # 3) make install - --BIN=/usr/local/bin --MAN=/usr/local/man --CC=cc -O --SHELL=/bin/sh -+#BIN=/usr/local/bin -+#MAN=/usr/local/man -+#CC=cc -O -+#SHELL=/bin/sh - - -@@ -22,5 +22,5 @@ - all: - @echo "Making PAICC ..." -- @make paicc CFLAGS=" -O" LFLAGS=" -lcurses" -+ @make paicc CFLAGS="${CFLAGS}" LFLAGS=" -lcurses" - - clean: -@@ -35,5 +35,5 @@ - evap.o: evap/evap.h evap/evap.c - @echo ' making evap.o ...' -- $(CC) -DP_EVAP_MM_PATH=\"$(BIN)/paiccmm.a\" -c $$CFLAGS evap/evap.c -+ $(CC) -DP_EVAP_MM_PATH=\"$(PREFIX)/libdata/paiccmm.a\" -c $$CFLAGS evap/evap.c - - paicc.o: paicc.c evap.o evap/evap.h evap/paicc_pdt_out -@@ -47,14 +47,10 @@ - cp paicc $(BIN)/paicc - chmod 755 $(BIN)/paicc -- -rm -fr $(BIN)/paint_changed_characters -- -ln -s $(BIN)/paicc $(BIN)/paint_changed_characters - @echo "Updating message module archive $(BIN)/paiccmm.a ..." -- ar rcv $(BIN)/paiccmm.a evap/*.mm -- ranlib $(BIN)/paiccmm.a -- chmod 755 $(BIN)/paiccmm.a -+ ar rcv $(DATA)/paiccmm.a evap/*.mm -+ ranlib $(DATA)/paiccmm.a -+ chmod 755 $(DATA)/paiccmm.a - cp paicc.1 $(MAN)/man1/paicc.1 - chmod 755 $(MAN)/man1/paicc.1 -- -rm -fr $(MAN)/man1/paint_changed_characters.1 -- -ln -s $(MAN)/man1/paicc.1 $(MAN)/man1/paint_changed_characters.1 - - # Unix flavor-dependent section! Property changes on: head/sysutils/paicc/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/paicc/files/patch-ab =================================================================== --- head/sysutils/paicc/files/patch-ab (revision 363334) +++ head/sysutils/paicc/files/patch-ab (nonexistent) @@ -1,10 +0,0 @@ ---- evap/evap.c.dist Sun Aug 25 08:36:46 1996 -+++ evap/evap.c Sat Apr 28 16:24:54 2001 -@@ -19,7 +19,6 @@ - - #include - #include --#include - #include - #include - #include Property changes on: head/sysutils/paicc/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/paicc/files/patch-ac =================================================================== --- head/sysutils/paicc/files/patch-ac (revision 363334) +++ head/sysutils/paicc/files/patch-ac (nonexistent) @@ -1,25 +0,0 @@ ---- paicc.c 1996-09-02 18:16:39.000000000 -0700 -+++ paicc.c 2014-05-10 19:41:55.568980139 -0700 -@@ -59,10 +59,14 @@ - - */ - -+#include - #include - #include - #include - #include -+#include -+#include -+#include - - #include "evap/evap.h" - #include "evap/paicc_pdt_out" -@@ -483,6 +487,7 @@ - - } /* end window_ini */ - -+int - main(argc, argv) - int argc; - char *argv[]; Property changes on: head/sysutils/paicc/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/paicc/files/patch-Makefile =================================================================== --- head/sysutils/paicc/files/patch-Makefile (nonexistent) +++ head/sysutils/paicc/files/patch-Makefile (revision 363335) @@ -0,0 +1,47 @@ +--- Makefile.orig Mon Sep 2 19:13:20 1996 ++++ Makefile Sat Apr 28 16:34:34 2001 +@@ -13,8 +13,8 @@ + # 3) make install + +-BIN=/usr/local/bin +-MAN=/usr/local/man +-CC=cc -O +-SHELL=/bin/sh ++#BIN=/usr/local/bin ++#MAN=/usr/local/man ++#CC=cc -O ++#SHELL=/bin/sh + + +@@ -22,5 +22,5 @@ + all: + @echo "Making PAICC ..." +- @make paicc CFLAGS=" -O" LFLAGS=" -lcurses" ++ @make paicc CFLAGS="${CFLAGS}" LFLAGS=" -lcurses" + + clean: +@@ -35,5 +35,5 @@ + evap.o: evap/evap.h evap/evap.c + @echo ' making evap.o ...' +- $(CC) -DP_EVAP_MM_PATH=\"$(BIN)/paiccmm.a\" -c $$CFLAGS evap/evap.c ++ $(CC) -DP_EVAP_MM_PATH=\"$(PREFIX)/libdata/paiccmm.a\" -c $$CFLAGS evap/evap.c + + paicc.o: paicc.c evap.o evap/evap.h evap/paicc_pdt_out +@@ -47,14 +47,10 @@ + cp paicc $(BIN)/paicc + chmod 755 $(BIN)/paicc +- -rm -fr $(BIN)/paint_changed_characters +- -ln -s $(BIN)/paicc $(BIN)/paint_changed_characters + @echo "Updating message module archive $(BIN)/paiccmm.a ..." +- ar rcv $(BIN)/paiccmm.a evap/*.mm +- ranlib $(BIN)/paiccmm.a +- chmod 755 $(BIN)/paiccmm.a ++ ar rcv $(DATA)/paiccmm.a evap/*.mm ++ ranlib $(DATA)/paiccmm.a ++ chmod 755 $(DATA)/paiccmm.a + cp paicc.1 $(MAN)/man1/paicc.1 + chmod 755 $(MAN)/man1/paicc.1 +- -rm -fr $(MAN)/man1/paint_changed_characters.1 +- -ln -s $(MAN)/man1/paicc.1 $(MAN)/man1/paint_changed_characters.1 + + # Unix flavor-dependent section! Property changes on: head/sysutils/paicc/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/paicc/files/patch-evap__evap.c =================================================================== --- head/sysutils/paicc/files/patch-evap__evap.c (nonexistent) +++ head/sysutils/paicc/files/patch-evap__evap.c (revision 363335) @@ -0,0 +1,10 @@ +--- evap/evap.c.dist Sun Aug 25 08:36:46 1996 ++++ evap/evap.c Sat Apr 28 16:24:54 2001 +@@ -19,7 +19,6 @@ + + #include + #include +-#include + #include + #include + #include Property changes on: head/sysutils/paicc/files/patch-evap__evap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/paicc/files/patch-paicc.c =================================================================== --- head/sysutils/paicc/files/patch-paicc.c (nonexistent) +++ head/sysutils/paicc/files/patch-paicc.c (revision 363335) @@ -0,0 +1,25 @@ +--- paicc.c 1996-09-02 18:16:39.000000000 -0700 ++++ paicc.c 2014-05-10 19:41:55.568980139 -0700 +@@ -59,10 +59,14 @@ + + */ + ++#include + #include + #include + #include + #include ++#include ++#include ++#include + + #include "evap/evap.h" + #include "evap/paicc_pdt_out" +@@ -483,6 +487,7 @@ + + } /* end window_ini */ + ++int + main(argc, argv) + int argc; + char *argv[]; Property changes on: head/sysutils/paicc/files/patch-paicc.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/pftop/files/patch-aa =================================================================== --- head/sysutils/pftop/files/patch-aa (revision 363334) +++ head/sysutils/pftop/files/patch-aa (nonexistent) @@ -1,23 +0,0 @@ -*** config.h.orig Sat Jan 21 04:39:55 2006 ---- config.h Sat Jan 21 04:40:15 2006 -*************** -*** 23,31 **** - - #if OS_LEVEL > 32 - #define HAVE_ADDR_MASK - #define HAVE_ADDR_TYPE -! #define HAVE_ALTQ - #define HAVE_RULE_TOS - #define HAVE_OP_RRG - #endif - ---- 23,31 ---- - - #if OS_LEVEL > 32 - #define HAVE_ADDR_MASK - #define HAVE_ADDR_TYPE -! /* #define HAVE_ALTQ */ - #define HAVE_RULE_TOS - #define HAVE_OP_RRG - #endif - Property changes on: head/sysutils/pftop/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/pftop/files/patch-config.h =================================================================== --- head/sysutils/pftop/files/patch-config.h (nonexistent) +++ head/sysutils/pftop/files/patch-config.h (revision 363335) @@ -0,0 +1,23 @@ +*** config.h.orig Sat Jan 21 04:39:55 2006 +--- config.h Sat Jan 21 04:40:15 2006 +*************** +*** 23,31 **** + + #if OS_LEVEL > 32 + #define HAVE_ADDR_MASK + #define HAVE_ADDR_TYPE +! #define HAVE_ALTQ + #define HAVE_RULE_TOS + #define HAVE_OP_RRG + #endif + +--- 23,31 ---- + + #if OS_LEVEL > 32 + #define HAVE_ADDR_MASK + #define HAVE_ADDR_TYPE +! /* #define HAVE_ALTQ */ + #define HAVE_RULE_TOS + #define HAVE_OP_RRG + #endif + Property changes on: head/sysutils/pftop/files/patch-config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/rtty/files/patch-aa =================================================================== --- head/sysutils/rtty/files/patch-aa (revision 363334) +++ head/sysutils/rtty/files/patch-aa (nonexistent) @@ -1,47 +0,0 @@ ---- Makefile.orig 2013-11-16 11:45:54.000000000 +0800 -+++ Makefile 2013-11-16 11:46:33.000000000 +0800 -@@ -19,12 +19,12 @@ VERSION = 4.0 - - VPATH = ../src - --DESTROOT = --DESTPATH = $(DESTROOT)/usr/local/rtty -+DESTROOT = ${PREFIX} -+DESTPATH = $(DESTROOT)/rtty - DESTBIN = $(DESTPATH)/bin - - #CC = cc --CDEBUG = -O -+#CDEBUG = -O - # - # use -U to undefine, -D to define - # DEBUG include code to help debug this software -@@ -37,7 +37,7 @@ CDEBUG = -O - CDEFS = -DDEBUG -UWANT_TCPIP -UNEED_BITYPES_H -UNEED_INET_ATON \ - -UNO_SOCKADDR_LEN -UNO_HSTRERROR - # --CFLAGS = $(CDEBUG) $(CDEFS) -I/usr/local/include -+CFLAGS += $(CDEBUG) $(CDEFS) - LIBS = -lcrypt - #(if WANT_TCPIP defined and this isn't in your libc) - # -lresolv -@@ -59,15 +59,15 @@ kit:; shar README Makefile *.c *.h *.sh - bin.tar:; tar cf bin.tar $(ALL) - - install: $(ALL) Makefile -- -set -x; test -d $(DESTPATH) || mkdir $(DESTPATH) -+ -set -x; test -d $(DESTDIR)$(DESTPATH) || mkdir $(DESTDIR)$(DESTPATH) - -set +e -x; for x in bin dev sock log pid opt out; do \ -- test -d $(DESTPATH)/$$x || mkdir $(DESTPATH)/$$x; \ -+ test -d $(DESTDIR)$(DESTPATH)/$$x || mkdir $(DESTDIR)$(DESTPATH)/$$x; \ - done - set -x; for x in $(BINARY); do \ -- install -c -m 111 $$x $(DESTBIN)/$$x; \ -+ install -c -s -m 111 $$x $(DESTDIR)$(DESTBIN)/$$x; \ - done - set -x; for x in $(SCRIPT); do \ -- install -c -m 555 $$x $(DESTBIN)/$$x; \ -+ install -c -m 555 $$x $(DESTDIR)$(DESTBIN)/$$x; \ - done - - ttysrv: ttysrv.o ttyprot.o connutil.o misc.o version.o Property changes on: head/sysutils/rtty/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/rtty/files/patch-ab =================================================================== --- head/sysutils/rtty/files/patch-ab (revision 363334) +++ head/sysutils/rtty/files/patch-ab (nonexistent) @@ -1,11 +0,0 @@ ---- startsrv.sh.orig Sat Nov 17 16:28:07 2001 -+++ startsrv.sh Sat Nov 17 16:28:19 2001 -@@ -19,7 +19,7 @@ - - default_options='-b 9600 -w 8 -p none' - default_sock_prot='ug=rw,o=' --default_sock_owner='root.wheel' -+default_sock_owner='root:wheel' - default_log_prot='u=rw,g=r,o=' - - for host Property changes on: head/sysutils/rtty/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/rtty/files/patch-Makefile =================================================================== --- head/sysutils/rtty/files/patch-Makefile (nonexistent) +++ head/sysutils/rtty/files/patch-Makefile (revision 363335) @@ -0,0 +1,47 @@ +--- Makefile.orig 2013-11-16 11:45:54.000000000 +0800 ++++ Makefile 2013-11-16 11:46:33.000000000 +0800 +@@ -19,12 +19,12 @@ VERSION = 4.0 + + VPATH = ../src + +-DESTROOT = +-DESTPATH = $(DESTROOT)/usr/local/rtty ++DESTROOT = ${PREFIX} ++DESTPATH = $(DESTROOT)/rtty + DESTBIN = $(DESTPATH)/bin + + #CC = cc +-CDEBUG = -O ++#CDEBUG = -O + # + # use -U to undefine, -D to define + # DEBUG include code to help debug this software +@@ -37,7 +37,7 @@ CDEBUG = -O + CDEFS = -DDEBUG -UWANT_TCPIP -UNEED_BITYPES_H -UNEED_INET_ATON \ + -UNO_SOCKADDR_LEN -UNO_HSTRERROR + # +-CFLAGS = $(CDEBUG) $(CDEFS) -I/usr/local/include ++CFLAGS += $(CDEBUG) $(CDEFS) + LIBS = -lcrypt + #(if WANT_TCPIP defined and this isn't in your libc) + # -lresolv +@@ -59,15 +59,15 @@ kit:; shar README Makefile *.c *.h *.sh + bin.tar:; tar cf bin.tar $(ALL) + + install: $(ALL) Makefile +- -set -x; test -d $(DESTPATH) || mkdir $(DESTPATH) ++ -set -x; test -d $(DESTDIR)$(DESTPATH) || mkdir $(DESTDIR)$(DESTPATH) + -set +e -x; for x in bin dev sock log pid opt out; do \ +- test -d $(DESTPATH)/$$x || mkdir $(DESTPATH)/$$x; \ ++ test -d $(DESTDIR)$(DESTPATH)/$$x || mkdir $(DESTDIR)$(DESTPATH)/$$x; \ + done + set -x; for x in $(BINARY); do \ +- install -c -m 111 $$x $(DESTBIN)/$$x; \ ++ install -c -s -m 111 $$x $(DESTDIR)$(DESTBIN)/$$x; \ + done + set -x; for x in $(SCRIPT); do \ +- install -c -m 555 $$x $(DESTBIN)/$$x; \ ++ install -c -m 555 $$x $(DESTDIR)$(DESTBIN)/$$x; \ + done + + ttysrv: ttysrv.o ttyprot.o connutil.o misc.o version.o Property changes on: head/sysutils/rtty/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/rtty/files/patch-startsrv.sh =================================================================== --- head/sysutils/rtty/files/patch-startsrv.sh (nonexistent) +++ head/sysutils/rtty/files/patch-startsrv.sh (revision 363335) @@ -0,0 +1,11 @@ +--- startsrv.sh.orig Sat Nov 17 16:28:07 2001 ++++ startsrv.sh Sat Nov 17 16:28:19 2001 +@@ -19,7 +19,7 @@ + + default_options='-b 9600 -w 8 -p none' + default_sock_prot='ug=rw,o=' +-default_sock_owner='root.wheel' ++default_sock_owner='root:wheel' + default_log_prot='u=rw,g=r,o=' + + for host Property changes on: head/sysutils/rtty/files/patch-startsrv.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/screen/files/patch-aa =================================================================== --- head/sysutils/screen/files/patch-aa (revision 363334) +++ head/sysutils/screen/files/patch-aa (nonexistent) @@ -1,34 +0,0 @@ ---- Makefile.in.orig 2014-04-26 03:58:35.000000000 -0700 -+++ Makefile.in 2014-04-29 18:55:12.050906602 -0700 -@@ -83,19 +83,13 @@ - $(OPTIONS) $(CFLAGS) $< - - install_bin: .version screen -- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ -- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi -- $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) -- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) --# This doesn't work if $(bindir)/screen is a symlink -- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi -- rm -f $(DESTDIR)$(bindir)/screen -- (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) -+ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen -+ -chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen - cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) - - ############################################################################### - install: installdirs install_bin -- cd doc ; $(MAKE) install -+ cd doc ; $(MAKE) $(MAKE_ARGS) install - -if [ -d /usr/lib/terminfo ]; then \ - PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ - chmod 644 /usr/lib/terminfo/s/screen*; \ -@@ -108,7 +102,7 @@ - installdirs: - # Path leading to ETCSCREENRC and Socketdirectory not checked. - $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS) -- cd doc ; $(MAKE) installdirs -+ cd doc ; $(MAKE) $(MAKE_ARGS) installdirs - - uninstall: .version - rm -f $(DESTDIR)$(bindir)/$(SCREEN) Property changes on: head/sysutils/screen/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/screen/files/patch-ab =================================================================== --- head/sysutils/screen/files/patch-ab (revision 363334) +++ head/sysutils/screen/files/patch-ab (nonexistent) @@ -1,34 +0,0 @@ ---- doc/Makefile.in.orig 2014-04-29 20:26:42.618832001 -0700 -+++ doc/Makefile.in 2014-04-29 20:29:26.379384101 -0700 -@@ -31,7 +31,10 @@ - $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info - - install: installdirs -+ifeq (${WITH_MAN},1) - $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1 -+endif -+ifeq (${WITH_INFO},1) - -$(MAKE) screen.info - -if test -f screen.info; then d=.; else d=$(srcdir); fi; \ - if test -f $$d/screen.info; then \ -@@ -40,13 +43,19 @@ - install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \ - else true; fi; \ - fi -+endif - - uninstall: - rm -f $(DESTDIR)$(mandir)/man1/screen.1 - rm -f $(DESTDIR)$(infodir)/screen.info* - - installdirs: -- $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir) -+ifeq (${WITH_MAN},1) -+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 -+endif -+ifeq (${WITH_INFO},1) -+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(infodir) -+endif - - mostlyclean: - -rm -f *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr Property changes on: head/sysutils/screen/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/screen/files/patch-ad =================================================================== --- head/sysutils/screen/files/patch-ad (revision 363334) +++ head/sysutils/screen/files/patch-ad (nonexistent) @@ -1,125 +0,0 @@ ---- configure.orig 2014-04-26 03:58:46.000000000 -0700 -+++ configure 2014-04-29 19:47:03.900706999 -0700 -@@ -4857,46 +4857,6 @@ - - else - olibs="$LIBS" --LIBS="-lcurses $olibs" --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libcurses..." >&5 --$as_echo "$as_me: checking libcurses..." >&6;} --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ -- --#ifdef __hpux --__sorry_hpux_libcurses_is_totally_broken_in_10_10(); --#else --tgetent((char *)0, (char *)0); --#endif -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- --else -- LIBS="-ltermcap $olibs" --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermcap..." >&5 --$as_echo "$as_me: checking libtermcap..." >&6;} --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ --tgetent((char *)0, (char *)0); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- --else - LIBS="-ltermlib $olibs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermlib..." >&5 - $as_echo "$as_me: checking libtermlib..." >&6;} -@@ -5001,12 +4961,6 @@ - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext - - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -@@ -5019,7 +4973,8 @@ - - main() - { -- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); -+ char *tgoto(const char *, int, int); -+ exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1); - } - _ACEOF - if ac_fn_c_try_run "$LINENO"; then : -@@ -5066,7 +5021,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys..." >&5 - $as_echo "$as_me: checking for SVR4 ptys..." >&6;} - sysvr4ptys= --if test -c /dev/ptmx ; then -+if test -c /nonexistent ; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -5177,19 +5132,16 @@ - fi - rm -f conftest* - --if test "$ptys" != "$pdir/pty??" ; then --p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` --p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` -+# XXX: hardcoded, since port must be devfs and various setups independent -+ - cat >>confdefs.h <<_ACEOF --#define PTYRANGE0 "$p0" -+#define PTYRANGE0 "pqrsPQRSlmnoLMNO" - _ACEOF - - cat >>confdefs.h <<_ACEOF --#define PTYRANGE1 "$p1" -+#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv" - _ACEOF - --fi -- - - # Check whether --with-pty-mode was given. - if test "${with_pty_mode+set}" = set; then : -@@ -5416,6 +5368,8 @@ - #if defined(SVR4) && !defined(DGUX) - #include - #define utmp utmpx -+#define pututline pututxline -+#define getutent getutxent - #else - #include - #endif -@@ -5484,6 +5438,10 @@ - #if defined(SVR4) && !defined(DGUX) - #include - #define utmp utmpx -+#define pututline pututxline -+#define getutent getutxent -+#define pututline pututxline -+#define getutent getutxent - #else - #include - #endif Property changes on: head/sysutils/screen/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/screen/files/patch-af =================================================================== --- head/sysutils/screen/files/patch-af (revision 363334) +++ head/sysutils/screen/files/patch-af (nonexistent) @@ -1,15 +0,0 @@ ---- termcap.c.orig Wed Jul 5 16:33:30 2000 -+++ termcap.c Wed Oct 11 05:40:12 2000 -@@ -355,11 +355,7 @@ - if (D_CG0) - { - if (D_CS0 == 0) --#ifdef TERMINFO -- D_CS0 = "\033(%p1%c"; --#else -- D_CS0 = "\033(%."; --#endif -+ D_CS0 = "\033(%p1%c"; /* Old ncurses can't handle %. */ - if (D_CE0 == 0) - D_CE0 = "\033(B"; - D_AC = 0; Property changes on: head/sysutils/screen/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/screen/files/patch-terminfo::checktc.c =================================================================== --- head/sysutils/screen/files/patch-terminfo::checktc.c (revision 363334) +++ head/sysutils/screen/files/patch-terminfo::checktc.c (nonexistent) @@ -1,18 +0,0 @@ ---- terminfo/checktc.c.orig Fri Sep 29 09:13:22 1995 -+++ terminfo/checktc.c Tue Apr 22 20:37:18 2003 -@@ -171,6 +171,7 @@ - fflush(stdout); - } - -+#ifndef __FreeBSD__ - void CPutStr(s, c) - char *s; - int c; -@@ -178,6 +179,7 @@ - tputs(tgoto(s, 0, c), 1, putcha); - fflush(stdout); - } -+#endif /* __FreeBSD__ */ - - void CCPutStr(s, x, y) - char *s; Property changes on: head/sysutils/screen/files/patch-terminfo::checktc.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/screen/files/patch-Makefile.in =================================================================== --- head/sysutils/screen/files/patch-Makefile.in (nonexistent) +++ head/sysutils/screen/files/patch-Makefile.in (revision 363335) @@ -0,0 +1,34 @@ +--- Makefile.in.orig 2014-04-26 03:58:35.000000000 -0700 ++++ Makefile.in 2014-04-29 18:55:12.050906602 -0700 +@@ -83,19 +83,13 @@ + $(OPTIONS) $(CFLAGS) $< + + install_bin: .version screen +- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ +- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi +- $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) +- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) +-# This doesn't work if $(bindir)/screen is a symlink +- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi +- rm -f $(DESTDIR)$(bindir)/screen +- (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) ++ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen ++ -chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen + cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) + + ############################################################################### + install: installdirs install_bin +- cd doc ; $(MAKE) install ++ cd doc ; $(MAKE) $(MAKE_ARGS) install + -if [ -d /usr/lib/terminfo ]; then \ + PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ + chmod 644 /usr/lib/terminfo/s/screen*; \ +@@ -108,7 +102,7 @@ + installdirs: + # Path leading to ETCSCREENRC and Socketdirectory not checked. + $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS) +- cd doc ; $(MAKE) installdirs ++ cd doc ; $(MAKE) $(MAKE_ARGS) installdirs + + uninstall: .version + rm -f $(DESTDIR)$(bindir)/$(SCREEN) Property changes on: head/sysutils/screen/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/screen/files/patch-configure =================================================================== --- head/sysutils/screen/files/patch-configure (nonexistent) +++ head/sysutils/screen/files/patch-configure (revision 363335) @@ -0,0 +1,125 @@ +--- configure.orig 2014-04-26 03:58:46.000000000 -0700 ++++ configure 2014-04-29 19:47:03.900706999 -0700 +@@ -4857,46 +4857,6 @@ + + else + olibs="$LIBS" +-LIBS="-lcurses $olibs" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libcurses..." >&5 +-$as_echo "$as_me: checking libcurses..." >&6;} +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +-#ifdef __hpux +-__sorry_hpux_libcurses_is_totally_broken_in_10_10(); +-#else +-tgetent((char *)0, (char *)0); +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- +-else +- LIBS="-ltermcap $olibs" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermcap..." >&5 +-$as_echo "$as_me: checking libtermcap..." >&6;} +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +-tgetent((char *)0, (char *)0); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- +-else + LIBS="-ltermlib $olibs" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermlib..." >&5 + $as_echo "$as_me: checking libtermlib..." >&6;} +@@ -5001,12 +4961,6 @@ + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext + + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +@@ -5019,7 +4973,8 @@ + + main() + { +- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); ++ char *tgoto(const char *, int, int); ++ exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1); + } + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : +@@ -5066,7 +5021,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys..." >&5 + $as_echo "$as_me: checking for SVR4 ptys..." >&6;} + sysvr4ptys= +-if test -c /dev/ptmx ; then ++if test -c /nonexistent ; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -5177,19 +5132,16 @@ + fi + rm -f conftest* + +-if test "$ptys" != "$pdir/pty??" ; then +-p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` +-p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` ++# XXX: hardcoded, since port must be devfs and various setups independent ++ + cat >>confdefs.h <<_ACEOF +-#define PTYRANGE0 "$p0" ++#define PTYRANGE0 "pqrsPQRSlmnoLMNO" + _ACEOF + + cat >>confdefs.h <<_ACEOF +-#define PTYRANGE1 "$p1" ++#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv" + _ACEOF + +-fi +- + + # Check whether --with-pty-mode was given. + if test "${with_pty_mode+set}" = set; then : +@@ -5416,6 +5368,8 @@ + #if defined(SVR4) && !defined(DGUX) + #include + #define utmp utmpx ++#define pututline pututxline ++#define getutent getutxent + #else + #include + #endif +@@ -5484,6 +5438,10 @@ + #if defined(SVR4) && !defined(DGUX) + #include + #define utmp utmpx ++#define pututline pututxline ++#define getutent getutxent ++#define pututline pututxline ++#define getutent getutxent + #else + #include + #endif Property changes on: head/sysutils/screen/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/screen/files/patch-doc__Makefile.in =================================================================== --- head/sysutils/screen/files/patch-doc__Makefile.in (nonexistent) +++ head/sysutils/screen/files/patch-doc__Makefile.in (revision 363335) @@ -0,0 +1,34 @@ +--- doc/Makefile.in.orig 2014-04-29 20:26:42.618832001 -0700 ++++ doc/Makefile.in 2014-04-29 20:29:26.379384101 -0700 +@@ -31,7 +31,10 @@ + $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info + + install: installdirs ++ifeq (${WITH_MAN},1) + $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1 ++endif ++ifeq (${WITH_INFO},1) + -$(MAKE) screen.info + -if test -f screen.info; then d=.; else d=$(srcdir); fi; \ + if test -f $$d/screen.info; then \ +@@ -40,13 +43,19 @@ + install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \ + else true; fi; \ + fi ++endif + + uninstall: + rm -f $(DESTDIR)$(mandir)/man1/screen.1 + rm -f $(DESTDIR)$(infodir)/screen.info* + + installdirs: +- $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir) ++ifeq (${WITH_MAN},1) ++ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 ++endif ++ifeq (${WITH_INFO},1) ++ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(infodir) ++endif + + mostlyclean: + -rm -f *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr Property changes on: head/sysutils/screen/files/patch-doc__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/screen/files/patch-termcap.c =================================================================== --- head/sysutils/screen/files/patch-termcap.c (nonexistent) +++ head/sysutils/screen/files/patch-termcap.c (revision 363335) @@ -0,0 +1,15 @@ +--- termcap.c.orig Wed Jul 5 16:33:30 2000 ++++ termcap.c Wed Oct 11 05:40:12 2000 +@@ -355,11 +355,7 @@ + if (D_CG0) + { + if (D_CS0 == 0) +-#ifdef TERMINFO +- D_CS0 = "\033(%p1%c"; +-#else +- D_CS0 = "\033(%."; +-#endif ++ D_CS0 = "\033(%p1%c"; /* Old ncurses can't handle %. */ + if (D_CE0 == 0) + D_CE0 = "\033(B"; + D_AC = 0; Property changes on: head/sysutils/screen/files/patch-termcap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/screen/files/patch-terminfo__checktc.c =================================================================== --- head/sysutils/screen/files/patch-terminfo__checktc.c (nonexistent) +++ head/sysutils/screen/files/patch-terminfo__checktc.c (revision 363335) @@ -0,0 +1,18 @@ +--- terminfo/checktc.c.orig Fri Sep 29 09:13:22 1995 ++++ terminfo/checktc.c Tue Apr 22 20:37:18 2003 +@@ -171,6 +171,7 @@ + fflush(stdout); + } + ++#ifndef __FreeBSD__ + void CPutStr(s, c) + char *s; + int c; +@@ -178,6 +179,7 @@ + tputs(tgoto(s, 0, c), 1, putcha); + fflush(stdout); + } ++#endif /* __FreeBSD__ */ + + void CCPutStr(s, x, y) + char *s; Property changes on: head/sysutils/screen/files/patch-terminfo__checktc.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/screen-legacy/files/patch-af =================================================================== --- head/sysutils/screen-legacy/files/patch-af (revision 363334) +++ head/sysutils/screen-legacy/files/patch-af (nonexistent) @@ -1,15 +0,0 @@ ---- termcap.c.orig Wed Jul 5 16:33:30 2000 -+++ termcap.c Wed Oct 11 05:40:12 2000 -@@ -355,11 +355,7 @@ - if (D_CG0) - { - if (D_CS0 == 0) --#ifdef TERMINFO -- D_CS0 = "\033(%p1%c"; --#else -- D_CS0 = "\033(%."; --#endif -+ D_CS0 = "\033(%p1%c"; /* Old ncurses can't handle %. */ - if (D_CE0 == 0) - D_CE0 = "\033(B"; - D_AC = 0; Property changes on: head/sysutils/screen-legacy/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/screen-legacy/files/patch-ad =================================================================== --- head/sysutils/screen-legacy/files/patch-ad (revision 363334) +++ head/sysutils/screen-legacy/files/patch-ad (nonexistent) @@ -1,121 +0,0 @@ ---- configure.orig Fri Dec 5 15:46:53 2003 -+++ configure Sat Mar 4 10:18:24 2006 -@@ -4746,48 +4746,6 @@ - sed 's/^/| /' conftest.$ac_ext >&5 - - olibs="$LIBS" --LIBS="-lcurses $olibs" --{ echo "$as_me:$LINENO: checking libcurses..." >&5 --echo "$as_me: checking libcurses..." >&6;} --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- --#ifdef __hpux --__sorry_hpux_libcurses_is_totally_broken_in_10_10(); --#else --tgetent((char *)0, (char *)0); --#endif -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - LIBS="-ltermcap $olibs" - { echo "$as_me:$LINENO: checking libtermcap..." >&5 - echo "$as_me: checking libtermcap..." >&6;} -@@ -4907,8 +4865,6 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -@@ -4927,7 +4883,8 @@ - - main() - { -- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); -+ char *tgoto(const char *, int, int); -+ exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1); - } - _ACEOF - rm -f conftest$ac_exeext -@@ -5314,19 +5271,16 @@ - fi - rm -f conftest* - --if test "$ptys" != "$pdir/pty??" ; then --p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` --p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` -+# XXX: hardcoded, since port must be devfs and various setups independent -+ - cat >>confdefs.h <<_ACEOF --#define PTYRANGE0 "$p0" -+#define PTYRANGE0 "pqrsPQRSlmnoLMNO" - _ACEOF - - cat >>confdefs.h <<_ACEOF --#define PTYRANGE1 "$p1" -+#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv" - _ACEOF - --fi -- - - # Check whether --with-pty-mode or --without-pty-mode was given. - if test "${with_pty_mode+set}" = set; then -@@ -5575,6 +5529,8 @@ - #if defined(SVR4) && !defined(DGUX) - #include - #define utmp utmpx -+#define pututline pututxline -+#define getutent getutxent - #else - #include - #endif -@@ -5627,6 +5583,8 @@ - #if defined(SVR4) && !defined(DGUX) - #include - #define utmp utmpx -+#define pututline pututxline -+#define getutent getutxent - #else - #include - #endif -@@ -5683,6 +5641,8 @@ - #if defined(SVR4) && !defined(DGUX) - #include - #define utmp utmpx -+#define pututline pututxline -+#define getutent getutxent - #else - #include - #endif Property changes on: head/sysutils/screen-legacy/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/screen-legacy/files/patch-ab =================================================================== --- head/sysutils/screen-legacy/files/patch-ab (revision 363334) +++ head/sysutils/screen-legacy/files/patch-ab (nonexistent) @@ -1,20 +0,0 @@ ---- doc/Makefile.in.orig Fri May 25 18:50:55 2001 -+++ doc/Makefile.in Mon Jun 25 08:42:08 2001 -@@ -27,7 +27,7 @@ - - info screen.info: screen.texinfo - @rm -f screen.info* -- $(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info -+ $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info - - install: installdirs - $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1 -@@ -36,7 +36,7 @@ - if test -f $$d/screen.info; then \ - for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \ - if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ -- install-info --info-dir=$(DESTDIR)$(infodir) $$d/screen.info; \ -+ install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \ - else true; fi; \ - fi - Property changes on: head/sysutils/screen-legacy/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/screen-legacy/files/patch-aa =================================================================== --- head/sysutils/screen-legacy/files/patch-aa (revision 363334) +++ head/sysutils/screen-legacy/files/patch-aa (nonexistent) @@ -1,19 +0,0 @@ ---- Makefile.in.orig Thu Feb 14 22:36:33 2002 -+++ Makefile.in Tue Feb 19 13:18:38 2002 -@@ -71,14 +71,8 @@ - $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $< - - install_bin: .version screen -- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ -- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi -- $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) -- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) --# This doesn't work if $(bindir)/screen is a symlink -- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi -- rm -f $(DESTDIR)$(bindir)/screen -- (cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen) -+ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen -+ -chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen - cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) - - ############################################################################### Property changes on: head/sysutils/screen-legacy/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/screen-legacy/files/patch-Makefile.in =================================================================== --- head/sysutils/screen-legacy/files/patch-Makefile.in (revision 363334) +++ head/sysutils/screen-legacy/files/patch-Makefile.in (nonexistent) @@ -1,20 +0,0 @@ ---- Makefile.in.orig 2007-07-30 12:38:38.000000000 +0200 -+++ Makefile.in 2007-07-30 12:39:34.000000000 +0200 -@@ -77,7 +77,7 @@ - - ############################################################################### - install: installdirs install_bin -- cd doc ; $(MAKE) install -+ cd doc ; $(MAKE) $(MAKE_ARGS) install - -if [ -d /usr/lib/terminfo ]; then \ - PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ - chmod 644 /usr/lib/terminfo/s/screen*; \ -@@ -90,7 +90,7 @@ - installdirs: - # Path leading to ETCSCREENRC and Socketdirectory not checked. - $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS) -- cd doc ; $(MAKE) installdirs -+ cd doc ; $(MAKE) $(MAKE_ARGS) installdirs - - uninstall: .version - rm -f $(DESTDIR)$(bindir)/$(SCREEN) Property changes on: head/sysutils/screen-legacy/files/patch-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/screen-legacy/files/patch-terminfo::checktc.c =================================================================== --- head/sysutils/screen-legacy/files/patch-terminfo::checktc.c (revision 363334) +++ head/sysutils/screen-legacy/files/patch-terminfo::checktc.c (nonexistent) @@ -1,18 +0,0 @@ ---- terminfo/checktc.c.orig Fri Sep 29 09:13:22 1995 -+++ terminfo/checktc.c Tue Apr 22 20:37:18 2003 -@@ -171,6 +171,7 @@ - fflush(stdout); - } - -+#ifndef __FreeBSD__ - void CPutStr(s, c) - char *s; - int c; -@@ -178,6 +179,7 @@ - tputs(tgoto(s, 0, c), 1, putcha); - fflush(stdout); - } -+#endif /* __FreeBSD__ */ - - void CCPutStr(s, x, y) - char *s; Property changes on: head/sysutils/screen-legacy/files/patch-terminfo::checktc.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/screen-legacy/files/patch-Makefile.in_1 =================================================================== --- head/sysutils/screen-legacy/files/patch-Makefile.in_1 (nonexistent) +++ head/sysutils/screen-legacy/files/patch-Makefile.in_1 (revision 363335) @@ -0,0 +1,20 @@ +--- Makefile.in.orig 2007-07-30 12:38:38.000000000 +0200 ++++ Makefile.in 2007-07-30 12:39:34.000000000 +0200 +@@ -77,7 +77,7 @@ + + ############################################################################### + install: installdirs install_bin +- cd doc ; $(MAKE) install ++ cd doc ; $(MAKE) $(MAKE_ARGS) install + -if [ -d /usr/lib/terminfo ]; then \ + PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ + chmod 644 /usr/lib/terminfo/s/screen*; \ +@@ -90,7 +90,7 @@ + installdirs: + # Path leading to ETCSCREENRC and Socketdirectory not checked. + $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS) +- cd doc ; $(MAKE) installdirs ++ cd doc ; $(MAKE) $(MAKE_ARGS) installdirs + + uninstall: .version + rm -f $(DESTDIR)$(bindir)/$(SCREEN) Property changes on: head/sysutils/screen-legacy/files/patch-Makefile.in_1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/screen-legacy/files/patch-Makefile.in_2 =================================================================== --- head/sysutils/screen-legacy/files/patch-Makefile.in_2 (nonexistent) +++ head/sysutils/screen-legacy/files/patch-Makefile.in_2 (revision 363335) @@ -0,0 +1,19 @@ +--- Makefile.in.orig Thu Feb 14 22:36:33 2002 ++++ Makefile.in Tue Feb 19 13:18:38 2002 +@@ -71,14 +71,8 @@ + $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $< + + install_bin: .version screen +- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ +- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi +- $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) +- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) +-# This doesn't work if $(bindir)/screen is a symlink +- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi +- rm -f $(DESTDIR)$(bindir)/screen +- (cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen) ++ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen ++ -chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen + cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) + + ############################################################################### Property changes on: head/sysutils/screen-legacy/files/patch-Makefile.in_2 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/screen-legacy/files/patch-configure =================================================================== --- head/sysutils/screen-legacy/files/patch-configure (nonexistent) +++ head/sysutils/screen-legacy/files/patch-configure (revision 363335) @@ -0,0 +1,121 @@ +--- configure.orig Fri Dec 5 15:46:53 2003 ++++ configure Sat Mar 4 10:18:24 2006 +@@ -4746,48 +4746,6 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + olibs="$LIBS" +-LIBS="-lcurses $olibs" +-{ echo "$as_me:$LINENO: checking libcurses..." >&5 +-echo "$as_me: checking libcurses..." >&6;} +-cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +-#ifdef __hpux +-__sorry_hpux_libcurses_is_totally_broken_in_10_10(); +-#else +-tgetent((char *)0, (char *)0); +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + LIBS="-ltermcap $olibs" + { echo "$as_me:$LINENO: checking libtermcap..." >&5 + echo "$as_me: checking libtermcap..." >&6;} +@@ -4907,8 +4865,6 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +@@ -4927,7 +4883,8 @@ + + main() + { +- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); ++ char *tgoto(const char *, int, int); ++ exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1); + } + _ACEOF + rm -f conftest$ac_exeext +@@ -5314,19 +5271,16 @@ + fi + rm -f conftest* + +-if test "$ptys" != "$pdir/pty??" ; then +-p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` +-p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` ++# XXX: hardcoded, since port must be devfs and various setups independent ++ + cat >>confdefs.h <<_ACEOF +-#define PTYRANGE0 "$p0" ++#define PTYRANGE0 "pqrsPQRSlmnoLMNO" + _ACEOF + + cat >>confdefs.h <<_ACEOF +-#define PTYRANGE1 "$p1" ++#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv" + _ACEOF + +-fi +- + + # Check whether --with-pty-mode or --without-pty-mode was given. + if test "${with_pty_mode+set}" = set; then +@@ -5575,6 +5529,8 @@ + #if defined(SVR4) && !defined(DGUX) + #include + #define utmp utmpx ++#define pututline pututxline ++#define getutent getutxent + #else + #include + #endif +@@ -5627,6 +5583,8 @@ + #if defined(SVR4) && !defined(DGUX) + #include + #define utmp utmpx ++#define pututline pututxline ++#define getutent getutxent + #else + #include + #endif +@@ -5683,6 +5641,8 @@ + #if defined(SVR4) && !defined(DGUX) + #include + #define utmp utmpx ++#define pututline pututxline ++#define getutent getutxent + #else + #include + #endif Property changes on: head/sysutils/screen-legacy/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/screen-legacy/files/patch-doc__Makefile.in =================================================================== --- head/sysutils/screen-legacy/files/patch-doc__Makefile.in (nonexistent) +++ head/sysutils/screen-legacy/files/patch-doc__Makefile.in (revision 363335) @@ -0,0 +1,20 @@ +--- doc/Makefile.in.orig Fri May 25 18:50:55 2001 ++++ doc/Makefile.in Mon Jun 25 08:42:08 2001 +@@ -27,7 +27,7 @@ + + info screen.info: screen.texinfo + @rm -f screen.info* +- $(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info ++ $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info + + install: installdirs + $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1 +@@ -36,7 +36,7 @@ + if test -f $$d/screen.info; then \ + for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \ + if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ +- install-info --info-dir=$(DESTDIR)$(infodir) $$d/screen.info; \ ++ install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \ + else true; fi; \ + fi + Property changes on: head/sysutils/screen-legacy/files/patch-doc__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/screen-legacy/files/patch-termcap.c =================================================================== --- head/sysutils/screen-legacy/files/patch-termcap.c (nonexistent) +++ head/sysutils/screen-legacy/files/patch-termcap.c (revision 363335) @@ -0,0 +1,15 @@ +--- termcap.c.orig Wed Jul 5 16:33:30 2000 ++++ termcap.c Wed Oct 11 05:40:12 2000 +@@ -355,11 +355,7 @@ + if (D_CG0) + { + if (D_CS0 == 0) +-#ifdef TERMINFO +- D_CS0 = "\033(%p1%c"; +-#else +- D_CS0 = "\033(%."; +-#endif ++ D_CS0 = "\033(%p1%c"; /* Old ncurses can't handle %. */ + if (D_CE0 == 0) + D_CE0 = "\033(B"; + D_AC = 0; Property changes on: head/sysutils/screen-legacy/files/patch-termcap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/screen-legacy/files/patch-terminfo__checktc.c =================================================================== --- head/sysutils/screen-legacy/files/patch-terminfo__checktc.c (nonexistent) +++ head/sysutils/screen-legacy/files/patch-terminfo__checktc.c (revision 363335) @@ -0,0 +1,18 @@ +--- terminfo/checktc.c.orig Fri Sep 29 09:13:22 1995 ++++ terminfo/checktc.c Tue Apr 22 20:37:18 2003 +@@ -171,6 +171,7 @@ + fflush(stdout); + } + ++#ifndef __FreeBSD__ + void CPutStr(s, c) + char *s; + int c; +@@ -178,6 +179,7 @@ + tputs(tgoto(s, 0, c), 1, putcha); + fflush(stdout); + } ++#endif /* __FreeBSD__ */ + + void CCPutStr(s, x, y) + char *s; Property changes on: head/sysutils/screen-legacy/files/patch-terminfo__checktc.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/setquota/files/patch-aa =================================================================== --- head/sysutils/setquota/files/patch-aa (revision 363334) +++ head/sysutils/setquota/files/patch-aa (nonexistent) @@ -1,18 +0,0 @@ ---- Makefile.orig Wed Mar 12 09:32:55 1997 -+++ Makefile Sat Sep 27 18:34:27 1997 -@@ -1,10 +1,11 @@ --# $Id: Makefile,v 1.9 1997/03/12 08:32:55 winter Exp $ -+# From: $Id: Makefile,v 1.9 1997/03/12 08:32:55 winter Exp $ - - PROG= setquota - SRCS= printquota.c setquota.c quotatool.c --CFLAGS+= -g -DDEBUG # -Wall -static -+#CFLAGS+= -g -DDEBUG # -Wall -static - MAN8= getquota.8 setquota.8 --LINKS= /usr/sbin/setquota /usr/sbin/getquota --BINDIR= /usr/sbin -+MANDIR= ${PREFIX}/man/man -+LINKS= ${PREFIX}/sbin/setquota ${PREFIX}/sbin/getquota -+BINDIR= ${PREFIX}/sbin - - .include Property changes on: head/sysutils/setquota/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/setquota/files/patch-ab =================================================================== --- head/sysutils/setquota/files/patch-ab (revision 363334) +++ head/sysutils/setquota/files/patch-ab (nonexistent) @@ -1,11 +0,0 @@ ---- printquota.c.orig Sun Oct 20 14:27:13 2002 -+++ printquota.c Sun Oct 20 14:27:21 2002 -@@ -109,7 +109,7 @@ - - if (now == 0) - time(&now); --#ifdef 0 -+#if 0 - if (now > seconds) - return("none"); - seconds -= now; Property changes on: head/sysutils/setquota/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/setquota/files/patch-ac =================================================================== --- head/sysutils/setquota/files/patch-ac (revision 363334) +++ head/sysutils/setquota/files/patch-ac (nonexistent) @@ -1,20 +0,0 @@ ---- setquota.c.orig Sun Oct 20 14:27:31 2002 -+++ setquota.c Sun Oct 20 14:27:41 2002 -@@ -62,7 +62,7 @@ - qm->dq_dqb.dqb_bhardlimit = v_bh; - if (f_bs) - qm->dq_dqb.dqb_bsoftlimit = v_bs; --#ifdef 0 -+#if 0 - if (f_bg) - qm->dq_dqb.dqb_btime = v_bg; - #endif -@@ -70,7 +70,7 @@ - qm->dq_dqb.dqb_ihardlimit = v_ih; - if (f_is) - qm->dq_dqb.dqb_isoftlimit = v_is; --#ifdef 0 -+#if 0 - if (f_ig) - qm->dq_dqb.dqb_itime = v_ig; - #endif Property changes on: head/sysutils/setquota/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/setquota/files/patch-Makefile =================================================================== --- head/sysutils/setquota/files/patch-Makefile (nonexistent) +++ head/sysutils/setquota/files/patch-Makefile (revision 363335) @@ -0,0 +1,18 @@ +--- Makefile.orig Wed Mar 12 09:32:55 1997 ++++ Makefile Sat Sep 27 18:34:27 1997 +@@ -1,10 +1,11 @@ +-# $Id: Makefile,v 1.9 1997/03/12 08:32:55 winter Exp $ ++# From: $Id: Makefile,v 1.9 1997/03/12 08:32:55 winter Exp $ + + PROG= setquota + SRCS= printquota.c setquota.c quotatool.c +-CFLAGS+= -g -DDEBUG # -Wall -static ++#CFLAGS+= -g -DDEBUG # -Wall -static + MAN8= getquota.8 setquota.8 +-LINKS= /usr/sbin/setquota /usr/sbin/getquota +-BINDIR= /usr/sbin ++MANDIR= ${PREFIX}/man/man ++LINKS= ${PREFIX}/sbin/setquota ${PREFIX}/sbin/getquota ++BINDIR= ${PREFIX}/sbin + + .include Property changes on: head/sysutils/setquota/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/setquota/files/patch-printquota.c =================================================================== --- head/sysutils/setquota/files/patch-printquota.c (nonexistent) +++ head/sysutils/setquota/files/patch-printquota.c (revision 363335) @@ -0,0 +1,11 @@ +--- printquota.c.orig Sun Oct 20 14:27:13 2002 ++++ printquota.c Sun Oct 20 14:27:21 2002 +@@ -109,7 +109,7 @@ + + if (now == 0) + time(&now); +-#ifdef 0 ++#if 0 + if (now > seconds) + return("none"); + seconds -= now; Property changes on: head/sysutils/setquota/files/patch-printquota.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/setquota/files/patch-setquota.c =================================================================== --- head/sysutils/setquota/files/patch-setquota.c (nonexistent) +++ head/sysutils/setquota/files/patch-setquota.c (revision 363335) @@ -0,0 +1,20 @@ +--- setquota.c.orig Sun Oct 20 14:27:31 2002 ++++ setquota.c Sun Oct 20 14:27:41 2002 +@@ -62,7 +62,7 @@ + qm->dq_dqb.dqb_bhardlimit = v_bh; + if (f_bs) + qm->dq_dqb.dqb_bsoftlimit = v_bs; +-#ifdef 0 ++#if 0 + if (f_bg) + qm->dq_dqb.dqb_btime = v_bg; + #endif +@@ -70,7 +70,7 @@ + qm->dq_dqb.dqb_ihardlimit = v_ih; + if (f_is) + qm->dq_dqb.dqb_isoftlimit = v_is; +-#ifdef 0 ++#if 0 + if (f_ig) + qm->dq_dqb.dqb_itime = v_ig; + #endif Property changes on: head/sysutils/setquota/files/patch-setquota.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/skill/Makefile =================================================================== --- head/sysutils/skill/Makefile (revision 363334) +++ head/sysutils/skill/Makefile (revision 363335) @@ -1,14 +1,15 @@ # Created by: Joao Carlos Mendes Luis # $FreeBSD$ PORTNAME= skill PORTVERSION= 4.1.4 CATEGORIES= sysutils -MASTER_SITES= ftp://ftp.flux.utah.edu/pub/skill/ \ +MASTER_SITES= ftp://ftp.flux.utah.edu/pub/skill/ \ ftp://fast.cs.utah.edu/pub/skill/ -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= SuperKILL, kill, or renice processes by pid, name, tty, or uid + +USES= tar:tgz .include Index: head/sysutils/skill/files/patch-aa =================================================================== --- head/sysutils/skill/files/patch-aa (revision 363334) +++ head/sysutils/skill/files/patch-aa (nonexistent) @@ -1,40 +0,0 @@ ---- Makefile.orig Fri Apr 5 23:53:39 2002 -+++ Makefile Sat Apr 20 02:26:08 2002 -@@ -55,7 +55,6 @@ - - DESTDIR= - SHELL= /bin/sh --PREFIX= /usr/local - - # CONFIGURE: Set location of executable, it's group and mode. - BINDIR= ${PREFIX}/bin -@@ -79,7 +78,7 @@ - OBJS= main.o argparse.o getproc.o - HDRS= conf.h - --CFLAGS= -O ${COPTS} -+#CFLAGS= -O ${COPTS} - - all: skill - -@@ -96,18 +95,11 @@ - #(SysV) filepriv -d ${DESTDIR}/${BINDIR}/skill - rm -f ${DESTDIR}/${BINDIR}/skill ${DESTDIR}/${MANDIR}/skill.${MANSFX} - rm -f ${DESTDIR}/${BINDIR}/snice ${DESTDIR}/${MANDIR}/snice.${MANSFX} --# install -c -g ${BINGRP} -m ${BINMOD} -s skill ${DESTDIR}/${BINDIR} -- cp skill ${DESTDIR}/${BINDIR}/skill -- strip ${DESTDIR}/${BINDIR}/skill -- chgrp ${BINGRP} ${DESTDIR}/${BINDIR}/skill -- chmod ${BINMOD} ${DESTDIR}/${BINDIR}/skill -+ ${BSD_INSTALL_PROGRAM} skill ${DESTDIR}/${BINDIR} - ln ${DESTDIR}/${BINDIR}/skill ${DESTDIR}/${BINDIR}/snice - #(SysV) filepriv -f dacread ${DESTDIR}/${BINDIR}/skill - # install -c -m 644 skill.1 ${DESTDIR}/${MANDIR}/skill.${MANSFX} -- cp skill.1 ${DESTDIR}/${MANDIR}/skill.${MANSFX} -- chmod 644 ${DESTDIR}/${MANDIR}/skill.${MANSFX} -- ln ${DESTDIR}/${MANDIR}/skill.${MANSFX}\ -- ${DESTDIR}/${MANDIR}/snice.${MANSFX} -+ ${BSD_INSTALL_MAN} skill.1 ${DESTDIR}/${MANDIR}/skill.${MANSFX} - - config Config: FRC - ./Config Property changes on: head/sysutils/skill/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/skill/files/patch-Makefile =================================================================== --- head/sysutils/skill/files/patch-Makefile (nonexistent) +++ head/sysutils/skill/files/patch-Makefile (revision 363335) @@ -0,0 +1,40 @@ +--- Makefile.orig Fri Apr 5 23:53:39 2002 ++++ Makefile Sat Apr 20 02:26:08 2002 +@@ -55,7 +55,6 @@ + + DESTDIR= + SHELL= /bin/sh +-PREFIX= /usr/local + + # CONFIGURE: Set location of executable, it's group and mode. + BINDIR= ${PREFIX}/bin +@@ -79,7 +78,7 @@ + OBJS= main.o argparse.o getproc.o + HDRS= conf.h + +-CFLAGS= -O ${COPTS} ++#CFLAGS= -O ${COPTS} + + all: skill + +@@ -96,18 +95,11 @@ + #(SysV) filepriv -d ${DESTDIR}/${BINDIR}/skill + rm -f ${DESTDIR}/${BINDIR}/skill ${DESTDIR}/${MANDIR}/skill.${MANSFX} + rm -f ${DESTDIR}/${BINDIR}/snice ${DESTDIR}/${MANDIR}/snice.${MANSFX} +-# install -c -g ${BINGRP} -m ${BINMOD} -s skill ${DESTDIR}/${BINDIR} +- cp skill ${DESTDIR}/${BINDIR}/skill +- strip ${DESTDIR}/${BINDIR}/skill +- chgrp ${BINGRP} ${DESTDIR}/${BINDIR}/skill +- chmod ${BINMOD} ${DESTDIR}/${BINDIR}/skill ++ ${BSD_INSTALL_PROGRAM} skill ${DESTDIR}/${BINDIR} + ln ${DESTDIR}/${BINDIR}/skill ${DESTDIR}/${BINDIR}/snice + #(SysV) filepriv -f dacread ${DESTDIR}/${BINDIR}/skill + # install -c -m 644 skill.1 ${DESTDIR}/${MANDIR}/skill.${MANSFX} +- cp skill.1 ${DESTDIR}/${MANDIR}/skill.${MANSFX} +- chmod 644 ${DESTDIR}/${MANDIR}/skill.${MANSFX} +- ln ${DESTDIR}/${MANDIR}/skill.${MANSFX}\ +- ${DESTDIR}/${MANDIR}/snice.${MANSFX} ++ ${BSD_INSTALL_MAN} skill.1 ${DESTDIR}/${MANDIR}/skill.${MANSFX} + + config Config: FRC + ./Config Property changes on: head/sysutils/skill/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/socket/files/patch-aa =================================================================== --- head/sysutils/socket/files/patch-aa (revision 363334) +++ head/sysutils/socket/files/patch-aa (nonexistent) @@ -1,218 +0,0 @@ ---- Makefile.orig Thu Sep 10 16:59:31 1992 -+++ Makefile Wed Aug 14 16:57:57 1996 -@@ -43,7 +43,8 @@ - ### CDC 4680 EP/IX: (I know it *has* setsid(2), but not with bsd43) - # SWITCHES = -systype bsd43 -DNOSETSID - -- -+# FreeBSD 2.x (4.4BSD) -+SWITCHES=-DHAVE_SYS_PARAM_H -Wall - - ### It should not be necessary to change anything below this line. - ################################################################## ---- README.orig Wed Sep 9 16:45:16 1992 -+++ README Wed Aug 14 16:57:58 1996 -@@ -166,4 +166,4 @@ - 1000 Berlin 10 - Germany - -- -+Juergen Nickelsen ---- globals.h.orig Sun Aug 30 21:04:27 1992 -+++ globals.h Wed Aug 14 16:57:58 1996 -@@ -8,6 +8,11 @@ - */ - - #include "patchlevel.h" -+ -+#if HAVE_SYS_PARAM_H -+# include -+#endif -+ - - /* globals for socket */ - -@@ -49,4 +54,7 @@ - extern int crlfflag ; - extern int active_socket ; - extern char *progname ; --extern char *sys_errlist[], *sys_siglist[] ; -+ -+#if !(defined(BSD) && (BSD >=199306)) -+ extern char *sys_errlist[], *sys_siglist[] ; -+#endif ---- io.c.orig Sun Aug 30 19:15:26 1992 -+++ io.c Wed Aug 14 16:57:58 1996 -@@ -16,6 +16,8 @@ - #endif - #include - #include -+#include -+#include - #include "globals.h" - - /* read from from, write to to. select(2) has returned, so input -@@ -90,7 +92,7 @@ - - /* all IO to and from the socket is handled here. The main part is - * a loop around select(2). */ --do_io() -+void do_io() - { - fd_set readfds ; - int fdset_width ; ---- siglist.c.orig Sun Aug 30 15:50:48 1992 -+++ siglist.c Wed Aug 14 16:57:58 1996 -@@ -32,12 +32,18 @@ - # endif /* !_NSIG */ - #endif /* !NSIG */ - --char *sys_siglist[NSIG]; -+#if HAVE_SYS_PARAM_H -+# include -+#endif - -+#if !(defined(BSD) && (BSD >=199306)) -+char *sys_siglist[NSIG]; -+#endif - extern *malloc (); - --initialize_siglist () -+void initialize_siglist () - { -+#if !(defined(BSD) && (BSD >=199306)) - register int i; - - for (i = 0; i < NSIG; i++) -@@ -219,4 +225,5 @@ - sprintf (sys_siglist[i], "Unknown Signal #%d", i); - } - } -+#endif /* !(defined(BSD) && (BSD >=199306)) */ - } ---- socket.1.orig Wed Sep 9 16:38:19 1992 -+++ socket.1 Wed Aug 14 16:57:58 1996 -@@ -158,4 +158,4 @@ - .SH VERSION - This manual page describes Socket\-1.1. - .SH AUTHOR --Juergen Nickelsen -+Juergen Nickelsen ---- socket.c.orig Wed Sep 9 16:14:34 1992 -+++ socket.c Wed Aug 14 16:57:59 1996 -@@ -18,6 +18,8 @@ - #else - #include - #endif -+#include -+#include - #include "globals.h" - - /* global variables */ -@@ -37,6 +39,8 @@ - void server A((int port, char *service_name)) ; - void handle_server_connection A((void)) ; - void client A((char *host, int port, char *service_name)) ; -+extern void init_signals A((void)) ; -+extern void do_io A((void)) ; - - int main(argc, argv) - int argc ; -@@ -46,7 +50,7 @@ - int opt ; /* option character */ - int error = 0 ; /* usage error occurred */ - extern int optind ; /* from getopt() */ -- char *host ; /* name of remote host */ -+ /* char *host ; */ /* name of remote host */ - int port ; /* port number for socket */ - char *service_name ; /* name of service for port */ - -@@ -58,7 +62,7 @@ - - /* set up progname for later use */ - progname = argv[0] ; -- if (cp = strrchr(progname, '/')) progname = cp + 1 ; -+ if ((cp = strrchr(progname, '/'))) progname = cp + 1 ; - - /* parse options */ - while ((opt = getopt(argc, argv, "bcflp:qrsvw?")) != -1) { -@@ -185,15 +189,15 @@ - long norder ; - char dotted[20] ; - -- he = gethostbyaddr(&sa.sin_addr.s_addr, -+ he = gethostbyaddr((char *)&sa.sin_addr.s_addr, - sizeof(sa.sin_addr.s_addr), AF_INET) ; - if (!he) { - norder = htonl(sa.sin_addr.s_addr) ; - sprintf(dotted, "%d.%d.%d.%d", -- (norder >> 24) & 0xff, -- (norder >> 16) & 0xff, -- (norder >> 8) & 0xff, -- norder & 0xff) ; -+ (int)((norder >> 24) & 0xff), -+ (int)((norder >> 16) & 0xff), -+ (int)((norder >> 8) & 0xff), -+ (int)(norder & 0xff)) ; - } - fprintf(stderr, "connection from %s\n", - (he ? he->h_name : dotted)) ; ---- socketp.c.orig Sun Aug 9 03:41:42 1992 -+++ socketp.c Wed Aug 14 16:57:59 1996 -@@ -11,10 +11,16 @@ - #include - #include - #include -+#include - #include - #include -+#include -+#include -+#include - #include "globals.h" - -+extern int is_number A((char *)); -+ - /* - * create a server socket on PORT accepting QUEUE_LENGTH connections - */ -@@ -52,7 +58,7 @@ - { - struct sockaddr_in sa ; - struct hostent *hp ; -- int a, s ; -+ int s ; - long addr ; - - -@@ -76,7 +82,7 @@ - if ((s = socket(sa.sin_family, SOCK_STREAM, 0)) < 0) { /* get socket */ - return -1 ; - } -- if (connect(s, &sa, sizeof(sa)) < 0) { /* connect */ -+ if (connect(s, (struct sockaddr *)&sa, sizeof(sa)) < 0) { /* connect */ - close(s) ; - return -1 ; - } ---- utils.c.orig Wed Sep 9 16:31:16 1992 -+++ utils.c Wed Aug 14 16:57:59 1996 -@@ -25,8 +25,10 @@ - #else - #include - #endif -+#include - #include "globals.h" - -+extern void initialize_siglist A((void)) ; - - /* Signal handler, print message and exit */ - SIG_HANDLER_RET exitsig(sig) -@@ -70,7 +72,7 @@ - - /* set up signal handling. All except TSTP, CONT, CLD, and QUIT - * are caught with exitsig(). */ --init_signals() -+void init_signals() - { - int i ; - #ifdef SIG_SETMASK /* only with BSD signals */ Property changes on: head/sysutils/socket/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/socket/files/patch-ab =================================================================== --- head/sysutils/socket/files/patch-ab (revision 363334) +++ head/sysutils/socket/files/patch-ab (nonexistent) @@ -1,37 +0,0 @@ -*** Makefile.orig Fri Mar 22 11:42:23 2002 ---- Makefile Fri Mar 22 11:56:04 2002 -*************** -*** 8,14 **** - ### socket.1 in /usr/local/man/man1/socket.1 - ### Make sure the target directories exist before doing a "make install". - -! INSTALLBASE = /usr/local - INSTALLBINPATH = $(INSTALLBASE)/bin - INSTALLBINMODE = 755 - INSTALLMANPATH = $(INSTALLBASE)/man ---- 8,14 ---- - ### socket.1 in /usr/local/man/man1/socket.1 - ### Make sure the target directories exist before doing a "make install". - -! INSTALLBASE = ${DESTDIR}${PREFIX} - INSTALLBINPATH = $(INSTALLBASE)/bin - INSTALLBINMODE = 755 - INSTALLMANPATH = $(INSTALLBASE)/man -*************** -*** 43,50 **** - ### CDC 4680 EP/IX: (I know it *has* setsid(2), but not with bsd43) - # SWITCHES = -systype bsd43 -DNOSETSID - -! # FreeBSD 2.x (4.4BSD) -! SWITCHES=-DHAVE_SYS_PARAM_H -Wall - - ### It should not be necessary to change anything below this line. - ################################################################## ---- 43,49 ---- - ### CDC 4680 EP/IX: (I know it *has* setsid(2), but not with bsd43) - # SWITCHES = -systype bsd43 -DNOSETSID - -! - - ### It should not be necessary to change anything below this line. - ################################################################## Property changes on: head/sysutils/socket/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/socket/files/patch-ad =================================================================== --- head/sysutils/socket/files/patch-ad (revision 363334) +++ head/sysutils/socket/files/patch-ad (nonexistent) @@ -1,31 +0,0 @@ -*** globals.h.orig Fri Mar 22 11:42:23 2002 ---- globals.h Fri Mar 22 12:05:22 2002 -*************** -*** 13,19 **** - # include - #endif - -- - /* globals for socket */ - - #define IN 0 /* standard input */ ---- 13,18 ---- -*************** -*** 27,35 **** ---- 26,41 ---- - #define A(args) () - #endif - -+ #ifndef USE_INET6 - int create_server_socket A((int port, int queue_length)) ; - int create_client_socket A((char **hostname, int port)) ; - int resolve_service A((char *name_or_number, char *protocol, char **name)) ; -+ #else /* USE_INET6 */ -+ int *create_server_sockets A((char **port, int queue_length)) ; -+ int create_client_socket A((char **hostname, char **port)) ; -+ int socket_local_name A((int socket, char **name, char **ipname, char **port)); -+ int socket_remote_name A((int socket, char **name, char **ipname, char **port)); -+ #endif /* USE_INET6 */ - void catchsig A((int sig)) ; - void usage A((void)) ; - int do_read_write A((int from, int to)) ; Property changes on: head/sysutils/socket/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/socket/files/patch-ae =================================================================== --- head/sysutils/socket/files/patch-ae (revision 363334) +++ head/sysutils/socket/files/patch-ae (nonexistent) @@ -1,327 +0,0 @@ -*** socket.c.orig Fri Mar 22 11:42:23 2002 ---- socket.c Fri Mar 22 12:06:16 2002 -*************** -*** 9,14 **** ---- 9,17 ---- - - #include - #include -+ #ifdef USE_INET6 -+ #include -+ #endif /* USE_INET6 */ - #include - #include - #include -*************** -*** 36,44 **** - char *progname ; /* name of the game */ - char *pipe_program = NULL ; /* program to execute in two-way pipe */ - - void server A((int port, char *service_name)) ; -- void handle_server_connection A((void)) ; - void client A((char *host, int port, char *service_name)) ; - extern void init_signals A((void)) ; - extern void do_io A((void)) ; - ---- 39,53 ---- - char *progname ; /* name of the game */ - char *pipe_program = NULL ; /* program to execute in two-way pipe */ - -+ #ifndef USE_INET6 - void server A((int port, char *service_name)) ; - void client A((char *host, int port, char *service_name)) ; -+ #else /* USE_INET6 */ -+ void server A((char *port)) ; -+ void client A((char *host, char *port)) ; -+ #endif /* USE_INET6 */ -+ -+ void handle_server_connection A((void)) ; - extern void init_signals A((void)) ; - extern void do_io A((void)) ; - -*************** -*** 51,58 **** ---- 60,69 ---- - int error = 0 ; /* usage error occurred */ - extern int optind ; /* from getopt() */ - /* char *host ; */ /* name of remote host */ -+ #ifndef USE_INET6 - int port ; /* port number for socket */ - char *service_name ; /* name of service for port */ -+ #endif /* USE_INET6 */ - - /* print version ID if requested */ - if (argv[1] && !strcmp(argv[1], "-version")) { -*************** -*** 62,68 **** - - /* set up progname for later use */ - progname = argv[0] ; -! if ((cp = strrchr(progname, '/'))) progname = cp + 1 ; - - /* parse options */ - while ((opt = getopt(argc, argv, "bcflp:qrsvw?")) != -1) { ---- 73,80 ---- - - /* set up progname for later use */ - progname = argv[0] ; -! cp = strrchr(progname, '/'); -! if (cp) progname = cp + 1 ; - - /* parse options */ - while ((opt = getopt(argc, argv, "bcflp:qrsvw?")) != -1) { -*************** -*** 130,135 **** ---- 142,148 ---- - /* set up signal handling */ - init_signals() ; - -+ #ifndef USE_INET6 - /* get port number */ - port = resolve_service(argv[optind + 1 - serverflag], - "tcp", &service_name) ; -*************** -*** 138,178 **** ---- 151,231 ---- - exit(5) ; - } - -+ #endif /* not USE_INET6 */ - /* and go */ - if (serverflag) { - if (backgflag) { - background() ; - } -+ #ifndef USE_INET6 - server(port, service_name) ; -+ #else /* USE_INET6 */ -+ server(argv[optind]) ; -+ #endif /* USE_INET6 */ - } else { -+ #ifndef USE_INET6 - client(argv[optind], port, service_name) ; -+ #else /* USE_INET6 */ -+ client(argv[optind], argv[optind + 1]) ; -+ #endif /* USE_INET6 */ - } - exit(0) ; - } - - -+ #ifndef USE_INET6 - void server(port, service_name) - int port ; - char *service_name ; -+ #else /* USE_INET6 */ -+ void server(port) -+ char *port ; -+ #endif /* USE_INET6 */ - { -+ #ifndef USE_INET6 - int socket_handle, alen ; -+ #else /* USE_INET6 */ -+ int *socket_handle_list ; -+ #endif /* USE_INET6 */ - - /* allocate server socket */ -+ #ifndef USE_INET6 - socket_handle = create_server_socket(port, 1) ; - if (socket_handle < 0) { -+ #else /* USE_INET6 */ -+ socket_handle_list = create_server_sockets(&port, 1) ; -+ if (!socket_handle_list) { -+ #endif /* USE_INET6 */ - perror2("server socket") ; - exit(1) ; - } -+ #ifdef USE_INET6 -+ -+ #endif /* USE_INET6 */ - if (verboseflag) { -+ #ifndef USE_INET6 - fprintf(stderr, "listening on port %d", port) ; - if (service_name) { - fprintf(stderr, " (%s)", service_name) ; - } - fprintf(stderr, "\n") ; -+ #else /* USE_INET6 */ -+ char *ip, *port; -+ int fd, i; -+ -+ fd = socket_handle_list[1]; -+ for (i = 1; i <= socket_handle_list[0]; i++) { -+ if (!fd || fd < socket_handle_list[i]) -+ fd = socket_handle_list[i]; -+ socket_local_name (fd, NULL, &ip, &port); -+ fprintf(stderr, "listening at address %s on port %s\n", ip, port) ; -+ } -+ #endif /* USE_INET6 */ - } - - /* server loop */ - do { -+ #ifndef USE_INET6 - struct sockaddr_in sa ; - - alen = sizeof(sa) ; -*************** -*** 189,204 **** - long norder ; - char dotted[20] ; - -! he = gethostbyaddr((char *)&sa.sin_addr.s_addr, - sizeof(sa.sin_addr.s_addr), AF_INET) ; - if (!he) { - norder = htonl(sa.sin_addr.s_addr) ; - sprintf(dotted, "%d.%d.%d.%d", -! (int)((norder >> 24) & 0xff), -! (int)((norder >> 16) & 0xff), -! (int)((norder >> 8) & 0xff), -! (int)(norder & 0xff)) ; - } - fprintf(stderr, "connection from %s\n", - (he ? he->h_name : dotted)) ; - } ---- 242,317 ---- - long norder ; - char dotted[20] ; - -! he = gethostbyaddr((const char *)&sa.sin_addr.s_addr, - sizeof(sa.sin_addr.s_addr), AF_INET) ; - if (!he) { - norder = htonl(sa.sin_addr.s_addr) ; - sprintf(dotted, "%d.%d.%d.%d", -! (int)((norder >> 24) & 0xff), -! (int)((norder >> 16) & 0xff), -! (int)((norder >> 8) & 0xff), -! (int)(norder & 0xff)) ; -! #else /* USE_INET6 */ -! struct timeval tv; -! fd_set readfd; -! int fd, i, nfds, retval; -! -! fd = socket_handle_list[1]; -! for (i = 1; i <= socket_handle_list[0]; i++) { -! if (!fd || fd < socket_handle_list[i]) -! fd = socket_handle_list[i]; -! } -! nfds=fd+1; -! -! FD_ZERO(&readfd); -! for (i = 1; i <= socket_handle_list[0]; i++) -! FD_SET(socket_handle_list[i],&readfd); -! -! tv.tv_sec = 10; -! tv.tv_usec = 0; -! -! retval = select(nfds, &readfd, NULL, NULL, &tv); -! -! if(retval!=-1) { -! for (i = 1; i <= socket_handle_list[0]; i++) { -! fd = socket_handle_list[i]; -! if (FD_ISSET(fd, &readfd)) { -! -! /* accept a connection */ -! active_socket = accept(fd, (struct sockaddr *) 0, (int *)0); -! if (active_socket == -1) { -! perror2("accept") ; -! } else { -! /* if verbose, get name of peer and give message */ -! if (verboseflag) { -! char *host, *ip, *port; -! -! if(!socket_remote_name(active_socket,&host, &ip, &port)) { -! fprintf(stderr, "connection from %s at %s to %s\n", host, ip, port); -! } -! else -! fprintf(stderr, "cannot get name or address of peer") ; -! } -! -! if (forkflag) { -! switch (fork()) { -! case 0: -! handle_server_connection() ; -! exit(0) ; -! case -1: -! perror2("fork") ; -! break ; -! default: -! close(active_socket) ; -! wait_for_children() ; -! } -! } else { -! handle_server_connection() ; -! } -! } -! #endif /* USE_INET6 */ - } -+ #ifndef USE_INET6 - fprintf(stderr, "connection from %s\n", - (he ? he->h_name : dotted)) ; - } -*************** -*** 216,224 **** ---- 329,342 ---- - } - } else { - handle_server_connection() ; -+ #endif /* not USE_INET6 */ - } - } - } while (loopflag) ; -+ #ifdef USE_INET6 -+ -+ free (socket_handle_list); -+ #endif /* USE_INET6 */ - } - - -*************** -*** 239,251 **** ---- 357,381 ---- - } - - -+ #ifndef USE_INET6 - void client(host, port, service_name) -+ #else /* USE_INET6 */ -+ void client(host, port) -+ #endif /* USE_INET6 */ - char *host ; -+ #ifndef USE_INET6 - int port ; - char *service_name ; -+ #else /* USE_INET6 */ -+ char *port ; -+ #endif /* USE_INET6 */ - { - /* get connection */ -+ #ifndef USE_INET6 - active_socket = create_client_socket(&host, port) ; -+ #else /* USE_INET6 */ -+ active_socket = create_client_socket(&host, &port) ; -+ #endif /* USE_INET6 */ - if (active_socket == -1) { - perror2("client socket") ; - exit(errno) ; -*************** -*** 254,264 **** ---- 384,401 ---- - exit(13) ; - } - if (verboseflag) { -+ #ifndef USE_INET6 - fprintf(stderr, "connected to %s port %d", host, port) ; - if (service_name) { - fprintf(stderr, " (%s)", service_name) ; - } - fprintf(stderr, "\n") ; -+ #else /* USE_INET6 */ -+ char *host, *ip, *port; -+ -+ socket_local_name (active_socket, &host, &ip, &port); -+ fprintf(stderr, "connected to %s with address %s at port %s\n", host, ip, port) ; -+ #endif /* USE_INET6 */ - } - - /* open pipes to program if requested */ Property changes on: head/sysutils/socket/files/patch-ae ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/socket/files/patch-af =================================================================== --- head/sysutils/socket/files/patch-af (revision 363334) +++ head/sysutils/socket/files/patch-af (nonexistent) @@ -1,358 +0,0 @@ -*** socketp.c.orig Fri Mar 22 11:42:23 2002 ---- socketp.c Fri Mar 22 12:07:59 2002 -*************** -*** 21,26 **** ---- 21,27 ---- - - extern int is_number A((char *)); - -+ #ifndef USE_INET6 - /* - * create a server socket on PORT accepting QUEUE_LENGTH connections - */ -*************** -*** 31,39 **** - struct sockaddr_in sa ; - int s; - -! if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - return -1 ; -- } - - bzero((char *) &sa, sizeof(sa)) ; - sa.sin_family = AF_INET ; ---- 32,40 ---- - struct sockaddr_in sa ; - int s; - -! s = socket(AF_INET, SOCK_STREAM, 0); -! if (s < 0) - return -1 ; - - bzero((char *) &sa, sizeof(sa)) ; - sa.sin_family = AF_INET ; -*************** -*** 41,56 **** - sa.sin_port = htons(port) ; - - if (bind(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) { -! return -1 ; - } - if (listen(s, 1) < 0) { -! return -1 ; - } - - return s ; - } - - - /* create a client socket connected to PORT on HOSTNAME */ - int create_client_socket(hostname, port) - char **hostname ; ---- 42,126 ---- - sa.sin_port = htons(port) ; - - if (bind(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) { -! return -1 ; - } - if (listen(s, 1) < 0) { -! return -1 ; - } - - return s ; - } -+ #else /* USE_INET6 */ -+ /* -+ * create a server socket(s) on PORT accepting QUEUE_LENGTH connections -+ * -+ * FWD (ifdef USE_INET6): -+ * there can be more than one socket; one for each supported address -+ * family. This is for portability as not all IPv6 stacks implement -+ * the wildcard bind as a bind to *ll IPv4 *and* IPv6 addresses. -+ * so we'll just open a socket for each address getaddrinfo() gives -+ * back to us. The price of portability... -+ */ -+ int *create_server_sockets(port, queue_length) -+ char **port ; -+ int queue_length ; -+ { -+ struct addrinfo hints, *r, *res; -+ int *s, *slist, error, maxs; -+ int reuse_addr = 1; -+ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_flags = AI_PASSIVE; -+ hints.ai_family = AF_UNSPEC; -+ hints.ai_socktype = SOCK_STREAM; -+ hints.ai_protocol = 0; -+ error = getaddrinfo(NULL, *port, &hints, &res); -+ -+ if (!error) { -+ for (maxs = 0, r = res; r; r = r->ai_next, maxs++); -+ slist = malloc ((maxs+1) * sizeof(int)); -+ if (slist) { -+ slist[0] = maxs; /* max. num of sockets */ -+ -+ s = slist+1; -+ for (r = res; r; r = r->ai_next) { -+ *s = socket(r->ai_family, r->ai_socktype, r->ai_protocol); -+ if (*s < 0) -+ continue; -+ -+ setsockopt(*s,SOL_SOCKET,SO_REUSEADDR,&reuse_addr,sizeof(reuse_addr)); -+ -+ if (bind(*s, r->ai_addr, r->ai_addrlen) < 0) { -+ close (*s); -+ continue; -+ } -+ -+ if (listen(*s, 1) < 0) { -+ close (*s); -+ continue; -+ } -+ s++; -+ } -+ } -+ } -+ else -+ slist = NULL; - -+ if (res) -+ freeaddrinfo(res); - -+ if (slist && !slist[0]) { -+ free (slist); -+ slist = NULL; -+ } -+ -+ return (slist); -+ } -+ #endif /* USE_INET6 */ -+ -+ -+ /* create a client socket connected to PORT on HOSTNAME */ -+ #ifndef USE_INET6 - /* create a client socket connected to PORT on HOSTNAME */ - int create_client_socket(hostname, port) - char **hostname ; -*************** -*** 64,94 **** - - bzero(&sa, sizeof(sa)) ; - if ((addr = inet_addr(*hostname)) != -1) { -! /* is Internet addr in octet notation */ -! bcopy(&addr, (char *) &sa.sin_addr, sizeof(addr)) ; /* set address */ -! sa.sin_family = AF_INET ; - } else { -! /* do we know the host's address? */ -! if ((hp = gethostbyname(*hostname)) == NULL) { -! return -2 ; -! } -! *hostname = hp->h_name ; -! bcopy(hp->h_addr, (char *) &sa.sin_addr, hp->h_length) ; -! sa.sin_family = hp->h_addrtype ; - } - - sa.sin_port = htons((u_short) port) ; - - if ((s = socket(sa.sin_family, SOCK_STREAM, 0)) < 0) { /* get socket */ -! return -1 ; - } - if (connect(s, (struct sockaddr *)&sa, sizeof(sa)) < 0) { /* connect */ -! close(s) ; -! return -1 ; - } - return s ; - } - - /* return the port number for service NAME_OR_NUMBER. If NAME is non-null, - * the name is the service is written there. - */ ---- 134,311 ---- - - bzero(&sa, sizeof(sa)) ; - if ((addr = inet_addr(*hostname)) != -1) { -! /* is Internet addr in octet notation */ -! bcopy(&addr, (char *) &sa.sin_addr, sizeof(addr)) ; /* set address */ -! sa.sin_family = AF_INET ; - } else { -! /* do we know the host's address? */ -! if ((hp = gethostbyname(*hostname)) == NULL) { -! return -2 ; -! } -! *hostname = hp->h_name ; -! bcopy(hp->h_addr, (char *) &sa.sin_addr, hp->h_length) ; -! sa.sin_family = hp->h_addrtype ; - } - - sa.sin_port = htons((u_short) port) ; - - if ((s = socket(sa.sin_family, SOCK_STREAM, 0)) < 0) { /* get socket */ -! return -1 ; - } - if (connect(s, (struct sockaddr *)&sa, sizeof(sa)) < 0) { /* connect */ -! close(s) ; -! return -1 ; - } - return s ; - } - -+ #else /* USE_INET6 */ -+ int create_client_socket(hostname, port) -+ char **hostname ; -+ char **port ; -+ { -+ int s, connected, err ; -+ struct addrinfo hints, *r, *res; -+ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_flags = AI_NUMERICHOST; -+ hints.ai_family = AF_UNSPEC; -+ hints.ai_socktype= SOCK_STREAM; -+ err = getaddrinfo(*hostname, *port, &hints, &res); -+ if (res) freeaddrinfo(res); -+ -+ if (!err) { -+ /* numeric */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_flags = AI_CANONNAME; -+ hints.ai_family = AF_UNSPEC; -+ hints.ai_socktype = SOCK_STREAM; -+ hints.ai_protocol = 0; -+ err = getaddrinfo(*hostname, *port, &hints, &res); -+ if (err) s = -2; -+ } else { -+ /* non-numeric */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_family = AF_UNSPEC; -+ hints.ai_socktype = SOCK_STREAM; -+ hints.ai_protocol = 0; -+ err = getaddrinfo(*hostname, *port, &hints, &res); -+ if (err) s = -2; -+ } -+ -+ -+ if (!err) { -+ err = 0; s = -1; -+ connected = 0; -+ for (r = res; r && !connected; r = r->ai_next) { -+ s = socket(r->ai_family, r->ai_socktype, r->ai_protocol); -+ if (s < 0) -+ continue; -+ -+ if (connect(s, r->ai_addr, r->ai_addrlen) < 0) { -+ err = errno; -+ close(s); -+ s = -1; -+ continue; -+ } -+ connected++; -+ break; -+ } -+ if (!connected) s = -1; -+ } -+ -+ if (res) -+ freeaddrinfo(res); -+ -+ return (s); -+ } -+ #endif /* USE_INET6 */ -+ -+ #ifdef USE_INET6 -+ /* Determines hostname, address and port number used for the peer of socket */ -+ int socket_remote_name(socket, name, ipname, port) -+ int socket; -+ char **name; -+ char **ipname; -+ char **port; -+ { -+ struct sockaddr_storage server; -+ int length=sizeof(server), retval, error; -+ static char host[NI_MAXHOST],ip[NI_MAXHOST],portstr[NI_MAXSERV]; -+ -+ error = getpeername(socket,(struct sockaddr*)&server,&length); -+ if(!error) { -+ error = getnameinfo((struct sockaddr*)&server, length, host, -+ NI_MAXHOST, NULL, 0, 0); -+ error = getnameinfo((struct sockaddr*)&server, length, ip, -+ NI_MAXHOST, NULL, NI_MAXSERV, -+ NI_NUMERICHOST); -+ retval = error; -+ -+ error = getnameinfo((struct sockaddr*)&server, length, NULL, 0, -+ portstr, NI_MAXSERV, 0); -+ -+ if (error) -+ retval = getnameinfo((struct sockaddr*)&server, length, ip, -+ NI_MAXHOST, portstr, NI_MAXSERV, -+ NI_NUMERICSERV); -+ } -+ else -+ retval = error; -+ -+ if(name) -+ *name=host; -+ if(ipname) -+ *ipname=ip; -+ if(port) -+ *port=portstr; -+ -+ return(retval); -+ } -+ -+ /* Determines the hostname, address and port number used for our socket */ -+ int socket_local_name(socket, name, ipname, port) -+ int socket; -+ char **name; -+ char **ipname; -+ char **port; -+ { -+ struct sockaddr_storage server; -+ int length=sizeof(server), retval, error; -+ static char host[NI_MAXHOST],ip[NI_MAXHOST],portstr[NI_MAXSERV]; -+ -+ error = getsockname(socket,(struct sockaddr*)&server,&length); -+ if(!error) { -+ error = getnameinfo((struct sockaddr*)&server, length, host, -+ NI_MAXHOST, NULL, 0, 0); -+ error = getnameinfo((struct sockaddr*)&server, length, ip, -+ NI_MAXHOST, NULL, NI_MAXSERV, -+ NI_NUMERICHOST); -+ retval = error; -+ -+ error = getnameinfo((struct sockaddr*)&server, length, NULL, 0, -+ portstr, NI_MAXSERV, 0); -+ -+ if (error) -+ retval = getnameinfo((struct sockaddr*)&server, length, ip, -+ NI_MAXHOST, portstr, NI_MAXSERV, -+ NI_NUMERICSERV); -+ } -+ else -+ retval = error; -+ -+ if(name) -+ *name=host; -+ if(ipname) -+ *ipname=ip; -+ if(port) -+ *port=portstr; -+ -+ return(retval); -+ } -+ #endif /* USE_INET6 */ -+ -+ #ifndef USE_INET6 - /* return the port number for service NAME_OR_NUMBER. If NAME is non-null, - * the name is the service is written there. - */ -*************** -*** 122,126 **** ---- 339,344 ---- - return ntohs(servent->s_port) ; - } - } -+ #endif /* !USE_INET6 */ - - /*EOF*/ Property changes on: head/sysutils/socket/files/patch-af ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/socket/files/patch-ag =================================================================== --- head/sysutils/socket/files/patch-ag (revision 363334) +++ head/sysutils/socket/files/patch-ag (nonexistent) @@ -1,21 +0,0 @@ -*** utils.c.orig Fri Feb 29 15:21:52 2008 ---- utils.c Fri Feb 29 15:23:26 2008 -*************** -*** 89,98 **** ---- 89,102 ---- - case SIGTTIN: - case SIGSTOP: - case SIGCONT: - continue ; - #endif -+ #ifdef SIGINFO -+ case SIGINFO: -+ continue ; -+ #endif - #if !defined (SIGCHLD) && defined (SIGCLD) - #define SIGCHLD SIGCLD - #endif - #ifdef SIGCHLD - case SIGCHLD: - - Property changes on: head/sysutils/socket/files/patch-ag ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/socket/files/patch-Makefile =================================================================== --- head/sysutils/socket/files/patch-Makefile (revision 363334) +++ head/sysutils/socket/files/patch-Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- Makefile.orig 1992-09-10 23:59:31.000000000 +0900 -+++ Makefile 2013-12-02 12:47:26.000000000 +0900 -@@ -13,7 +13,7 @@ - INSTALLBINMODE = 755 - INSTALLMANPATH = $(INSTALLBASE)/man - INSTALLMANMODE = 444 --CC = cc -+#CC = ${CC} - CFLAGS = $(SWITCHES) -O - LDFLAGS = $(SWITCHES) -s - Property changes on: head/sysutils/socket/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/sysutils/socket/files/patch-Headerfix =================================================================== --- head/sysutils/socket/files/patch-Headerfix (nonexistent) +++ head/sysutils/socket/files/patch-Headerfix (revision 363335) @@ -0,0 +1,218 @@ +--- Makefile.orig Thu Sep 10 16:59:31 1992 ++++ Makefile Wed Aug 14 16:57:57 1996 +@@ -43,7 +43,8 @@ + ### CDC 4680 EP/IX: (I know it *has* setsid(2), but not with bsd43) + # SWITCHES = -systype bsd43 -DNOSETSID + +- ++# FreeBSD 2.x (4.4BSD) ++SWITCHES=-DHAVE_SYS_PARAM_H -Wall + + ### It should not be necessary to change anything below this line. + ################################################################## +--- README.orig Wed Sep 9 16:45:16 1992 ++++ README Wed Aug 14 16:57:58 1996 +@@ -166,4 +166,4 @@ + 1000 Berlin 10 + Germany + +- ++Juergen Nickelsen +--- globals.h.orig Sun Aug 30 21:04:27 1992 ++++ globals.h Wed Aug 14 16:57:58 1996 +@@ -8,6 +8,11 @@ + */ + + #include "patchlevel.h" ++ ++#if HAVE_SYS_PARAM_H ++# include ++#endif ++ + + /* globals for socket */ + +@@ -49,4 +54,7 @@ + extern int crlfflag ; + extern int active_socket ; + extern char *progname ; +-extern char *sys_errlist[], *sys_siglist[] ; ++ ++#if !(defined(BSD) && (BSD >=199306)) ++ extern char *sys_errlist[], *sys_siglist[] ; ++#endif +--- io.c.orig Sun Aug 30 19:15:26 1992 ++++ io.c Wed Aug 14 16:57:58 1996 +@@ -16,6 +16,8 @@ + #endif + #include + #include ++#include ++#include + #include "globals.h" + + /* read from from, write to to. select(2) has returned, so input +@@ -90,7 +92,7 @@ + + /* all IO to and from the socket is handled here. The main part is + * a loop around select(2). */ +-do_io() ++void do_io() + { + fd_set readfds ; + int fdset_width ; +--- siglist.c.orig Sun Aug 30 15:50:48 1992 ++++ siglist.c Wed Aug 14 16:57:58 1996 +@@ -32,12 +32,18 @@ + # endif /* !_NSIG */ + #endif /* !NSIG */ + +-char *sys_siglist[NSIG]; ++#if HAVE_SYS_PARAM_H ++# include ++#endif + ++#if !(defined(BSD) && (BSD >=199306)) ++char *sys_siglist[NSIG]; ++#endif + extern *malloc (); + +-initialize_siglist () ++void initialize_siglist () + { ++#if !(defined(BSD) && (BSD >=199306)) + register int i; + + for (i = 0; i < NSIG; i++) +@@ -219,4 +225,5 @@ + sprintf (sys_siglist[i], "Unknown Signal #%d", i); + } + } ++#endif /* !(defined(BSD) && (BSD >=199306)) */ + } +--- socket.1.orig Wed Sep 9 16:38:19 1992 ++++ socket.1 Wed Aug 14 16:57:58 1996 +@@ -158,4 +158,4 @@ + .SH VERSION + This manual page describes Socket\-1.1. + .SH AUTHOR +-Juergen Nickelsen ++Juergen Nickelsen +--- socket.c.orig Wed Sep 9 16:14:34 1992 ++++ socket.c Wed Aug 14 16:57:59 1996 +@@ -18,6 +18,8 @@ + #else + #include + #endif ++#include ++#include + #include "globals.h" + + /* global variables */ +@@ -37,6 +39,8 @@ + void server A((int port, char *service_name)) ; + void handle_server_connection A((void)) ; + void client A((char *host, int port, char *service_name)) ; ++extern void init_signals A((void)) ; ++extern void do_io A((void)) ; + + int main(argc, argv) + int argc ; +@@ -46,7 +50,7 @@ + int opt ; /* option character */ + int error = 0 ; /* usage error occurred */ + extern int optind ; /* from getopt() */ +- char *host ; /* name of remote host */ ++ /* char *host ; */ /* name of remote host */ + int port ; /* port number for socket */ + char *service_name ; /* name of service for port */ + +@@ -58,7 +62,7 @@ + + /* set up progname for later use */ + progname = argv[0] ; +- if (cp = strrchr(progname, '/')) progname = cp + 1 ; ++ if ((cp = strrchr(progname, '/'))) progname = cp + 1 ; + + /* parse options */ + while ((opt = getopt(argc, argv, "bcflp:qrsvw?")) != -1) { +@@ -185,15 +189,15 @@ + long norder ; + char dotted[20] ; + +- he = gethostbyaddr(&sa.sin_addr.s_addr, ++ he = gethostbyaddr((char *)&sa.sin_addr.s_addr, + sizeof(sa.sin_addr.s_addr), AF_INET) ; + if (!he) { + norder = htonl(sa.sin_addr.s_addr) ; + sprintf(dotted, "%d.%d.%d.%d", +- (norder >> 24) & 0xff, +- (norder >> 16) & 0xff, +- (norder >> 8) & 0xff, +- norder & 0xff) ; ++ (int)((norder >> 24) & 0xff), ++ (int)((norder >> 16) & 0xff), ++ (int)((norder >> 8) & 0xff), ++ (int)(norder & 0xff)) ; + } + fprintf(stderr, "connection from %s\n", + (he ? he->h_name : dotted)) ; +--- socketp.c.orig Sun Aug 9 03:41:42 1992 ++++ socketp.c Wed Aug 14 16:57:59 1996 +@@ -11,10 +11,16 @@ + #include + #include + #include ++#include + #include + #include ++#include ++#include ++#include + #include "globals.h" + ++extern int is_number A((char *)); ++ + /* + * create a server socket on PORT accepting QUEUE_LENGTH connections + */ +@@ -52,7 +58,7 @@ + { + struct sockaddr_in sa ; + struct hostent *hp ; +- int a, s ; ++ int s ; + long addr ; + + +@@ -76,7 +82,7 @@ + if ((s = socket(sa.sin_family, SOCK_STREAM, 0)) < 0) { /* get socket */ + return -1 ; + } +- if (connect(s, &sa, sizeof(sa)) < 0) { /* connect */ ++ if (connect(s, (struct sockaddr *)&sa, sizeof(sa)) < 0) { /* connect */ + close(s) ; + return -1 ; + } +--- utils.c.orig Wed Sep 9 16:31:16 1992 ++++ utils.c Wed Aug 14 16:57:59 1996 +@@ -25,8 +25,10 @@ + #else + #include + #endif ++#include + #include "globals.h" + ++extern void initialize_siglist A((void)) ; + + /* Signal handler, print message and exit */ + SIG_HANDLER_RET exitsig(sig) +@@ -70,7 +72,7 @@ + + /* set up signal handling. All except TSTP, CONT, CLD, and QUIT + * are caught with exitsig(). */ +-init_signals() ++void init_signals() + { + int i ; + #ifdef SIG_SETMASK /* only with BSD signals */ Property changes on: head/sysutils/socket/files/patch-Headerfix ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/socket/files/patch-Makefile_1 =================================================================== --- head/sysutils/socket/files/patch-Makefile_1 (nonexistent) +++ head/sysutils/socket/files/patch-Makefile_1 (revision 363335) @@ -0,0 +1,11 @@ +--- Makefile.orig 1992-09-10 23:59:31.000000000 +0900 ++++ Makefile 2013-12-02 12:47:26.000000000 +0900 +@@ -13,7 +13,7 @@ + INSTALLBINMODE = 755 + INSTALLMANPATH = $(INSTALLBASE)/man + INSTALLMANMODE = 444 +-CC = cc ++#CC = ${CC} + CFLAGS = $(SWITCHES) -O + LDFLAGS = $(SWITCHES) -s + Property changes on: head/sysutils/socket/files/patch-Makefile_1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/sysutils/socket/files/patch-Makefile_2 =================================================================== --- head/sysutils/socket/files/patch-Makefile_2 (nonexistent) +++ head/sysutils/socket/files/patch-Makefile_2 (revision 363335) @@ -0,0 +1,37 @@ +*** Makefile.orig Fri Mar 22 11:42:23 2002 +--- Makefile Fri Mar 22 11:56:04 2002 +*************** +*** 8,14 **** + ### socket.1 in /usr/local/man/man1/socket.1 + ### Make sure the target directories exist before doing a "make install". + +! INSTALLBASE = /usr/local + INSTALLBINPATH = $(INSTALLBASE)/bin + INSTALLBINMODE = 755 + INSTALLMANPATH = $(INSTALLBASE)/man +--- 8,14 ---- + ### socket.1 in /usr/local/man/man1/socket.1 + ### Make sure the target directories exist before doing a "make install". + +! INSTALLBASE = ${DESTDIR}${PREFIX} + INSTALLBINPATH = $(INSTALLBASE)/bin + INSTALLBINMODE = 755 + INSTALLMANPATH = $(INSTALLBASE)/man +*************** +*** 43,50 **** + ### CDC 4680 EP/IX: (I know it *has* setsid(2), but not with bsd43) + # SWITCHES = -systype bsd43 -DNOSETSID + +! # FreeBSD 2.x (4.4BSD) +! SWITCHES=-DHAVE_SYS_PARAM_H -Wall + + ### It should not be necessary to change anything below this line. + ################################################################## +--- 43,49 ---- + ### CDC 4680 EP/IX: (I know it *has* setsid(2), but not with bsd43) + # SWITCHES = -systype bsd43 -DNOSETSID + +! + + ### It should not be necessary to change anything below this line. + ################################################################## Property changes on: head/sysutils/socket/files/patch-Makefile_2 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/socket/files/patch-globals.h =================================================================== --- head/sysutils/socket/files/patch-globals.h (nonexistent) +++ head/sysutils/socket/files/patch-globals.h (revision 363335) @@ -0,0 +1,31 @@ +*** globals.h.orig Fri Mar 22 11:42:23 2002 +--- globals.h Fri Mar 22 12:05:22 2002 +*************** +*** 13,19 **** + # include + #endif + +- + /* globals for socket */ + + #define IN 0 /* standard input */ +--- 13,18 ---- +*************** +*** 27,35 **** +--- 26,41 ---- + #define A(args) () + #endif + ++ #ifndef USE_INET6 + int create_server_socket A((int port, int queue_length)) ; + int create_client_socket A((char **hostname, int port)) ; + int resolve_service A((char *name_or_number, char *protocol, char **name)) ; ++ #else /* USE_INET6 */ ++ int *create_server_sockets A((char **port, int queue_length)) ; ++ int create_client_socket A((char **hostname, char **port)) ; ++ int socket_local_name A((int socket, char **name, char **ipname, char **port)); ++ int socket_remote_name A((int socket, char **name, char **ipname, char **port)); ++ #endif /* USE_INET6 */ + void catchsig A((int sig)) ; + void usage A((void)) ; + int do_read_write A((int from, int to)) ; Property changes on: head/sysutils/socket/files/patch-globals.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/socket/files/patch-socket.c =================================================================== --- head/sysutils/socket/files/patch-socket.c (nonexistent) +++ head/sysutils/socket/files/patch-socket.c (revision 363335) @@ -0,0 +1,327 @@ +*** socket.c.orig Fri Mar 22 11:42:23 2002 +--- socket.c Fri Mar 22 12:06:16 2002 +*************** +*** 9,14 **** +--- 9,17 ---- + + #include + #include ++ #ifdef USE_INET6 ++ #include ++ #endif /* USE_INET6 */ + #include + #include + #include +*************** +*** 36,44 **** + char *progname ; /* name of the game */ + char *pipe_program = NULL ; /* program to execute in two-way pipe */ + + void server A((int port, char *service_name)) ; +- void handle_server_connection A((void)) ; + void client A((char *host, int port, char *service_name)) ; + extern void init_signals A((void)) ; + extern void do_io A((void)) ; + +--- 39,53 ---- + char *progname ; /* name of the game */ + char *pipe_program = NULL ; /* program to execute in two-way pipe */ + ++ #ifndef USE_INET6 + void server A((int port, char *service_name)) ; + void client A((char *host, int port, char *service_name)) ; ++ #else /* USE_INET6 */ ++ void server A((char *port)) ; ++ void client A((char *host, char *port)) ; ++ #endif /* USE_INET6 */ ++ ++ void handle_server_connection A((void)) ; + extern void init_signals A((void)) ; + extern void do_io A((void)) ; + +*************** +*** 51,58 **** +--- 60,69 ---- + int error = 0 ; /* usage error occurred */ + extern int optind ; /* from getopt() */ + /* char *host ; */ /* name of remote host */ ++ #ifndef USE_INET6 + int port ; /* port number for socket */ + char *service_name ; /* name of service for port */ ++ #endif /* USE_INET6 */ + + /* print version ID if requested */ + if (argv[1] && !strcmp(argv[1], "-version")) { +*************** +*** 62,68 **** + + /* set up progname for later use */ + progname = argv[0] ; +! if ((cp = strrchr(progname, '/'))) progname = cp + 1 ; + + /* parse options */ + while ((opt = getopt(argc, argv, "bcflp:qrsvw?")) != -1) { +--- 73,80 ---- + + /* set up progname for later use */ + progname = argv[0] ; +! cp = strrchr(progname, '/'); +! if (cp) progname = cp + 1 ; + + /* parse options */ + while ((opt = getopt(argc, argv, "bcflp:qrsvw?")) != -1) { +*************** +*** 130,135 **** +--- 142,148 ---- + /* set up signal handling */ + init_signals() ; + ++ #ifndef USE_INET6 + /* get port number */ + port = resolve_service(argv[optind + 1 - serverflag], + "tcp", &service_name) ; +*************** +*** 138,178 **** +--- 151,231 ---- + exit(5) ; + } + ++ #endif /* not USE_INET6 */ + /* and go */ + if (serverflag) { + if (backgflag) { + background() ; + } ++ #ifndef USE_INET6 + server(port, service_name) ; ++ #else /* USE_INET6 */ ++ server(argv[optind]) ; ++ #endif /* USE_INET6 */ + } else { ++ #ifndef USE_INET6 + client(argv[optind], port, service_name) ; ++ #else /* USE_INET6 */ ++ client(argv[optind], argv[optind + 1]) ; ++ #endif /* USE_INET6 */ + } + exit(0) ; + } + + ++ #ifndef USE_INET6 + void server(port, service_name) + int port ; + char *service_name ; ++ #else /* USE_INET6 */ ++ void server(port) ++ char *port ; ++ #endif /* USE_INET6 */ + { ++ #ifndef USE_INET6 + int socket_handle, alen ; ++ #else /* USE_INET6 */ ++ int *socket_handle_list ; ++ #endif /* USE_INET6 */ + + /* allocate server socket */ ++ #ifndef USE_INET6 + socket_handle = create_server_socket(port, 1) ; + if (socket_handle < 0) { ++ #else /* USE_INET6 */ ++ socket_handle_list = create_server_sockets(&port, 1) ; ++ if (!socket_handle_list) { ++ #endif /* USE_INET6 */ + perror2("server socket") ; + exit(1) ; + } ++ #ifdef USE_INET6 ++ ++ #endif /* USE_INET6 */ + if (verboseflag) { ++ #ifndef USE_INET6 + fprintf(stderr, "listening on port %d", port) ; + if (service_name) { + fprintf(stderr, " (%s)", service_name) ; + } + fprintf(stderr, "\n") ; ++ #else /* USE_INET6 */ ++ char *ip, *port; ++ int fd, i; ++ ++ fd = socket_handle_list[1]; ++ for (i = 1; i <= socket_handle_list[0]; i++) { ++ if (!fd || fd < socket_handle_list[i]) ++ fd = socket_handle_list[i]; ++ socket_local_name (fd, NULL, &ip, &port); ++ fprintf(stderr, "listening at address %s on port %s\n", ip, port) ; ++ } ++ #endif /* USE_INET6 */ + } + + /* server loop */ + do { ++ #ifndef USE_INET6 + struct sockaddr_in sa ; + + alen = sizeof(sa) ; +*************** +*** 189,204 **** + long norder ; + char dotted[20] ; + +! he = gethostbyaddr((char *)&sa.sin_addr.s_addr, + sizeof(sa.sin_addr.s_addr), AF_INET) ; + if (!he) { + norder = htonl(sa.sin_addr.s_addr) ; + sprintf(dotted, "%d.%d.%d.%d", +! (int)((norder >> 24) & 0xff), +! (int)((norder >> 16) & 0xff), +! (int)((norder >> 8) & 0xff), +! (int)(norder & 0xff)) ; + } + fprintf(stderr, "connection from %s\n", + (he ? he->h_name : dotted)) ; + } +--- 242,317 ---- + long norder ; + char dotted[20] ; + +! he = gethostbyaddr((const char *)&sa.sin_addr.s_addr, + sizeof(sa.sin_addr.s_addr), AF_INET) ; + if (!he) { + norder = htonl(sa.sin_addr.s_addr) ; + sprintf(dotted, "%d.%d.%d.%d", +! (int)((norder >> 24) & 0xff), +! (int)((norder >> 16) & 0xff), +! (int)((norder >> 8) & 0xff), +! (int)(norder & 0xff)) ; +! #else /* USE_INET6 */ +! struct timeval tv; +! fd_set readfd; +! int fd, i, nfds, retval; +! +! fd = socket_handle_list[1]; +! for (i = 1; i <= socket_handle_list[0]; i++) { +! if (!fd || fd < socket_handle_list[i]) +! fd = socket_handle_list[i]; +! } +! nfds=fd+1; +! +! FD_ZERO(&readfd); +! for (i = 1; i <= socket_handle_list[0]; i++) +! FD_SET(socket_handle_list[i],&readfd); +! +! tv.tv_sec = 10; +! tv.tv_usec = 0; +! +! retval = select(nfds, &readfd, NULL, NULL, &tv); +! +! if(retval!=-1) { +! for (i = 1; i <= socket_handle_list[0]; i++) { +! fd = socket_handle_list[i]; +! if (FD_ISSET(fd, &readfd)) { +! +! /* accept a connection */ +! active_socket = accept(fd, (struct sockaddr *) 0, (int *)0); +! if (active_socket == -1) { +! perror2("accept") ; +! } else { +! /* if verbose, get name of peer and give message */ +! if (verboseflag) { +! char *host, *ip, *port; +! +! if(!socket_remote_name(active_socket,&host, &ip, &port)) { +! fprintf(stderr, "connection from %s at %s to %s\n", host, ip, port); +! } +! else +! fprintf(stderr, "cannot get name or address of peer") ; +! } +! +! if (forkflag) { +! switch (fork()) { +! case 0: +! handle_server_connection() ; +! exit(0) ; +! case -1: +! perror2("fork") ; +! break ; +! default: +! close(active_socket) ; +! wait_for_children() ; +! } +! } else { +! handle_server_connection() ; +! } +! } +! #endif /* USE_INET6 */ + } ++ #ifndef USE_INET6 + fprintf(stderr, "connection from %s\n", + (he ? he->h_name : dotted)) ; + } +*************** +*** 216,224 **** +--- 329,342 ---- + } + } else { + handle_server_connection() ; ++ #endif /* not USE_INET6 */ + } + } + } while (loopflag) ; ++ #ifdef USE_INET6 ++ ++ free (socket_handle_list); ++ #endif /* USE_INET6 */ + } + + +*************** +*** 239,251 **** +--- 357,381 ---- + } + + ++ #ifndef USE_INET6 + void client(host, port, service_name) ++ #else /* USE_INET6 */ ++ void client(host, port) ++ #endif /* USE_INET6 */ + char *host ; ++ #ifndef USE_INET6 + int port ; + char *service_name ; ++ #else /* USE_INET6 */ ++ char *port ; ++ #endif /* USE_INET6 */ + { + /* get connection */ ++ #ifndef USE_INET6 + active_socket = create_client_socket(&host, port) ; ++ #else /* USE_INET6 */ ++ active_socket = create_client_socket(&host, &port) ; ++ #endif /* USE_INET6 */ + if (active_socket == -1) { + perror2("client socket") ; + exit(errno) ; +*************** +*** 254,264 **** +--- 384,401 ---- + exit(13) ; + } + if (verboseflag) { ++ #ifndef USE_INET6 + fprintf(stderr, "connected to %s port %d", host, port) ; + if (service_name) { + fprintf(stderr, " (%s)", service_name) ; + } + fprintf(stderr, "\n") ; ++ #else /* USE_INET6 */ ++ char *host, *ip, *port; ++ ++ socket_local_name (active_socket, &host, &ip, &port); ++ fprintf(stderr, "connected to %s with address %s at port %s\n", host, ip, port) ; ++ #endif /* USE_INET6 */ + } + + /* open pipes to program if requested */ Property changes on: head/sysutils/socket/files/patch-socket.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/socket/files/patch-socketp.c =================================================================== --- head/sysutils/socket/files/patch-socketp.c (nonexistent) +++ head/sysutils/socket/files/patch-socketp.c (revision 363335) @@ -0,0 +1,358 @@ +*** socketp.c.orig Fri Mar 22 11:42:23 2002 +--- socketp.c Fri Mar 22 12:07:59 2002 +*************** +*** 21,26 **** +--- 21,27 ---- + + extern int is_number A((char *)); + ++ #ifndef USE_INET6 + /* + * create a server socket on PORT accepting QUEUE_LENGTH connections + */ +*************** +*** 31,39 **** + struct sockaddr_in sa ; + int s; + +! if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) { + return -1 ; +- } + + bzero((char *) &sa, sizeof(sa)) ; + sa.sin_family = AF_INET ; +--- 32,40 ---- + struct sockaddr_in sa ; + int s; + +! s = socket(AF_INET, SOCK_STREAM, 0); +! if (s < 0) + return -1 ; + + bzero((char *) &sa, sizeof(sa)) ; + sa.sin_family = AF_INET ; +*************** +*** 41,56 **** + sa.sin_port = htons(port) ; + + if (bind(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) { +! return -1 ; + } + if (listen(s, 1) < 0) { +! return -1 ; + } + + return s ; + } + + + /* create a client socket connected to PORT on HOSTNAME */ + int create_client_socket(hostname, port) + char **hostname ; +--- 42,126 ---- + sa.sin_port = htons(port) ; + + if (bind(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) { +! return -1 ; + } + if (listen(s, 1) < 0) { +! return -1 ; + } + + return s ; + } ++ #else /* USE_INET6 */ ++ /* ++ * create a server socket(s) on PORT accepting QUEUE_LENGTH connections ++ * ++ * FWD (ifdef USE_INET6): ++ * there can be more than one socket; one for each supported address ++ * family. This is for portability as not all IPv6 stacks implement ++ * the wildcard bind as a bind to *ll IPv4 *and* IPv6 addresses. ++ * so we'll just open a socket for each address getaddrinfo() gives ++ * back to us. The price of portability... ++ */ ++ int *create_server_sockets(port, queue_length) ++ char **port ; ++ int queue_length ; ++ { ++ struct addrinfo hints, *r, *res; ++ int *s, *slist, error, maxs; ++ int reuse_addr = 1; ++ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_flags = AI_PASSIVE; ++ hints.ai_family = AF_UNSPEC; ++ hints.ai_socktype = SOCK_STREAM; ++ hints.ai_protocol = 0; ++ error = getaddrinfo(NULL, *port, &hints, &res); ++ ++ if (!error) { ++ for (maxs = 0, r = res; r; r = r->ai_next, maxs++); ++ slist = malloc ((maxs+1) * sizeof(int)); ++ if (slist) { ++ slist[0] = maxs; /* max. num of sockets */ ++ ++ s = slist+1; ++ for (r = res; r; r = r->ai_next) { ++ *s = socket(r->ai_family, r->ai_socktype, r->ai_protocol); ++ if (*s < 0) ++ continue; ++ ++ setsockopt(*s,SOL_SOCKET,SO_REUSEADDR,&reuse_addr,sizeof(reuse_addr)); ++ ++ if (bind(*s, r->ai_addr, r->ai_addrlen) < 0) { ++ close (*s); ++ continue; ++ } ++ ++ if (listen(*s, 1) < 0) { ++ close (*s); ++ continue; ++ } ++ s++; ++ } ++ } ++ } ++ else ++ slist = NULL; + ++ if (res) ++ freeaddrinfo(res); + ++ if (slist && !slist[0]) { ++ free (slist); ++ slist = NULL; ++ } ++ ++ return (slist); ++ } ++ #endif /* USE_INET6 */ ++ ++ ++ /* create a client socket connected to PORT on HOSTNAME */ ++ #ifndef USE_INET6 + /* create a client socket connected to PORT on HOSTNAME */ + int create_client_socket(hostname, port) + char **hostname ; +*************** +*** 64,94 **** + + bzero(&sa, sizeof(sa)) ; + if ((addr = inet_addr(*hostname)) != -1) { +! /* is Internet addr in octet notation */ +! bcopy(&addr, (char *) &sa.sin_addr, sizeof(addr)) ; /* set address */ +! sa.sin_family = AF_INET ; + } else { +! /* do we know the host's address? */ +! if ((hp = gethostbyname(*hostname)) == NULL) { +! return -2 ; +! } +! *hostname = hp->h_name ; +! bcopy(hp->h_addr, (char *) &sa.sin_addr, hp->h_length) ; +! sa.sin_family = hp->h_addrtype ; + } + + sa.sin_port = htons((u_short) port) ; + + if ((s = socket(sa.sin_family, SOCK_STREAM, 0)) < 0) { /* get socket */ +! return -1 ; + } + if (connect(s, (struct sockaddr *)&sa, sizeof(sa)) < 0) { /* connect */ +! close(s) ; +! return -1 ; + } + return s ; + } + + /* return the port number for service NAME_OR_NUMBER. If NAME is non-null, + * the name is the service is written there. + */ +--- 134,311 ---- + + bzero(&sa, sizeof(sa)) ; + if ((addr = inet_addr(*hostname)) != -1) { +! /* is Internet addr in octet notation */ +! bcopy(&addr, (char *) &sa.sin_addr, sizeof(addr)) ; /* set address */ +! sa.sin_family = AF_INET ; + } else { +! /* do we know the host's address? */ +! if ((hp = gethostbyname(*hostname)) == NULL) { +! return -2 ; +! } +! *hostname = hp->h_name ; +! bcopy(hp->h_addr, (char *) &sa.sin_addr, hp->h_length) ; +! sa.sin_family = hp->h_addrtype ; + } + + sa.sin_port = htons((u_short) port) ; + + if ((s = socket(sa.sin_family, SOCK_STREAM, 0)) < 0) { /* get socket */ +! return -1 ; + } + if (connect(s, (struct sockaddr *)&sa, sizeof(sa)) < 0) { /* connect */ +! close(s) ; +! return -1 ; + } + return s ; + } + ++ #else /* USE_INET6 */ ++ int create_client_socket(hostname, port) ++ char **hostname ; ++ char **port ; ++ { ++ int s, connected, err ; ++ struct addrinfo hints, *r, *res; ++ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_flags = AI_NUMERICHOST; ++ hints.ai_family = AF_UNSPEC; ++ hints.ai_socktype= SOCK_STREAM; ++ err = getaddrinfo(*hostname, *port, &hints, &res); ++ if (res) freeaddrinfo(res); ++ ++ if (!err) { ++ /* numeric */ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_flags = AI_CANONNAME; ++ hints.ai_family = AF_UNSPEC; ++ hints.ai_socktype = SOCK_STREAM; ++ hints.ai_protocol = 0; ++ err = getaddrinfo(*hostname, *port, &hints, &res); ++ if (err) s = -2; ++ } else { ++ /* non-numeric */ ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_family = AF_UNSPEC; ++ hints.ai_socktype = SOCK_STREAM; ++ hints.ai_protocol = 0; ++ err = getaddrinfo(*hostname, *port, &hints, &res); ++ if (err) s = -2; ++ } ++ ++ ++ if (!err) { ++ err = 0; s = -1; ++ connected = 0; ++ for (r = res; r && !connected; r = r->ai_next) { ++ s = socket(r->ai_family, r->ai_socktype, r->ai_protocol); ++ if (s < 0) ++ continue; ++ ++ if (connect(s, r->ai_addr, r->ai_addrlen) < 0) { ++ err = errno; ++ close(s); ++ s = -1; ++ continue; ++ } ++ connected++; ++ break; ++ } ++ if (!connected) s = -1; ++ } ++ ++ if (res) ++ freeaddrinfo(res); ++ ++ return (s); ++ } ++ #endif /* USE_INET6 */ ++ ++ #ifdef USE_INET6 ++ /* Determines hostname, address and port number used for the peer of socket */ ++ int socket_remote_name(socket, name, ipname, port) ++ int socket; ++ char **name; ++ char **ipname; ++ char **port; ++ { ++ struct sockaddr_storage server; ++ int length=sizeof(server), retval, error; ++ static char host[NI_MAXHOST],ip[NI_MAXHOST],portstr[NI_MAXSERV]; ++ ++ error = getpeername(socket,(struct sockaddr*)&server,&length); ++ if(!error) { ++ error = getnameinfo((struct sockaddr*)&server, length, host, ++ NI_MAXHOST, NULL, 0, 0); ++ error = getnameinfo((struct sockaddr*)&server, length, ip, ++ NI_MAXHOST, NULL, NI_MAXSERV, ++ NI_NUMERICHOST); ++ retval = error; ++ ++ error = getnameinfo((struct sockaddr*)&server, length, NULL, 0, ++ portstr, NI_MAXSERV, 0); ++ ++ if (error) ++ retval = getnameinfo((struct sockaddr*)&server, length, ip, ++ NI_MAXHOST, portstr, NI_MAXSERV, ++ NI_NUMERICSERV); ++ } ++ else ++ retval = error; ++ ++ if(name) ++ *name=host; ++ if(ipname) ++ *ipname=ip; ++ if(port) ++ *port=portstr; ++ ++ return(retval); ++ } ++ ++ /* Determines the hostname, address and port number used for our socket */ ++ int socket_local_name(socket, name, ipname, port) ++ int socket; ++ char **name; ++ char **ipname; ++ char **port; ++ { ++ struct sockaddr_storage server; ++ int length=sizeof(server), retval, error; ++ static char host[NI_MAXHOST],ip[NI_MAXHOST],portstr[NI_MAXSERV]; ++ ++ error = getsockname(socket,(struct sockaddr*)&server,&length); ++ if(!error) { ++ error = getnameinfo((struct sockaddr*)&server, length, host, ++ NI_MAXHOST, NULL, 0, 0); ++ error = getnameinfo((struct sockaddr*)&server, length, ip, ++ NI_MAXHOST, NULL, NI_MAXSERV, ++ NI_NUMERICHOST); ++ retval = error; ++ ++ error = getnameinfo((struct sockaddr*)&server, length, NULL, 0, ++ portstr, NI_MAXSERV, 0); ++ ++ if (error) ++ retval = getnameinfo((struct sockaddr*)&server, length, ip, ++ NI_MAXHOST, portstr, NI_MAXSERV, ++ NI_NUMERICSERV); ++ } ++ else ++ retval = error; ++ ++ if(name) ++ *name=host; ++ if(ipname) ++ *ipname=ip; ++ if(port) ++ *port=portstr; ++ ++ return(retval); ++ } ++ #endif /* USE_INET6 */ ++ ++ #ifndef USE_INET6 + /* return the port number for service NAME_OR_NUMBER. If NAME is non-null, + * the name is the service is written there. + */ +*************** +*** 122,126 **** +--- 339,344 ---- + return ntohs(servent->s_port) ; + } + } ++ #endif /* !USE_INET6 */ + + /*EOF*/ Property changes on: head/sysutils/socket/files/patch-socketp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/socket/files/patch-utils.c =================================================================== --- head/sysutils/socket/files/patch-utils.c (nonexistent) +++ head/sysutils/socket/files/patch-utils.c (revision 363335) @@ -0,0 +1,21 @@ +*** utils.c.orig Fri Feb 29 15:21:52 2008 +--- utils.c Fri Feb 29 15:23:26 2008 +*************** +*** 89,98 **** +--- 89,102 ---- + case SIGTTIN: + case SIGSTOP: + case SIGCONT: + continue ; + #endif ++ #ifdef SIGINFO ++ case SIGINFO: ++ continue ; ++ #endif + #if !defined (SIGCHLD) && defined (SIGCLD) + #define SIGCHLD SIGCLD + #endif + #ifdef SIGCHLD + case SIGCHLD: + + Property changes on: head/sysutils/socket/files/patch-utils.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/su2/files/patch-aa =================================================================== --- head/sysutils/su2/files/patch-aa (revision 363334) +++ head/sysutils/su2/files/patch-aa (nonexistent) @@ -1,41 +0,0 @@ ---- Makefile.orig Sun Mar 2 20:17:14 1997 -+++ Makefile Sun Mar 2 20:24:15 1997 -@@ -8,16 +8,17 @@ - # /etc/super-users and /usr/adm/sulog that are defined - # separately. - # --DEST=/usr/local -+PREFIX?=/usr/local -+DEST=${DESTDIR}${PREFIX} - BINDIR=$(DEST)/bin --MANDIR=$(DEST)/man -+MANDIR=$(DEST)/man/man1 - - # OPTIONS: - # There are a number of DEFINES that can be used to configure su2. Please - # see the source to su2.c for a full listing of all of the available options. - - # Standard --OPTIONS=-DFULLPATH -+OPTIONS=-DSU2LOGFILE="\"/var/log/su2.log\"" -DSUPERUSERS="\"$(PREFIX)/etc/super-users\"" -DBROKENCUSERID - - # m88k - # OPTIONS=-DFULLPATH -DNOVFORK -@@ -31,12 +32,15 @@ - # Shadow Passwords (Solaris) - # OPTIONS=-DFULLPATH -DUSE_SHADOW - --CFLAGS=-O $(OPTIONS) -+CFLAGS+= $(OPTIONS) -+LDLIBS=-lcrypt -lcompat - - su2: su2.c - -+all: su2 -+ - install: su2 -- install -c -m 4711 -o root su2 $(BINDIR)/su2 -+ install -c -s -m 4711 su2 $(BINDIR)/su2 - install -c su2.man $(MANDIR)/su2.1 - - clean: Property changes on: head/sysutils/su2/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/su2/files/patch-ab =================================================================== --- head/sysutils/su2/files/patch-ab (revision 363334) +++ head/sysutils/su2/files/patch-ab (nonexistent) @@ -1,45 +0,0 @@ ---- su2.c.orig Sun Aug 15 17:59:03 2004 -+++ su2.c Sun Aug 15 18:00:37 2004 -@@ -113,9 +113,9 @@ - #ifndef NOSU2RC - char *UsersNameFile = ".su2rc"; - #endif NOSU2RC --char *SULog = "/usr/adm/sulog"; -+char *SULog = SU2LOGFILE; - --char *UtmpFile = "/etc/utmp"; -+char *UtmpFile = "/var/run/utmp"; - - #ifndef PATH - # ifdef BSD -@@ -182,17 +182,18 @@ - - char *malloc (); - -+#if !(defined(BSD) && (BSD >= 199306)) - #ifdef OSF - int setpwent (); --#else -+#elseif !(defined(BSD) && (BSD >= 199306)) - void setpwent (); - #endif -+#endif - --#ifndef sgi -+#if !defined(sgi) && !(defined(BSD) && (BSD >= 199306)) - struct passwd *getpwuid (); - struct passwd *getpwnam (); - void endpwent (); --int chmod (); - #endif - - struct passwd *pw; -@@ -570,7 +571,7 @@ - } - } - --#ifndef sgi -+#if !(defined(sgi) && (defined(BSD) && (BSD >= 199306))) - setpwent (); - #endif - Property changes on: head/sysutils/su2/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/su2/files/patch-ac =================================================================== --- head/sysutils/su2/files/patch-ac (revision 363334) +++ head/sysutils/su2/files/patch-ac (nonexistent) @@ -1,53 +0,0 @@ ---- su2.man.orig Thu Sep 7 13:17:12 1995 -+++ su2.man Sun Mar 2 20:21:01 1997 -@@ -84,7 +84,7 @@ - .I Su2\^ - logs all attempts to - .I su2\^ --in /usr/adm/sulog, including failures. Successful attempts are flagged -+in /var/log/su2.log, including failures. Successful attempts are flagged - with "+", failures with "-". - .LP - The file -@@ -110,7 +110,7 @@ - .B \-u - is used to specify a user against whom to check authorization and password. - The default value is obtained from --.I /etc/utmp. -+.I /var/run/utmp. - .TP - .B \-x - when specified will cause -@@ -118,7 +118,7 @@ - to exec the shell without first forking a new process. This option should - only be used when the system is out of process slots. When it is used - su2 will neither clean up the --.I /etc/utmp -+.I /var/run/utmp - entry nor reset the ownership and mode of the current - .IR /dev/tty?? . - Both may be reset with the -@@ -127,12 +127,12 @@ - .TP - .B \-s - will change the current --.I /etc/utmp -+.I /var/run/utmp - entry to reflect the new user name. - .TP - .B \-r - is used to replace the username in --.I /etc/utmp -+.I /var/run/utmp - and the mode and ownership of - .I /dev/tty?? - with that associated with the current process userid. -@@ -178,7 +178,7 @@ - $HOME/.su2rc - list of users authorized to change to a specific user. - .TP --/usr/adm/sulog -+/var/log/su2.log - log of - .I su2 - and Property changes on: head/sysutils/su2/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/su2/files/patch-su2-c =================================================================== --- head/sysutils/su2/files/patch-su2-c (revision 363334) +++ head/sysutils/su2/files/patch-su2-c (nonexistent) @@ -1,74 +0,0 @@ ---- su2.c.orig 2012-02-08 01:48:13.000000000 +0400 -+++ su2.c 2012-02-08 02:22:42.000000000 +0400 -@@ -151,7 +151,12 @@ - #include - #include - #include -+#include -+#if defined(__FreeBSD_version) && __FreeBSD_version >= 900007 -+#include -+#else - #include -+#endif - #include - #ifdef IOCTL - #include -@@ -383,7 +388,12 @@ - if (FullTTY == (char *) 0) - FullTTY = "/dev/TTY??"; - -- TTY = strrchr (FullTTY, '/') + 1; -+ TTY = FullTTY + strlen(FullTTY); -+ while (TTY > FullTTY) { -+ if (TTY[-1] == '/' && (TTY[0] > 57 || TTY[0] < 48)) -+ break; -+ TTY--; -+ } - - Debug (1, "-> FullTTY=\"%s\"\n", FullTTY); - Debug (1, "-> TTY=\"%s\"\n", TTY); -@@ -1315,7 +1325,11 @@ - * Copies name into an internal static buffer. - */ - -+#if __FreeBSD_version >= 900007 -+#define MAXNAME sizeof(((struct utmpx *)nptr)->ut_user) -+#else - #define MAXNAME sizeof(((struct utmp *)nptr)->ut_name) -+#endif - - #ifdef BROKENCUSERID - char *mycuserid () -@@ -1432,6 +1446,24 @@ - ModifyUtmp (NewUserName) - register char *NewUserName; - { -+#if __FreeBSD_version >= 900007 -+ struct utmpx ut, *utr; -+ -+ strncpy(ut.ut_line, TTY, sizeof(ut.ut_line)); -+ setutxent(); -+ if ((utr = getutxline(&ut)) == NULL) { -+ endutxent(); -+ (void) fprintf (stderr, "Terminal %s not found\n", ut.ut_line); -+ return (1); -+ } -+ strncpy(utr->ut_user, NewUserName, sizeof(utr->ut_user)); -+ if (pututxline(utr) == NULL) { -+ endutxent(); -+ (void) fprintf (stderr, "pututxline failed\n"); -+ return (1); -+ } -+ endutxent(); -+#else - register int fd; /* /etc/utmp file */ - register int i; /* index */ - #ifdef hpux -@@ -1482,6 +1514,7 @@ - - (void) write (fd, (char *) & Utmp, sizeof (Utmp)); - (void) close (fd); -+#endif - return (0); - } - Property changes on: head/sysutils/su2/files/patch-su2-c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/su2/files/patch-Makefile =================================================================== --- head/sysutils/su2/files/patch-Makefile (nonexistent) +++ head/sysutils/su2/files/patch-Makefile (revision 363335) @@ -0,0 +1,41 @@ +--- Makefile.orig Sun Mar 2 20:17:14 1997 ++++ Makefile Sun Mar 2 20:24:15 1997 +@@ -8,16 +8,17 @@ + # /etc/super-users and /usr/adm/sulog that are defined + # separately. + # +-DEST=/usr/local ++PREFIX?=/usr/local ++DEST=${DESTDIR}${PREFIX} + BINDIR=$(DEST)/bin +-MANDIR=$(DEST)/man ++MANDIR=$(DEST)/man/man1 + + # OPTIONS: + # There are a number of DEFINES that can be used to configure su2. Please + # see the source to su2.c for a full listing of all of the available options. + + # Standard +-OPTIONS=-DFULLPATH ++OPTIONS=-DSU2LOGFILE="\"/var/log/su2.log\"" -DSUPERUSERS="\"$(PREFIX)/etc/super-users\"" -DBROKENCUSERID + + # m88k + # OPTIONS=-DFULLPATH -DNOVFORK +@@ -31,12 +32,15 @@ + # Shadow Passwords (Solaris) + # OPTIONS=-DFULLPATH -DUSE_SHADOW + +-CFLAGS=-O $(OPTIONS) ++CFLAGS+= $(OPTIONS) ++LDLIBS=-lcrypt -lcompat + + su2: su2.c + ++all: su2 ++ + install: su2 +- install -c -m 4711 -o root su2 $(BINDIR)/su2 ++ install -c -s -m 4711 su2 $(BINDIR)/su2 + install -c su2.man $(MANDIR)/su2.1 + + clean: Property changes on: head/sysutils/su2/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/su2/files/patch-su2.c_1 =================================================================== --- head/sysutils/su2/files/patch-su2.c_1 (nonexistent) +++ head/sysutils/su2/files/patch-su2.c_1 (revision 363335) @@ -0,0 +1,45 @@ +--- su2.c.orig Sun Aug 15 17:59:03 2004 ++++ su2.c Sun Aug 15 18:00:37 2004 +@@ -113,9 +113,9 @@ + #ifndef NOSU2RC + char *UsersNameFile = ".su2rc"; + #endif NOSU2RC +-char *SULog = "/usr/adm/sulog"; ++char *SULog = SU2LOGFILE; + +-char *UtmpFile = "/etc/utmp"; ++char *UtmpFile = "/var/run/utmp"; + + #ifndef PATH + # ifdef BSD +@@ -182,17 +182,18 @@ + + char *malloc (); + ++#if !(defined(BSD) && (BSD >= 199306)) + #ifdef OSF + int setpwent (); +-#else ++#elseif !(defined(BSD) && (BSD >= 199306)) + void setpwent (); + #endif ++#endif + +-#ifndef sgi ++#if !defined(sgi) && !(defined(BSD) && (BSD >= 199306)) + struct passwd *getpwuid (); + struct passwd *getpwnam (); + void endpwent (); +-int chmod (); + #endif + + struct passwd *pw; +@@ -570,7 +571,7 @@ + } + } + +-#ifndef sgi ++#if !(defined(sgi) && (defined(BSD) && (BSD >= 199306))) + setpwent (); + #endif + Property changes on: head/sysutils/su2/files/patch-su2.c_1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/su2/files/patch-su2.c_2 =================================================================== --- head/sysutils/su2/files/patch-su2.c_2 (nonexistent) +++ head/sysutils/su2/files/patch-su2.c_2 (revision 363335) @@ -0,0 +1,74 @@ +--- su2.c.orig 2012-02-08 01:48:13.000000000 +0400 ++++ su2.c 2012-02-08 02:22:42.000000000 +0400 +@@ -151,7 +151,12 @@ + #include + #include + #include ++#include ++#if defined(__FreeBSD_version) && __FreeBSD_version >= 900007 ++#include ++#else + #include ++#endif + #include + #ifdef IOCTL + #include +@@ -383,7 +388,12 @@ + if (FullTTY == (char *) 0) + FullTTY = "/dev/TTY??"; + +- TTY = strrchr (FullTTY, '/') + 1; ++ TTY = FullTTY + strlen(FullTTY); ++ while (TTY > FullTTY) { ++ if (TTY[-1] == '/' && (TTY[0] > 57 || TTY[0] < 48)) ++ break; ++ TTY--; ++ } + + Debug (1, "-> FullTTY=\"%s\"\n", FullTTY); + Debug (1, "-> TTY=\"%s\"\n", TTY); +@@ -1315,7 +1325,11 @@ + * Copies name into an internal static buffer. + */ + ++#if __FreeBSD_version >= 900007 ++#define MAXNAME sizeof(((struct utmpx *)nptr)->ut_user) ++#else + #define MAXNAME sizeof(((struct utmp *)nptr)->ut_name) ++#endif + + #ifdef BROKENCUSERID + char *mycuserid () +@@ -1432,6 +1446,24 @@ + ModifyUtmp (NewUserName) + register char *NewUserName; + { ++#if __FreeBSD_version >= 900007 ++ struct utmpx ut, *utr; ++ ++ strncpy(ut.ut_line, TTY, sizeof(ut.ut_line)); ++ setutxent(); ++ if ((utr = getutxline(&ut)) == NULL) { ++ endutxent(); ++ (void) fprintf (stderr, "Terminal %s not found\n", ut.ut_line); ++ return (1); ++ } ++ strncpy(utr->ut_user, NewUserName, sizeof(utr->ut_user)); ++ if (pututxline(utr) == NULL) { ++ endutxent(); ++ (void) fprintf (stderr, "pututxline failed\n"); ++ return (1); ++ } ++ endutxent(); ++#else + register int fd; /* /etc/utmp file */ + register int i; /* index */ + #ifdef hpux +@@ -1482,6 +1514,7 @@ + + (void) write (fd, (char *) & Utmp, sizeof (Utmp)); + (void) close (fd); ++#endif + return (0); + } + Property changes on: head/sysutils/su2/files/patch-su2.c_2 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/su2/files/patch-su2.man =================================================================== --- head/sysutils/su2/files/patch-su2.man (nonexistent) +++ head/sysutils/su2/files/patch-su2.man (revision 363335) @@ -0,0 +1,53 @@ +--- su2.man.orig Thu Sep 7 13:17:12 1995 ++++ su2.man Sun Mar 2 20:21:01 1997 +@@ -84,7 +84,7 @@ + .I Su2\^ + logs all attempts to + .I su2\^ +-in /usr/adm/sulog, including failures. Successful attempts are flagged ++in /var/log/su2.log, including failures. Successful attempts are flagged + with "+", failures with "-". + .LP + The file +@@ -110,7 +110,7 @@ + .B \-u + is used to specify a user against whom to check authorization and password. + The default value is obtained from +-.I /etc/utmp. ++.I /var/run/utmp. + .TP + .B \-x + when specified will cause +@@ -118,7 +118,7 @@ + to exec the shell without first forking a new process. This option should + only be used when the system is out of process slots. When it is used + su2 will neither clean up the +-.I /etc/utmp ++.I /var/run/utmp + entry nor reset the ownership and mode of the current + .IR /dev/tty?? . + Both may be reset with the +@@ -127,12 +127,12 @@ + .TP + .B \-s + will change the current +-.I /etc/utmp ++.I /var/run/utmp + entry to reflect the new user name. + .TP + .B \-r + is used to replace the username in +-.I /etc/utmp ++.I /var/run/utmp + and the mode and ownership of + .I /dev/tty?? + with that associated with the current process userid. +@@ -178,7 +178,7 @@ + $HOME/.su2rc + list of users authorized to change to a specific user. + .TP +-/usr/adm/sulog ++/var/log/su2.log + log of + .I su2 + and Property changes on: head/sysutils/su2/files/patch-su2.man ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/symlinks/files/patch-aa =================================================================== --- head/sysutils/symlinks/files/patch-aa (revision 363334) +++ head/sysutils/symlinks/files/patch-aa (nonexistent) @@ -1,20 +0,0 @@ ---- symlinks.c.orig 2010-01-23 09:58:35.000000000 -0800 -+++ symlinks.c 2010-01-23 09:59:34.000000000 -0800 -@@ -1,10 +1,6 @@ - #include --#ifndef _POSIX_SOURCE --#define _POSIX_SOURCE --#endif - #include - #include --#include - #include - #include - #include -@@ -358,5 +354,5 @@ - } - if (dircount == 0) - usage_error(); -- exit (0); -+ return (0); - } Property changes on: head/sysutils/symlinks/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/symlinks/files/patch-symlinks.c =================================================================== --- head/sysutils/symlinks/files/patch-symlinks.c (nonexistent) +++ head/sysutils/symlinks/files/patch-symlinks.c (revision 363335) @@ -0,0 +1,20 @@ +--- symlinks.c.orig 2010-01-23 09:58:35.000000000 -0800 ++++ symlinks.c 2010-01-23 09:59:34.000000000 -0800 +@@ -1,10 +1,6 @@ + #include +-#ifndef _POSIX_SOURCE +-#define _POSIX_SOURCE +-#endif + #include + #include +-#include + #include + #include + #include +@@ -358,5 +354,5 @@ + } + if (dircount == 0) + usage_error(); +- exit (0); ++ return (0); + } Property changes on: head/sysutils/symlinks/files/patch-symlinks.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/tcplist/files/patch-01 =================================================================== --- head/sysutils/tcplist/files/patch-01 (revision 363334) +++ head/sysutils/tcplist/files/patch-01 (nonexistent) @@ -1,79 +0,0 @@ ---- Makefile.orig 2013-11-16 20:34:19.000000000 +0800 -+++ Makefile 2013-11-16 20:35:17.000000000 +0800 -@@ -1,14 +1,16 @@ - # Compiler: eg. cc or gcc - CC = cc - -+#PREFIX= /local -+ - # Directory to install tcplist executable --BINDIR = /local/bin -+BINDIR = $(PREFIX)/bin - - # Directory to install tcplist man page --MANDIR = /local/man/man1 -+MANDIR = $(PREFIX)/man/man1 - - # Location of NOIDENT file --NOIDENT = /etc/hosts.noident -+NOIDENT = $(PREFIX)/etc/hosts.noident - - # Owner of tcplist executable - OWNER = root -@@ -45,18 +47,18 @@ MANEXT = 1 - # - # Solaris 2.x (using LSOF): - # --LIBRARIES = -lsocket -lnsl --DEFS = -DLSOF --MODE = 755 --GROUP = staff -+#LIBRARIES = -lsocket -lnsl -+#DEFS = -DLSOF -+#MODE = 755 -+#GROUP = staff - - # - # Generic LSOF: - # --# LIBRARIES = --# DEFS = -DLSOF --# MODE = 755 --# GROUP = staff -+ LIBRARIES = -+ DEFS = -DLSOF -+ MODE = 755 -+ GROUP = staff - # - - # If you're using an old version of lsof, uncomment this: -@@ -76,8 +78,8 @@ OBJS = $(SRCS:.c=.o) - RM = /bin/rm -rf - CP = /bin/cp - CHMOD = /bin/chmod --CHOWN = /bin/chown --CHGRP = /bin/chgrp -+CHOWN = /usr/sbin/chown -+CHGRP = /usr/bin/chgrp - - all:: tcplist - -@@ -95,13 +97,13 @@ depend: - - install: tcplist - strip tcplist -- $(CP) tcplist $(BINDIR) -- $(CHGRP) $(GROUP) $(BINDIR)/tcplist -- $(CHMOD) $(MODE) $(BINDIR)/tcplist -+ $(CP) tcplist $(DESTDIR)$(BINDIR) -+ $(CHGRP) $(GROUP) $(DESTDIR)$(BINDIR)/tcplist -+ $(CHMOD) $(MODE) $(DESTDIR)$(BINDIR)/tcplist - - install.man: tcplist.1 -- $(CP) tcplist.1 $(MANDIR)/tcplist.$(MANEXT) -- $(CHMOD) $(MANMODE) $(MANDIR)/tcplist.$(MANEXT) -+ $(CP) tcplist.1 $(DESTDIR)$(MANDIR)/tcplist.$(MANEXT) -+ $(CHMOD) $(MANMODE) $(DESTDIR)$(MANDIR)/tcplist.$(MANEXT) - - shar: - shar `awk '{print $$1}' MANIFEST` >tcplist-`awk '{print $$7;exit}' patchlevel.h`.shar Property changes on: head/sysutils/tcplist/files/patch-01 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/tcplist/files/patch-02 =================================================================== --- head/sysutils/tcplist/files/patch-02 (revision 363334) +++ head/sysutils/tcplist/files/patch-02 (nonexistent) @@ -1,11 +0,0 @@ ---- tcplist.1.orig Sun Jan 11 00:30:07 1998 -+++ tcplist.1 Sun Jan 11 00:30:29 1998 -@@ -49,8 +49,6 @@ - Verbose mode: give a running commentary of what is being done. - .IP \fB\-V\fP - Print version information and exit. --.IP \fB\-s\fP --Show TCP servers running on this machine as well as established connections. - .IP \fB\-f\ filename\fP - Assume the hosts listed in the specified file are not running Ident servers, - and should not be queried. Listing terminal servers, X terminals, PC's, and Property changes on: head/sysutils/tcplist/files/patch-02 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/tcplist/files/patch-03 =================================================================== --- head/sysutils/tcplist/files/patch-03 (revision 363334) +++ head/sysutils/tcplist/files/patch-03 (nonexistent) @@ -1,11 +0,0 @@ ---- lsof.c.orig 2014-07-27 08:59:42.000000000 +0000 -+++ lsof.c -@@ -27,7 +27,7 @@ - #define LSOFCMD "lsof -HPsli TCP | awk '{print $3,$NF}' | sort | uniq" - #else /* !OLDLSOF */ - /* These use the current (as of 3.62W, at least) parameters for lsof */ --#define LSOFCMD "lsof -nPsli TCP | awk '{print $3,$NF}' | sort | uniq" -+#define LSOFCMD "lsof -nPls -iTCP | awk '{print $3,$(NF - 1)}' | tail -n+2 | sort | uniq" - #endif /* !OLDLSOF */ - #endif /* LSOFCMD */ - Property changes on: head/sysutils/tcplist/files/patch-03 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/tcplist/files/patch-Makefile =================================================================== --- head/sysutils/tcplist/files/patch-Makefile (nonexistent) +++ head/sysutils/tcplist/files/patch-Makefile (revision 363335) @@ -0,0 +1,79 @@ +--- Makefile.orig 2013-11-16 20:34:19.000000000 +0800 ++++ Makefile 2013-11-16 20:35:17.000000000 +0800 +@@ -1,14 +1,16 @@ + # Compiler: eg. cc or gcc + CC = cc + ++#PREFIX= /local ++ + # Directory to install tcplist executable +-BINDIR = /local/bin ++BINDIR = $(PREFIX)/bin + + # Directory to install tcplist man page +-MANDIR = /local/man/man1 ++MANDIR = $(PREFIX)/man/man1 + + # Location of NOIDENT file +-NOIDENT = /etc/hosts.noident ++NOIDENT = $(PREFIX)/etc/hosts.noident + + # Owner of tcplist executable + OWNER = root +@@ -45,18 +47,18 @@ MANEXT = 1 + # + # Solaris 2.x (using LSOF): + # +-LIBRARIES = -lsocket -lnsl +-DEFS = -DLSOF +-MODE = 755 +-GROUP = staff ++#LIBRARIES = -lsocket -lnsl ++#DEFS = -DLSOF ++#MODE = 755 ++#GROUP = staff + + # + # Generic LSOF: + # +-# LIBRARIES = +-# DEFS = -DLSOF +-# MODE = 755 +-# GROUP = staff ++ LIBRARIES = ++ DEFS = -DLSOF ++ MODE = 755 ++ GROUP = staff + # + + # If you're using an old version of lsof, uncomment this: +@@ -76,8 +78,8 @@ OBJS = $(SRCS:.c=.o) + RM = /bin/rm -rf + CP = /bin/cp + CHMOD = /bin/chmod +-CHOWN = /bin/chown +-CHGRP = /bin/chgrp ++CHOWN = /usr/sbin/chown ++CHGRP = /usr/bin/chgrp + + all:: tcplist + +@@ -95,13 +97,13 @@ depend: + + install: tcplist + strip tcplist +- $(CP) tcplist $(BINDIR) +- $(CHGRP) $(GROUP) $(BINDIR)/tcplist +- $(CHMOD) $(MODE) $(BINDIR)/tcplist ++ $(CP) tcplist $(DESTDIR)$(BINDIR) ++ $(CHGRP) $(GROUP) $(DESTDIR)$(BINDIR)/tcplist ++ $(CHMOD) $(MODE) $(DESTDIR)$(BINDIR)/tcplist + + install.man: tcplist.1 +- $(CP) tcplist.1 $(MANDIR)/tcplist.$(MANEXT) +- $(CHMOD) $(MANMODE) $(MANDIR)/tcplist.$(MANEXT) ++ $(CP) tcplist.1 $(DESTDIR)$(MANDIR)/tcplist.$(MANEXT) ++ $(CHMOD) $(MANMODE) $(DESTDIR)$(MANDIR)/tcplist.$(MANEXT) + + shar: + shar `awk '{print $$1}' MANIFEST` >tcplist-`awk '{print $$7;exit}' patchlevel.h`.shar Property changes on: head/sysutils/tcplist/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/tcplist/files/patch-lsof.c =================================================================== --- head/sysutils/tcplist/files/patch-lsof.c (nonexistent) +++ head/sysutils/tcplist/files/patch-lsof.c (revision 363335) @@ -0,0 +1,11 @@ +--- lsof.c.orig 2014-07-27 08:59:42.000000000 +0000 ++++ lsof.c +@@ -27,7 +27,7 @@ + #define LSOFCMD "lsof -HPsli TCP | awk '{print $3,$NF}' | sort | uniq" + #else /* !OLDLSOF */ + /* These use the current (as of 3.62W, at least) parameters for lsof */ +-#define LSOFCMD "lsof -nPsli TCP | awk '{print $3,$NF}' | sort | uniq" ++#define LSOFCMD "lsof -nPls -iTCP | awk '{print $3,$(NF - 1)}' | tail -n+2 | sort | uniq" + #endif /* !OLDLSOF */ + #endif /* LSOFCMD */ + Property changes on: head/sysutils/tcplist/files/patch-lsof.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/tcplist/files/patch-tcplist.1 =================================================================== --- head/sysutils/tcplist/files/patch-tcplist.1 (nonexistent) +++ head/sysutils/tcplist/files/patch-tcplist.1 (revision 363335) @@ -0,0 +1,11 @@ +--- tcplist.1.orig Sun Jan 11 00:30:07 1998 ++++ tcplist.1 Sun Jan 11 00:30:29 1998 +@@ -49,8 +49,6 @@ + Verbose mode: give a running commentary of what is being done. + .IP \fB\-V\fP + Print version information and exit. +-.IP \fB\-s\fP +-Show TCP servers running on this machine as well as established connections. + .IP \fB\-f\ filename\fP + Assume the hosts listed in the specified file are not running Ident servers, + and should not be queried. Listing terminal servers, X terminals, PC's, and Property changes on: head/sysutils/tcplist/files/patch-tcplist.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/webmin/files/patch-aa =================================================================== --- head/sysutils/webmin/files/patch-aa (revision 363334) +++ head/sysutils/webmin/files/patch-aa (nonexistent) @@ -1,134 +0,0 @@ - -$FreeBSD$ - ---- setup.sh.orig -+++ setup.sh -@@ -17,16 +17,8 @@ - srcdir=$wadir - ver=`cat "$wadir/version"` - --# Find temp directory --if [ "$tempdir" = "" ]; then -- tempdir=/tmp/.webmin --fi -- --if [ $? != "0" ]; then -- echo "ERROR: Cannot find the Webmin install directory"; -- echo ""; -- exit 1; --fi -+tempdir=/tmp/.webmin -+mkdir -p $tempdir - - echo "***********************************************************************" - echo "* Welcome to the Webmin setup script, version $ver *" -@@ -97,19 +89,7 @@ - echo "Unless you want to run multiple versions of Webmin at the same time" - echo "you can just accept the defaults." - echo "" --printf "Config file directory [/etc/webmin]: " --if [ "$config_dir" = "" ]; then -- read config_dir --fi --if [ "$config_dir" = "" ]; then -- config_dir=/etc/webmin --fi --abspath=`echo $config_dir | grep "^/"` --if [ "$abspath" = "" ]; then -- echo "Config directory must be an absolute path" -- echo "" -- exit 2 --fi -+config_dir=/usr/local/etc/webmin - if [ ! -d $config_dir ]; then - mkdir $config_dir; - if [ $? != 0 ]; then -@@ -209,12 +189,12 @@ - fi - - # Ask for log directory -- printf "Log file directory [/var/webmin]: " -+ printf "Log file directory [/var/log/webmin]: " - if [ "$var_dir" = "" ]; then - read var_dir - fi - if [ "$var_dir" = "" ]; then -- var_dir=/var/webmin -+ var_dir=/var/log/webmin - fi - abspath=`echo $var_dir | grep "^/"` - if [ "$abspath" = "" ]; then -@@ -242,7 +222,9 @@ - echo "Webmin is written entirely in Perl. Please enter the full path to the" - echo "Perl 5 interpreter on your system." - echo "" -- if [ -x /usr/bin/perl ]; then -+ if [ -x %%PERL5%% ]; then -+ perldef=%%PERL5%% -+ elif [ -x /usr/bin/perl ]; then - perldef=/usr/bin/perl - elif [ -x /usr/local/bin/perl ]; then - perldef=/usr/local/bin/perl -@@ -441,22 +423,6 @@ - fi - fi - -- # Ask whether to run at boot time -- if [ "$atboot" = "" ]; then -- initsupp=`grep "^os_support=" "$srcdir/init/module.info" | sed -e 's/os_support=//g' | grep $os_type` -- atboot=0 -- if [ "$initsupp" != "" ]; then -- printf "Start Webmin at boot time (y/n): " -- read atbootyn -- if [ "$atbootyn" = "y" -o "$atbootyn" = "Y" ]; then -- atboot=1 -- makeboot=1 -- fi -- else -- echo "Webmin does not support being started at boot time on your system." -- fi -- fi -- - # Copy files to target directory - echo "***********************************************************************" - if [ "$wadir" != "$srcdir" ]; then -@@ -578,6 +544,7 @@ - fi - fi - -+noperlpath="yes" - if [ "$noperlpath" = "" ]; then - echo "Inserting path to perl into scripts.." - (find "$wadir" -name '*.cgi' -print ; find "$wadir" -name '*.pl' -print) | $perl "$wadir/perlpath.pl" $perl - -@@ -588,7 +555,6 @@ - echo "Creating start and stop scripts.." - rm -f $config_dir/stop $config_dir/start $config_dir/restart $config_dir/reload - echo "#!/bin/sh" >>$config_dir/start --echo "echo Starting Webmin server in $wadir" >>$config_dir/start - echo "trap '' 1" >>$config_dir/start - echo "LANG=" >>$config_dir/start - echo "export LANG" >>$config_dir/start -@@ -724,6 +690,7 @@ - echo passdelay=1 >> $config_dir/miniserv.conf - fi - -+nouninstall="yes" - if [ "$nouninstall" = "" ]; then - echo "Creating uninstall script $config_dir/uninstall.sh .." - cat >$config_dir/uninstall.sh <>$config_dir/start +-echo "echo Starting Webmin server in $wadir" >>$config_dir/start + echo "trap '' 1" >>$config_dir/start + echo "LANG=" >>$config_dir/start + echo "export LANG" >>$config_dir/start +@@ -724,6 +690,7 @@ + echo passdelay=1 >> $config_dir/miniserv.conf + fi + ++nouninstall="yes" + if [ "$nouninstall" = "" ]; then + echo "Creating uninstall script $config_dir/uninstall.sh .." + cat >$config_dir/uninstall.sh < -+#include -+#include -+#include -+#endif -+ - /******************************************/ - /* Defines */ - /******************************************/ -@@ -191,6 +198,9 @@ - int rss; - int time_stamp; - int counted; -+#ifdef NO_PROCFS -+ struct kinfo_proc *kp; -+#endif - }; - - /******************************************/ -@@ -455,17 +465,19 @@ - * Anyone hoping to port wmtop should look here first. - */ - int process_parse_procfs(struct process *process) { -+#if !defined(NO_PROCFS) - char line[WMTOP_BUFLENGTH],filename[WMTOP_BUFLENGTH],procname[WMTOP_BUFLENGTH]; - int ps; - struct stat sbuf; -- int user_time,kernel_time; - int rc; -+#endif -+ int user_time,kernel_time; - #if defined(LINUX) - char *r,*q; - char deparenthesised_name[WMTOP_BUFLENGTH]; - int endl; - #endif /* defined(LINUX) */ --#if defined(FREEBSD) -+#if defined(FREEBSD) && !defined(NO_PROCFS) - int us,um,ks,km; - #endif /* defined(FREEBSD) */ - -@@ -473,6 +485,15 @@ - assert(process->id==0x0badfeed); - #endif /* defined(PARANOID) */ - -+#if defined(NO_PROCFS) -+#define GETV(u) ((u).tv_sec * 1000 + (u).tv_usec / 1000) -+ process->time_stamp = g_time; -+ if(process->name) -+ wmtop_free(process->name); -+ process->name = wmtop_strdup(process->kp->ki_comm); -+ process->user_time = GETV(process->kp->ki_rusage.ru_utime); -+ process->kernel_time = GETV(process->kp->ki_rusage.ru_stime); -+#else - sprintf(filename,PROCFS_TEMPLATE,process->pid); - - /* -@@ -582,6 +603,7 @@ - process->user_time = us*1000+um/1000; - process->kernel_time = ks*1000+km/1000; - #endif /* defined(FREEBSD) */ -+#endif /* defined(NO_PROCFS) */ - - process->rss *= getpagesize(); - -@@ -607,6 +629,39 @@ - /******************************************/ - - int update_process_table() { -+#if defined(NO_PROCFS) -+ kvm_t *kd; -+ int n; -+ struct kinfo_proc *p; -+ -+ if((kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "wmtop")) == NULL) -+ return 1; -+ -+ if((p = kvm_getprocs(kd, KERN_PROC_ALL, 0, &n)) == NULL) -+ return 1; -+ -+ for(; n > 0; n --, p ++) -+ { -+ char **argv; -+ struct process *pp; -+ -+ if((argv = kvm_getargv(kd, p, 0)) == NULL || -+ argv[0] == NULL) -+ continue; -+ -+ pp = find_process(p->ki_pid); -+ if(!pp) -+ pp = new_process(p->ki_pid); -+ -+ pp->kp = p; -+ calculate_cpu(pp); -+ } -+ -+ if(kvm_close(kd) != 0) -+ return 1; -+ -+ return 0; -+#else - DIR *dir; - struct dirent *entry; - -@@ -640,6 +695,7 @@ - closedir(dir); - - return 0; -+#endif /* defined(NO_PROCFS) */ - } - - /******************************************/ Property changes on: head/sysutils/wmtop/files/patch-la ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/wmtop/files/patch-Makefile =================================================================== --- head/sysutils/wmtop/files/patch-Makefile (nonexistent) +++ head/sysutils/wmtop/files/patch-Makefile (revision 363335) @@ -0,0 +1,21 @@ +--- Makefile.orig Sat Apr 29 17:49:07 2000 ++++ Makefile Sun May 7 17:04:17 2000 +@@ -1,12 +1,12 @@ + DEBUG = -DPARANOID +-LIBDIR = -L/usr/X11R6/lib ++LIBDIR = -L$(PREFIX)/lib + LIBS = -lXpm -lXext -lX11 +-INCS = -I/usr/X11R6/share/include -I/usr/X11R6/include ++INCS = -I$(PREFIX)/include + OBJS = wmtop.o wmgeneral/wmgeneral.o wmgeneral/misc.o wmgeneral/list.o +-OPTS = -O3 -g -Wall +-FLAGS = $(DEBUG) $(OPTS) -D$(OS) +-MAKE = make +-CC = cc ++OPTS = -g -Wall ++FLAGS = $(DEBUG) $(OPTS) -D$(OS) $(CFLAGS) ++MAKE ?= make ++CC ?= cc + PREFIX ?= /usr/local + + default: Property changes on: head/sysutils/wmtop/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/wmtop/files/patch-wmtop.c =================================================================== --- head/sysutils/wmtop/files/patch-wmtop.c (nonexistent) +++ head/sysutils/wmtop/files/patch-wmtop.c (revision 363335) @@ -0,0 +1,120 @@ +--- wmtop.c.orig Wed Mar 7 05:30:56 2001 ++++ wmtop.c Fri Feb 25 22:34:36 2005 +@@ -70,6 +70,13 @@ + #include "xpm/wmtop-neon2.xpm" + #include "xpm/wmtop-rainbow.xpm" + ++#ifdef NO_PROCFS ++#include ++#include ++#include ++#include ++#endif ++ + /******************************************/ + /* Defines */ + /******************************************/ +@@ -191,6 +198,9 @@ + int rss; + int time_stamp; + int counted; ++#ifdef NO_PROCFS ++ struct kinfo_proc *kp; ++#endif + }; + + /******************************************/ +@@ -455,17 +465,19 @@ + * Anyone hoping to port wmtop should look here first. + */ + int process_parse_procfs(struct process *process) { ++#if !defined(NO_PROCFS) + char line[WMTOP_BUFLENGTH],filename[WMTOP_BUFLENGTH],procname[WMTOP_BUFLENGTH]; + int ps; + struct stat sbuf; +- int user_time,kernel_time; + int rc; ++#endif ++ int user_time,kernel_time; + #if defined(LINUX) + char *r,*q; + char deparenthesised_name[WMTOP_BUFLENGTH]; + int endl; + #endif /* defined(LINUX) */ +-#if defined(FREEBSD) ++#if defined(FREEBSD) && !defined(NO_PROCFS) + int us,um,ks,km; + #endif /* defined(FREEBSD) */ + +@@ -473,6 +485,15 @@ + assert(process->id==0x0badfeed); + #endif /* defined(PARANOID) */ + ++#if defined(NO_PROCFS) ++#define GETV(u) ((u).tv_sec * 1000 + (u).tv_usec / 1000) ++ process->time_stamp = g_time; ++ if(process->name) ++ wmtop_free(process->name); ++ process->name = wmtop_strdup(process->kp->ki_comm); ++ process->user_time = GETV(process->kp->ki_rusage.ru_utime); ++ process->kernel_time = GETV(process->kp->ki_rusage.ru_stime); ++#else + sprintf(filename,PROCFS_TEMPLATE,process->pid); + + /* +@@ -582,6 +603,7 @@ + process->user_time = us*1000+um/1000; + process->kernel_time = ks*1000+km/1000; + #endif /* defined(FREEBSD) */ ++#endif /* defined(NO_PROCFS) */ + + process->rss *= getpagesize(); + +@@ -607,6 +629,39 @@ + /******************************************/ + + int update_process_table() { ++#if defined(NO_PROCFS) ++ kvm_t *kd; ++ int n; ++ struct kinfo_proc *p; ++ ++ if((kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "wmtop")) == NULL) ++ return 1; ++ ++ if((p = kvm_getprocs(kd, KERN_PROC_ALL, 0, &n)) == NULL) ++ return 1; ++ ++ for(; n > 0; n --, p ++) ++ { ++ char **argv; ++ struct process *pp; ++ ++ if((argv = kvm_getargv(kd, p, 0)) == NULL || ++ argv[0] == NULL) ++ continue; ++ ++ pp = find_process(p->ki_pid); ++ if(!pp) ++ pp = new_process(p->ki_pid); ++ ++ pp->kp = p; ++ calculate_cpu(pp); ++ } ++ ++ if(kvm_close(kd) != 0) ++ return 1; ++ ++ return 0; ++#else + DIR *dir; + struct dirent *entry; + +@@ -640,6 +695,7 @@ + closedir(dir); + + return 0; ++#endif /* defined(NO_PROCFS) */ + } + + /******************************************/ Property changes on: head/sysutils/wmtop/files/patch-wmtop.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/xbatt/files/patch-aa =================================================================== --- head/sysutils/xbatt/files/patch-aa (revision 363334) +++ head/sysutils/xbatt/files/patch-aa (nonexistent) @@ -1,8 +0,0 @@ ---- Imakefile.org Thu Mar 6 22:54:29 1997 -+++ Imakefile Wed Oct 25 02:08:11 2000 -@@ -13,4 +13,4 @@ - INSTALLFLAGS=-c -m 2755 - #endif - --ComplexProgramTarget(xbatt) -+ComplexProgramTargetNoMan(xbatt) Property changes on: head/sysutils/xbatt/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/xbatt/files/patch-Imakefile =================================================================== --- head/sysutils/xbatt/files/patch-Imakefile (nonexistent) +++ head/sysutils/xbatt/files/patch-Imakefile (revision 363335) @@ -0,0 +1,8 @@ +--- Imakefile.org Thu Mar 6 22:54:29 1997 ++++ Imakefile Wed Oct 25 02:08:11 2000 +@@ -13,4 +13,4 @@ + INSTALLFLAGS=-c -m 2755 + #endif + +-ComplexProgramTarget(xbatt) ++ComplexProgramTargetNoMan(xbatt) Property changes on: head/sysutils/xbatt/files/patch-Imakefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/xbattbar/files/patch-aa =================================================================== --- head/sysutils/xbattbar/files/patch-aa (revision 363334) +++ head/sysutils/xbattbar/files/patch-aa (nonexistent) @@ -1,12 +0,0 @@ ---- Imakefile- Fri Oct 16 02:14:52 1998 -+++ Imakefile Fri Oct 16 02:15:41 1998 -@@ -4,9 +4,6 @@ - XCOMM All rights reserved. - XCOMM - --BINDIR = /usr/local/bin --MANDIR = /usr/local/man/cat1 -- - LOCAL_LIBRARIES = $(XLIB) - - SRCS = xbattbar.c Property changes on: head/sysutils/xbattbar/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/xbattbar/files/patch-Imakefile =================================================================== --- head/sysutils/xbattbar/files/patch-Imakefile (nonexistent) +++ head/sysutils/xbattbar/files/patch-Imakefile (revision 363335) @@ -0,0 +1,12 @@ +--- Imakefile- Fri Oct 16 02:14:52 1998 ++++ Imakefile Fri Oct 16 02:15:41 1998 +@@ -4,9 +4,6 @@ + XCOMM All rights reserved. + XCOMM + +-BINDIR = /usr/local/bin +-MANDIR = /usr/local/man/cat1 +- + LOCAL_LIBRARIES = $(XLIB) + + SRCS = xbattbar.c Property changes on: head/sysutils/xbattbar/files/patch-Imakefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/xdu/Makefile =================================================================== --- head/sysutils/xdu/Makefile (revision 363334) +++ head/sysutils/xdu/Makefile (revision 363335) @@ -1,19 +1,18 @@ # Created by: asami # $FreeBSD$ PORTNAME= xdu PORTVERSION= 3.0 PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://sd.wareonearth.com/~phil/xdu/ -EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Graphically display output of du NO_WRKSUBDIR= yes -USES= imake +USES= imake tar:Z USE_XORG= ice sm x11 xaw xext xmu xpm xt PLIST_FILES= bin/xdu lib/X11/app-defaults/XDu man/man1/xdu.1.gz .include Index: head/sysutils/xdu/files/patch-aa =================================================================== --- head/sysutils/xdu/files/patch-aa (revision 363334) +++ head/sysutils/xdu/files/patch-aa (nonexistent) @@ -1,109 +0,0 @@ ---- xdu.c.orig Sun Jun 5 21:29:23 1994 -+++ xdu.c Sun Aug 15 19:31:01 2004 -@@ -20,9 +20,12 @@ - * the party supplying this software to the X Consortium. - */ - #include -+#include -+#include -+#include -+#include - #include "version.h" - --extern char *malloc(), *calloc(); - - #define MAXDEPTH 80 /* max elements in a path */ - #define MAXNAME 1024 /* max pathname element length */ -@@ -235,6 +238,7 @@ - char name[4096]; - int size; - FILE *fp; -+ char *p, *n; - - if (strcmp(filename, "-") == 0) { - fp = stdin; -@@ -244,11 +248,21 @@ - exit(1); - } - } -+ - while (fgets(buf,sizeof(buf),fp) != NULL) { -- sscanf(buf, "%d %s\n", &size, name); -+ p = buf; -+ while (*p && isspace(*p)) p++; -+ size = atoi(p); -+ while (*p && !isspace(*p)) p++; -+ while (*p && isspace(*p)) p++; -+ n = name; -+ while (*p && *p != '\n' && *p != '\r') -+ *n++ = *p++; -+ *n++ = '\0'; - /*printf("%d %s\n", size, name);*/ - parse_entry(name,size); - } -+ - fclose(fp); - } - -@@ -269,7 +283,7 @@ - length = strlen(name); - if ((length > 0) && (name[length-1] == '/')) { - /* strip off trailing / (e.g. GNU du) */ -- name[length-1] = 0; -+ name[--length] = 0; - } - - arg = 0; indx = 0; -@@ -289,8 +303,10 @@ - } - name++; - } -- buf[indx] = 0; -- path[arg++] = strdup(buf); -+ if (length) { -+ buf[indx] = 0; -+ path[arg++] = strdup(buf); -+ } - path[arg] = NULL; - - addtree(&top,path,size); -@@ -399,15 +415,15 @@ - - /*printf("addtree(\"%s\",\"%s\",%d)\n", top->name, path[0], size);*/ - -+ if (path[0] == NULL) { -+ /* end of the chain, save size */ -+ top->size = size; -+ return; -+ } -+ - /* check all children for a match */ - for (np = top->child; np != NULL; np = np->peer) { - if (strcmp(path[0],np->name) == 0) { -- /* name matches */ -- if (path[1] == NULL) { -- /* end of the chain, save size */ -- np->size = size; -- return; -- } - /* recurse */ - addtree(np,&path[1],size); - return; -@@ -621,7 +637,7 @@ - printf("%s %d (%.2f%%)\n", path, topp->size, - 100.0*topp->size/rootp->size); - } -- -+/* - char * - strdup(s) - char *s; -@@ -635,7 +651,7 @@ - - return cp; - } -- -+*/ - /**************** External Entry Points ****************/ - - int Property changes on: head/sysutils/xdu/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/xdu/files/patch-xdu.c =================================================================== --- head/sysutils/xdu/files/patch-xdu.c (nonexistent) +++ head/sysutils/xdu/files/patch-xdu.c (revision 363335) @@ -0,0 +1,109 @@ +--- xdu.c.orig Sun Jun 5 21:29:23 1994 ++++ xdu.c Sun Aug 15 19:31:01 2004 +@@ -20,9 +20,12 @@ + * the party supplying this software to the X Consortium. + */ + #include ++#include ++#include ++#include ++#include + #include "version.h" + +-extern char *malloc(), *calloc(); + + #define MAXDEPTH 80 /* max elements in a path */ + #define MAXNAME 1024 /* max pathname element length */ +@@ -235,6 +238,7 @@ + char name[4096]; + int size; + FILE *fp; ++ char *p, *n; + + if (strcmp(filename, "-") == 0) { + fp = stdin; +@@ -244,11 +248,21 @@ + exit(1); + } + } ++ + while (fgets(buf,sizeof(buf),fp) != NULL) { +- sscanf(buf, "%d %s\n", &size, name); ++ p = buf; ++ while (*p && isspace(*p)) p++; ++ size = atoi(p); ++ while (*p && !isspace(*p)) p++; ++ while (*p && isspace(*p)) p++; ++ n = name; ++ while (*p && *p != '\n' && *p != '\r') ++ *n++ = *p++; ++ *n++ = '\0'; + /*printf("%d %s\n", size, name);*/ + parse_entry(name,size); + } ++ + fclose(fp); + } + +@@ -269,7 +283,7 @@ + length = strlen(name); + if ((length > 0) && (name[length-1] == '/')) { + /* strip off trailing / (e.g. GNU du) */ +- name[length-1] = 0; ++ name[--length] = 0; + } + + arg = 0; indx = 0; +@@ -289,8 +303,10 @@ + } + name++; + } +- buf[indx] = 0; +- path[arg++] = strdup(buf); ++ if (length) { ++ buf[indx] = 0; ++ path[arg++] = strdup(buf); ++ } + path[arg] = NULL; + + addtree(&top,path,size); +@@ -399,15 +415,15 @@ + + /*printf("addtree(\"%s\",\"%s\",%d)\n", top->name, path[0], size);*/ + ++ if (path[0] == NULL) { ++ /* end of the chain, save size */ ++ top->size = size; ++ return; ++ } ++ + /* check all children for a match */ + for (np = top->child; np != NULL; np = np->peer) { + if (strcmp(path[0],np->name) == 0) { +- /* name matches */ +- if (path[1] == NULL) { +- /* end of the chain, save size */ +- np->size = size; +- return; +- } + /* recurse */ + addtree(np,&path[1],size); + return; +@@ -621,7 +637,7 @@ + printf("%s %d (%.2f%%)\n", path, topp->size, + 100.0*topp->size/rootp->size); + } +- ++/* + char * + strdup(s) + char *s; +@@ -635,7 +651,7 @@ + + return cp; + } +- ++*/ + /**************** External Entry Points ****************/ + + int Property changes on: head/sysutils/xdu/files/patch-xdu.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/xfsm/Makefile =================================================================== --- head/sysutils/xfsm/Makefile (revision 363334) +++ head/sysutils/xfsm/Makefile (revision 363335) @@ -1,20 +1,19 @@ # Created by: Vanilla I. Shu # $FreeBSD$ PORTNAME= xfsm PORTVERSION= 1.99 PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= system/status/xstatus -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= X File System Monitor -USES= imake +USES= imake tar:tgz USE_XORG= xbitmaps x11 xext MAKE_ARGS= CC="${CC}" CCOPTIONS="-DFreeBSD" PLIST_FILES= bin/xfsm man/man1/${PORTNAME}.1.gz .include Index: head/sysutils/xfsm/files/patch-ac =================================================================== --- head/sysutils/xfsm/files/patch-ac (revision 363334) +++ head/sysutils/xfsm/files/patch-ac (nonexistent) @@ -1,11 +0,0 @@ ---- xfsm_util.c.orig Thu Feb 18 04:35:38 1999 -+++ xfsm_util.c Wed Mar 15 03:08:33 2000 -@@ -152,7 +152,7 @@ - /* *** FreeBSD has fsize which is the physical block size *** */ - /* *** and bsize which is the optimal transfer block size *** */ - /* *** and which depends on the filesystem parameter. *** */ -- calc_bsize=stats[i].f_fsize; -+ calc_bsize=stats[i].f_bsize; - #endif /* FreeBSD */ - - /* *** take the longer of the two 'problematic' strings *** */ Property changes on: head/sysutils/xfsm/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/xfsm/files/patch-xfsm_util.c =================================================================== --- head/sysutils/xfsm/files/patch-xfsm_util.c (nonexistent) +++ head/sysutils/xfsm/files/patch-xfsm_util.c (revision 363335) @@ -0,0 +1,11 @@ +--- xfsm_util.c.orig Thu Feb 18 04:35:38 1999 ++++ xfsm_util.c Wed Mar 15 03:08:33 2000 +@@ -152,7 +152,7 @@ + /* *** FreeBSD has fsize which is the physical block size *** */ + /* *** and bsize which is the optimal transfer block size *** */ + /* *** and which depends on the filesystem parameter. *** */ +- calc_bsize=stats[i].f_fsize; ++ calc_bsize=stats[i].f_bsize; + #endif /* FreeBSD */ + + /* *** take the longer of the two 'problematic' strings *** */ Property changes on: head/sysutils/xfsm/files/patch-xfsm_util.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property