Hi,
This makes mail/sma compile with clang using libc's getopt instead of
handrolled.
OK?
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/mail/sma/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-Makefile
--- patches/patch-Makefile 25 Jan 2005 06:57:45 -0000 1.4
+++ patches/patch-Makefile 26 May 2017 12:03:01 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile,v 1.4 2005/01/25 06:57:45 matthieu Exp $
---- Makefile.orig Sat Dec 28 15:38:05 2002
-+++ Makefile Sun Jan 9 10:26:36 2005
-@@ -2,12 +2,12 @@
- # $Id: patch-Makefile,v 1.4 2005/01/25 06:57:45 matthieu Exp $
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -3,20 +3,20 @@
#
-BINDIR = /usr/local/bin
@@ -18,8 +18,10 @@ $OpenBSD: patch-Makefile,v 1.4 2005/01/2
# Others
#CFLAGS = -Wall -O
-@@ -16,7 +16,7 @@ PROG = sma
- OBJS = sma.o getopt.o parse.o utils.o hash.o html.o ascii.o init.o
+ MAN = sma.8
+ PROG = sma
+-OBJS = sma.o getopt.o parse.o utils.o hash.o html.o ascii.o init.o
++OBJS = sma.o parse.o utils.o hash.o html.o ascii.o init.o
$(PROG): $(OBJS)
- $(CC) $(CFLAGS) -o $(PROG) $(OBJS)
Index: patches/patch-sma_c
===================================================================
RCS file: patches/patch-sma_c
diff -N patches/patch-sma_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sma_c 26 May 2017 12:03:01 -0000
@@ -0,0 +1,105 @@
+$OpenBSD$
+
+Index: sma.c
+--- sma.c.orig
++++ sma.c
+@@ -30,8 +30,5 @@
+ */
+
+-extern const char *sma_optarg;
+-extern int sma_optind;
+-
+ #include "sma.h"
+
+ int
+@@ -59,25 +56,25 @@ main(int argc, char **argv) {
+ break;
+ case 'D':
+ Dflag = 1;
+- Dchar = sma_optarg;
++ Dchar = optarg;
+ break;
+ case 'C':
+ Cflag = 1;
+- Cchar = sma_optarg;
++ Cchar = optarg;
+ break;
+ case 'F':
+ Fflag = 1;
+ break;
+ case 'H':
+ Hflag = 1;
+- Hchar = sma_optarg;
++ Hchar = optarg;
+ break;
+ case 'a':
+ aflag = 1;
+ break;
+ case 'b':
+ bflag = 1;
+- bchar = sma_optarg;
++ bchar = optarg;
+ break;
+ case 'c':
+ cflag = 1;
+@@ -87,7 +84,7 @@ main(int argc, char **argv) {
+ break;
+ case 'f':
+ fflag = 1;
+- fchar = sma_optarg;
++ fchar = optarg;
+ break;
+ case 'h':
+ hflag = 1;
+@@ -97,26 +94,26 @@ main(int argc, char **argv) {
+ break;
+ case 'l':
+ lflag = 1;
+- lnum = atoi(sma_optarg);
++ lnum = atoi(optarg);
+ break;
+ case 'L':
+ Lflag = 1;
+- Lchar = sma_optarg;
++ Lchar = optarg;
+ break;
+ case 'r':
+ rflag = 1;
+- rnum = atoi(sma_optarg);
++ rnum = atoi(optarg);
+ break;
+ case 'n':
+ nflag = 1;
+ break;
+ case 'o':
+ oflag = 1;
+- ochar = sma_optarg;
++ ochar = optarg;
+ break;
+ case 'O':
+ Oflag = 1;
+- Ochar = sma_optarg;
++ Ochar = optarg;
+ break;
+ case 'p':
+ pflag = 1;
+@@ -126,7 +123,7 @@ main(int argc, char **argv) {
+ break;
+ case 't':
+ tflag = 1;
+- tchar = sma_optarg;
++ tchar = optarg;
+ break;
+ case 'q':
+ qflag = 1;
+@@ -140,8 +137,8 @@ main(int argc, char **argv) {
+ default:
+ usage();
+ }
+- argc -= sma_optind;
+- argv += sma_optind;
++ argc -= optind;
++ argv += optind;
+
+ /* Debug */
+ if (vflag)
No comments:
Post a Comment