View | Details | Raw Unified | Return to bug 92116
Collapse All | Expand All

(-)/usr/home/trn/afio/Makefile (-2 / +2 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	afio
8
PORTNAME=	afio
9
PORTVERSION=	2.4.7
9
PORTVERSION=	2.5
10
PORTREVISION=	1
10
#PORTREVISION=	1
11
CATEGORIES=	sysutils
11
CATEGORIES=	sysutils
12
MASTER_SITES=	${MASTER_SITE_SUNSITE}
12
MASTER_SITES=	${MASTER_SITE_SUNSITE}
13
MASTER_SITE_SUBDIR=	system/backup
13
MASTER_SITE_SUBDIR=	system/backup
(-)/usr/home/trn/afio/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (afio-2.4.7.tgz) = 28fd6daa7805ee2263879ff1b9c96a9e
1
SIZE (afio-2.5.tgz) = 179184
2
SHA256 (afio-2.4.7.tgz) = a00a5c26c2f323ca87cb82278915391537ac25327d27510bbca3b8b482e36899
2
MD5 (afio-2.5.tgz) = 8c6665e0f875dcd8e1bdb18644b59688
3
SIZE (afio-2.4.7.tgz) = 91224
3
SHA256 (afio-2.5.tgz) = e7801a0f0a8dcbae41f4156dee5dae2a34a558d6c3ceac517efad4fed610ff2e
(-)/usr/home/trn/afio/files/patch-aa (-60 / +136 lines)
Lines 1-60 Link Here
1
--- Makefile.orig	Thu Nov 25 22:42:26 1999
1
*** Makefile.orig	Sun Dec 21 05:23:51 2003
2
+++ Makefile	Thu Jan 27 15:03:54 2000
2
--- Makefile	Sat Jan 21 17:34:53 2006
3
@@ -26,14 +26,14 @@
3
***************
4
 c	= -DHAVEMEMCMP
4
*** 26,56 ****
5
 ##  Define DEFFMTCMD to being how to format the media you use the most
5
  #b	= -UUNIXPC
6
 ##		This is the DEFault FoRMat CoManD. 
6
  ##  Define HAVEMEMCMP if you have memcmp otherwise assumes bcmp
7
-d	= -DDEFFMTCMD='"fdformat /dev/fd0H1440"'
7
  c	= -DHAVEMEMCMP
8
+d	= -DDEFFMTCMD='"/usr/bin/fdformat -f 1440 /dev/fd0.1440"'
8
  ##  Define DEFFMTCMD to being how to format the media you use the most
9
 ##  Define LONGZFILE if you want .Z to be tagged on the end of a 14 char
9
  ##		This is the DEFault FoRMat CoManD. 
10
 ##	file name (or longer for BSD) in the archive when the file is compressed
10
! d	= -DDEFFMTCMD='"fdformat /dev/fd0H1440"'
11
 #e	= -DLONGZFILE
11
  ##  Define LONGZFILE if you want .Z to be tagged on the end of a 14 char
12
 
12
  ##	file name (or longer for BSD) in the archive when the file is compressed
13
 ##  Define PRG_COMPRESS to get something other than `gzip'.
13
  #e	= -DLONGZFILE
14
 # you need to edit compfile.c (-G option) if you change this line.
14
  
15
-f	= -DPRG_COMPRESS='"gzip"'
15
  ##  Define HAVE_LCHOWN is the system has an lchown call (like chown but does
16
+f	= -DPRG_COMPRESS='"/usr/bin/gzip"'
16
  ##  not follow symlinks)
17
 
17
  e2      = -DHAVE_LCHOWN
18
 ## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for
18
  
19
 # -y -Y -w -W matching.
19
  ##  Define PRG_COMPRESS to get something other than `gzip'.
20
@@ -43,6 +43,11 @@
20
  # you need to edit compfile.c (-G option) if you change this line.
21
 
21
! f	= -DPRG_COMPRESS='"gzip"'
22
 g	= -DHAVEFNMATCH
22
  
23
 
23
  ## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for
24
+## Define HAVE_PARAM_H if your system has sys/param.h. This is used for BSD
24
  # -y -Y -w -W matching.
25
+#  detection.
25
  # If it is not defined, a primitive replacement match routine is used that
26
+
26
  # only supports patterns of the form "cccc" and "cccc*".  Make sure that
27
+h 	= -DHAVE_PARAM_H
27
  # you change the manual page in this case.
28
+
28
  
29
 # fnmatch() is in the gnu C library, so it is directly available on
29
  g	= -DHAVEFNMATCH
30
 # Linux.  If your system (e.g. SCO) does not have the gnu C library,
30
  
31
 # unpack the archive gnu.fnmatch.tar.gz and uncomment the following
31
  # fnmatch() is in the gnu C library, so it is directly available on
32
@@ -56,13 +61,14 @@
32
  # Linux.  If your system (e.g. SCO) does not have the gnu C library,
33
 
33
  # unpack the archive gnu.fnmatch.tar.gz and uncomment the following
34
 #CFLAGS1 = -ggdb
34
  # two lines:
35
 #CFLAGS1 = -Wall -s -g -O2 -fomit-frame-pointer
35
  
36
-CFLAGS1 = -Wall -O2 -fomit-frame-pointer
36
--- 26,61 ----
37
+#CFLAGS1 = -Wall -O2 -fomit-frame-pointer
37
  #b	= -UUNIXPC
38
+CFLAGS1 = -fomit-frame-pointer -fno-strength-reduce
38
  ##  Define HAVEMEMCMP if you have memcmp otherwise assumes bcmp
39
 
39
  c	= -DHAVEMEMCMP
40
 
40
  ##  Define DEFFMTCMD to being how to format the media you use the most
41
-CC=gcc
41
  ##		This is the DEFault FoRMat CoManD. 
42
+#CC=gcc
42
! d	= -DDEFFMTCMD='"/usr/sbin/fdformat -f 1440 /dev/fd0"'
43
 
43
  ##  Define LONGZFILE if you want .Z to be tagged on the end of a 14 char
44
 
44
  ##	file name (or longer for BSD) in the archive when the file is compressed
45
-CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $I
45
  #e	= -DLONGZFILE
46
+CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $h $I
46
  
47
 LDFLAGS =
47
  ##  Define HAVE_LCHOWN is the system has an lchown call (like chown but does
48
 
48
  ##  not follow symlinks)
49
 afio : afio.o compfile.o exten.o match.o $M
49
  e2      = -DHAVE_LCHOWN
50
@@ -72,8 +78,8 @@
50
  
51
 	rm -f *.o afio
51
  ##  Define PRG_COMPRESS to get something other than `gzip'.
52
 
52
  # you need to edit compfile.c (-G option) if you change this line.
53
 install: afio
53
! f	= -DPRG_COMPRESS='"/usr/bin/gzip"'
54
-	cp afio /usr/bin
54
  
55
-	cp afio.1 /usr/man/man1
55
  ## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for
56
+	install -cs -o root -g wheel afio ${PREFIX}/bin
56
  # -y -Y -w -W matching.
57
+	install -c -o root -g wheel afio.1 ${PREFIX}/man/man1
57
  # If it is not defined, a primitive replacement match routine is used that
58
 
58
  # only supports patterns of the form "cccc" and "cccc*".  Make sure that
59
 
59
  # you change the manual page in this case.
60
 afio.o : afio.h patchlevel.h
60
  
61
  g	= -DHAVEFNMATCH
62
  
63
+ ## Define HAVE_PARAM_H if your system has sys/param.h. This is used for BSD
64
+ #  detection.
65
+ 
66
+ h 	= -DHAVE_PARAM_H
67
+ 
68
  # fnmatch() is in the gnu C library, so it is directly available on
69
  # Linux.  If your system (e.g. SCO) does not have the gnu C library,
70
  # unpack the archive gnu.fnmatch.tar.gz and uncomment the following
71
  # two lines:
72
  
73
***************
74
*** 69,83 ****
75
  
76
  # even more warnings flags..
77
  MW=
78
  #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
79
  
80
! CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW}
81
  
82
! CC=gcc
83
  
84
! CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
85
  LDFLAGS =
86
  
87
  afio : afio.o compfile.o exten.o match.o $M
88
  	${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio
89
  
90
--- 74,91 ----
91
  
92
  # even more warnings flags..
93
  MW=
94
  #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
95
  
96
! #CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW}
97
! CFLAGS1 = -fomit-frame-pointer -fno-strength-reduce
98
  
99
! #CC=gcc
100
! CC=cc
101
  
102
! #CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
103
! CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $h $I
104
  LDFLAGS =
105
  
106
  afio : afio.o compfile.o exten.o match.o $M
107
  	${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio
108
  
109
***************
110
*** 86,97 ****
111
  	rm -f regtest/cmpstat regtest/makesparse
112
  	rm -f regtest/statsize regtest/statsize64
113
  	cd regtest; /bin/sh regtest.clean
114
  
115
  install: afio
116
! 	cp afio /usr/local/bin
117
! 	cp afio.1 /usr/share/man/man1
118
  
119
  # generate default list of -E extensions from manpage
120
  # note: on sun, I had to change awk command below to nawk or gawk
121
  # to get it to work.
122
  exten_default.h : afio.1
123
--- 94,106 ----
124
  	rm -f regtest/cmpstat regtest/makesparse
125
  	rm -f regtest/statsize regtest/statsize64
126
  	cd regtest; /bin/sh regtest.clean
127
  
128
  install: afio
129
! 	install -cs -o root -g wheel afio ${PREFIX}/bin
130
! 	install -c -o root -g wheel afio.1 ${PREFIX}/man/man1
131
! 
132
  
133
  # generate default list of -E extensions from manpage
134
  # note: on sun, I had to change awk command below to nawk or gawk
135
  # to get it to work.
136
  exten_default.h : afio.1
(-)/usr/home/trn/afio/files/patch-ab (-33 / +83 lines)
Lines 1-33 Link Here
1
--- afio.c.orig	Tue Oct  9 23:03:53 2001
1
*** afio.c.orig	Sat Dec 20 17:16:13 2003
2
+++ afio.c	Mon Sep 29 16:34:02 2003
2
--- afio.c	Sat Jan 21 17:31:23 2006
3
@@ -613,7 +613,7 @@
3
***************
4
                aruntil, arbsize);    
4
*** 648,658 ****
5
 #else
5
           daniel.andersson@sto.sema.se  */
6
       fprintf (stderr, "Media size %ld is less than block size %d\n",
6
        fprintf (stderr, "Media size %ld is less than block size %d\n",
7
-	       (ulong) aruntil, arbsize);
7
                 aruntil, arbsize);    
8
+	       (u_long) aruntil, arbsize);
8
  #else
9
 #endif
9
        fprintf (stderr, "Media size %ld is less than block size %d\n",
10
    usage ();
10
! 	       (unsigned long) aruntil, arbsize);
11
     }
11
  #endif
12
@@ -2929,10 +2929,10 @@
12
     usage ();
13
          see out(). 
13
      }
14
        */
14
    if (arpad == 0)
15
       if(asb->sb_rdev==0) asb->sb_rdev=(asb->sb_dev << 16) + asb->sb_ino;
15
      arpad = arbsize;
16
-      if (mknod (name, asb->sb_mode, asb->sb_rdev) < 0
16
--- 648,658 ----
17
+      if (mkfifo (name, asb->sb_mode) < 0
17
           daniel.andersson@sto.sema.se  */
18
 	  && (errno != ENOENT
18
        fprintf (stderr, "Media size %ld is less than block size %d\n",
19
 	      || dirneed (name) < 0
19
                 aruntil, arbsize);    
20
-	      || mknod (name, asb->sb_mode, asb->sb_rdev) < 0))
20
  #else
21
+	      || mkfifo (name, asb->sb_mode) < 0))
21
        fprintf (stderr, "Media size %ld is less than block size %d\n",
22
 	return (warn (name, syserr ()));
22
! 	       (u_long) aruntil, arbsize);
23
       break;
23
  #endif
24
     case S_IFDIR:
24
     usage ();
25
@@ -2960,7 +2960,7 @@
25
      }
26
 	return (warn (name, syserr ()));
26
    if (arpad == 0)
27
       break;
27
      arpad = arbsize;
28
 #endif /* S_IFIFO */
28
***************
29
-#ifdef	S_IFSOCK
29
*** 3155,3168 ****
30
+#ifdef	S_IFSOCK && !defined (__FreeBSD__)
30
  	    return (warn (name, syserr ()));
31
     case S_IFSOCK:
31
  	  else
32
       fd = 0;
32
  	    exists = 0;
33
       if (exists)
33
  	}
34
  
35
!       if (mknod (name, asb->sb_mode, asb->sb_rdev) < 0
36
  	  && (errno != ENOENT
37
  	      || dirneed (name) < 0
38
! 	      || mknod (name, asb->sb_mode, asb->sb_rdev) < 0))
39
  	return (warn (name, syserr ()));
40
        break;
41
      case S_IFDIR:
42
        if (exists)
43
  	{
44
--- 3155,3168 ----
45
  	    return (warn (name, syserr ()));
46
  	  else
47
  	    exists = 0;
48
  	}
49
  
50
!       if (mkfifo (name, asb->sb_mode) < 0
51
  	  && (errno != ENOENT
52
  	      || dirneed (name) < 0
53
! 	      || mkfifo (name, asb->sb_mode) < 0))
54
  	return (warn (name, syserr ()));
55
        break;
56
      case S_IFDIR:
57
        if (exists)
58
  	{
59
***************
60
*** 3194,3204 ****
61
  		   || dirneed (name) < 0
62
  		   || mkfifo (name, asb->sb_mode) < 0))
63
  	return (warn (name, syserr ()));
64
        break;
65
  #endif /* S_IFIFO */
66
! #ifdef	S_IFSOCK
67
      case S_IFSOCK:
68
        fd = 0;
69
        if (exists)
70
  	if (perm != operm && chmod (name, perm) < 0)
71
  	  return (warn (name, syserr ()));
72
--- 3194,3204 ----
73
  		   || dirneed (name) < 0
74
  		   || mkfifo (name, asb->sb_mode) < 0))
75
  	return (warn (name, syserr ()));
76
        break;
77
  #endif /* S_IFIFO */
78
! #ifdef	S_IFSOCK && !defined (__FreeBSD__)
79
      case S_IFSOCK:
80
        fd = 0;
81
        if (exists)
82
  	if (perm != operm && chmod (name, perm) < 0)
83
  	  return (warn (name, syserr ()));

Return to bug 92116