Re: unbreak smtp-vilter

[Matthew Dempsky]

Looks ok to me, but I haven't tested it or anything.

On Fri, Aug 9, 2013 at 10:26 AM, Ian Darwin  wrote:
> Sharper cluestick from matthew@.
>
> OK now?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/smtp-vilter/Makefile,v
> retrieving revision 1.53
> diff -u -p -r1.53 Makefile
> --- Makefile9 May 2013 18:47:53 -   1.53
> +++ Makefile9 Aug 2013 17:25:11 -
> @@ -3,7 +3,7 @@
>  COMMENT=   sendmail milter to scan messages for viruses and spam
>
>  DISTNAME=  smtp-vilter-1.3.8
> -REVISION=  0
> +REVISION=  1
>
>  CATEGORIES=mail
>
> Index: patches/patch-backend_vilter-attachment_Makefile
> ===
> RCS file: patches/patch-backend_vilter-attachment_Makefile
> diff -N patches/patch-backend_vilter-attachment_Makefile
> --- /dev/null   1 Jan 1970 00:00:00 -
> +++ patches/patch-backend_vilter-attachment_Makefile9 Aug 2013 17:25:11 
> -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- backend/vilter-attachment/Makefile.origSat May  4 07:07:11 2013
>  backend/vilter-attachment/Makefile Fri Aug  9 12:19:15 2013
> +@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
> + CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
> + .endif
> +
> +-LDADD+=   -nostdlib
> ++LDADD+=   -nodefaultlibs
> +
> + beforeinstall:
> +   -mkdir -p ${DESTDIR}${LIBDIR}
> Index: patches/patch-backend_vilter-clamd_Makefile
> ===
> RCS file: patches/patch-backend_vilter-clamd_Makefile
> diff -N patches/patch-backend_vilter-clamd_Makefile
> --- /dev/null   1 Jan 1970 00:00:00 -
> +++ patches/patch-backend_vilter-clamd_Makefile 9 Aug 2013 17:25:11 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- backend/vilter-clamd/Makefile.orig Sat May  4 07:05:12 2013
>  backend/vilter-clamd/Makefile  Fri Aug  9 12:19:18 2013
> +@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
> + CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
> + .endif
> +
> +-LDADD+=   -nostdlib
> ++LDADD+=   -nodefaultlibs
> +
> + beforeinstall:
> +   -mkdir -p ${DESTDIR}${LIBDIR}
> Index: patches/patch-backend_vilter-icap_Makefile
> ===
> RCS file: patches/patch-backend_vilter-icap_Makefile
> diff -N patches/patch-backend_vilter-icap_Makefile
> --- /dev/null   1 Jan 1970 00:00:00 -
> +++ patches/patch-backend_vilter-icap_Makefile  9 Aug 2013 17:25:11 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- backend/vilter-icap/Makefile.orig  Sat May  4 07:08:28 2013
>  backend/vilter-icap/Makefile   Fri Aug  9 12:19:21 2013
> +@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
> + CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
> + .endif
> +
> +-LDADD+=   -nostdlib
> ++LDADD+=   -nodefaultlibs
> +
> + beforeinstall:
> +   -mkdir -p ${DESTDIR}${LIBDIR}
> Index: patches/patch-backend_vilter-regex_Makefile
> ===
> RCS file: patches/patch-backend_vilter-regex_Makefile
> diff -N patches/patch-backend_vilter-regex_Makefile
> --- /dev/null   1 Jan 1970 00:00:00 -
> +++ patches/patch-backend_vilter-regex_Makefile 9 Aug 2013 17:25:11 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- backend/vilter-regex/Makefile.orig Sat May  4 07:10:56 2013
>  backend/vilter-regex/Makefile  Fri Aug  9 12:19:25 2013
> +@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
> + CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
> + .endif
> +
> +-LDADD+=   -nostdlib
> ++LDADD+=   -nodefaultlibs
> +
> + beforeinstall:
> +   -mkdir -p ${DESTDIR}${LIBDIR}
> Index: patches/patch-backend_vilter-spamd_Makefile
> ===
> RCS file: patches/patch-backend_vilter-spamd_Makefile
> diff -N patches/patch-backend_vilter-spamd_Makefile
> --- /dev/null   1 Jan 1970 00:00:00 -
> +++ patches/patch-backend_vilter-spamd_Makefile 9 Aug 2013 17:25:11 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- backend/vilter-spamd/Makefile.orig Sat May  4 07:11:57 2013
>  backend/vilter-spamd/Makefile  Fri Aug  9 12:19:29 2013
> +@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
> + CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
> + .endif
> +
> +-LDADD+=   -nostdlib
> ++LDADD+=   -nodefaultlibs
> +
> + beforeinstall:
> +   -mkdir -p ${DESTDIR}${LIBDIR}
>

Re: unbreak smtp-vilter

[Ian Darwin]

Sharper cluestick from matthew@.

OK now?

Index: Makefile
===
RCS file: /cvs/ports/mail/smtp-vilter/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- Makefile9 May 2013 18:47:53 -   1.53
+++ Makefile9 Aug 2013 17:25:11 -
@@ -3,7 +3,7 @@
 COMMENT=   sendmail milter to scan messages for viruses and spam
 
 DISTNAME=  smtp-vilter-1.3.8
-REVISION=  0
+REVISION=  1
 
 CATEGORIES=mail
 
Index: patches/patch-backend_vilter-attachment_Makefile
===
RCS file: patches/patch-backend_vilter-attachment_Makefile
diff -N patches/patch-backend_vilter-attachment_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-attachment_Makefile9 Aug 2013 17:25:11 
-
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-attachment/Makefile.origSat May  4 07:07:11 2013
 backend/vilter-attachment/Makefile Fri Aug  9 12:19:15 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   -nodefaultlibs
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-clamd_Makefile
===
RCS file: patches/patch-backend_vilter-clamd_Makefile
diff -N patches/patch-backend_vilter-clamd_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-clamd_Makefile 9 Aug 2013 17:25:11 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-clamd/Makefile.orig Sat May  4 07:05:12 2013
 backend/vilter-clamd/Makefile  Fri Aug  9 12:19:18 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   -nodefaultlibs
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-icap_Makefile
===
RCS file: patches/patch-backend_vilter-icap_Makefile
diff -N patches/patch-backend_vilter-icap_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-icap_Makefile  9 Aug 2013 17:25:11 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-icap/Makefile.orig  Sat May  4 07:08:28 2013
 backend/vilter-icap/Makefile   Fri Aug  9 12:19:21 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   -nodefaultlibs
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-regex_Makefile
===
RCS file: patches/patch-backend_vilter-regex_Makefile
diff -N patches/patch-backend_vilter-regex_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-regex_Makefile 9 Aug 2013 17:25:11 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-regex/Makefile.orig Sat May  4 07:10:56 2013
 backend/vilter-regex/Makefile  Fri Aug  9 12:19:25 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   -nodefaultlibs
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-spamd_Makefile
===
RCS file: patches/patch-backend_vilter-spamd_Makefile
diff -N patches/patch-backend_vilter-spamd_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-spamd_Makefile 9 Aug 2013 17:25:11 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-spamd/Makefile.orig Sat May  4 07:11:57 2013
 backend/vilter-spamd/Makefile  Fri Aug  9 12:19:29 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   -nodefaultlibs
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}

Re: unbreak smtp-vilter

[Matthew Dempsky]

On Fri, Aug 9, 2013 at 9:45 AM, Ian Darwin  wrote:
> +-LDADD+=   -nostdlib
> ++LDADD+=   --nodefaultlib

Hm, I would think this needs to be "-nodefaultlibs" instead of
"--nodefaultlib" (i.e., only one hyphen and add the s).

unbreak smtp-vilter

[Ian Darwin]

On amd64 at least, the current version fails to start with messages
about __guard missing. Correction based on cluebat from matthew@

OK?

Index: Makefile
===
RCS file: /cvs/ports/mail/smtp-vilter/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- Makefile9 May 2013 18:47:53 -   1.53
+++ Makefile9 Aug 2013 16:42:23 -
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.53 2013/05/09 18:47:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.52 2013/05/05 17:37:00 jasper Exp $
 
 COMMENT=   sendmail milter to scan messages for viruses and spam
 
 DISTNAME=  smtp-vilter-1.3.8
-REVISION=  0
+REVISION=  1
 
 CATEGORIES=mail
 
Index: patches/patch-backend_vilter-attachment_Makefile
===
RCS file: patches/patch-backend_vilter-attachment_Makefile
diff -N patches/patch-backend_vilter-attachment_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-attachment_Makefile9 Aug 2013 16:42:23 
-
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-attachment/Makefile.origSat May  4 07:07:11 2013
 backend/vilter-attachment/Makefile Fri Aug  9 12:19:15 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   --nodefaultlib
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-clamd_Makefile
===
RCS file: patches/patch-backend_vilter-clamd_Makefile
diff -N patches/patch-backend_vilter-clamd_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-clamd_Makefile 9 Aug 2013 16:42:23 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-clamd/Makefile.orig Sat May  4 07:05:12 2013
 backend/vilter-clamd/Makefile  Fri Aug  9 12:19:18 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   --nodefaultlib
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-icap_Makefile
===
RCS file: patches/patch-backend_vilter-icap_Makefile
diff -N patches/patch-backend_vilter-icap_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-icap_Makefile  9 Aug 2013 16:42:23 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-icap/Makefile.orig  Sat May  4 07:08:28 2013
 backend/vilter-icap/Makefile   Fri Aug  9 12:19:21 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   --nodefaultlib
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-regex_Makefile
===
RCS file: patches/patch-backend_vilter-regex_Makefile
diff -N patches/patch-backend_vilter-regex_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-regex_Makefile 9 Aug 2013 16:42:23 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-regex/Makefile.orig Sat May  4 07:10:56 2013
 backend/vilter-regex/Makefile  Fri Aug  9 12:19:25 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   --nodefaultlib
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}
Index: patches/patch-backend_vilter-spamd_Makefile
===
RCS file: patches/patch-backend_vilter-spamd_Makefile
diff -N patches/patch-backend_vilter-spamd_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-backend_vilter-spamd_Makefile 9 Aug 2013 16:42:23 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- backend/vilter-spamd/Makefile.orig Sat May  4 07:11:57 2013
 backend/vilter-spamd/Makefile  Fri Aug  9 12:19:29 2013
+@@ -22,7 +22,7 @@ LIBDIR=  /usr/pkg/lib/smtp-vilter
+ CFLAGS+=  -I/usr/src/gnu/usr.sbin/sendmail/include
+ .endif
+ 
+-LDADD+=   -nostdlib
++LDADD+=   --nodefaultlib
+ 
+ beforeinstall:
+   -mkdir -p ${DESTDIR}${LIBDIR}