Date: 12 Sep 2002 14:12:39 -0000 From: Sergei Kolobov <sergei@kolobov.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dlowe@saturn5.com Subject: ports/42693: <[synopsis of the problem (one line)]> Message-ID: <20020912141239.65201.qmail@outpost.globcon.net>
next in thread | raw e-mail | index | archive | help
>Number: 42693
>Category: ports
>Synopsis: <[synopsis of the problem (one line)]>
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Sep 12 07:20:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Sergei Kolobov
>Release: FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD outpost.globcon.net 4.6-STABLE FreeBSD 4.6-STABLE #0: Thu Aug 1 02:44:26 MSD 2002 sgk@outpost.globcon.net:/data/FreeBSD/obj/data/FreeBSD/src/sys/OUTPOST i386
>Description:
- Unbreak port: do not redefine malloc/realloc/mktemp
While I'm here:
- Install PostScript documentation, too
- Respect NOPORTDOCS
- Use INSTALL_DATA instead of INSTALL_MAN when installing docs
- Use DOCSDIR shortcut
- Make installation a little bit more vebose
(Maintainer cc'd).
>How-To-Repeat:
>Fix:
--- bulk_mailer.patch begins here ---
diff -ruN /usr/ports/mail/bulk_mailer/Makefile ./Makefile
--- /usr/ports/mail/bulk_mailer/Makefile Wed Feb 14 23:19:39 2001
+++ ./Makefile Thu Sep 12 17:46:42 2002
@@ -20,10 +20,12 @@
MAN1= bulk_mailer.1
do-install:
- @ ${INSTALL_PROGRAM} ${WRKSRC}/bulk_mailer ${PREFIX}/bin/bulk_mailer
- @ ${MKDIR} ${PREFIX}/share/doc/bulk_mailer
- @ ${INSTALL_MAN} ${WRKSRC}/bulk_mailer.README \
- ${PREFIX}/share/doc/bulk_mailer/README
- @ ${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${PREFIX}/man/man1/bulk_mailer.1
+ ${INSTALL_PROGRAM} ${WRKSRC}/bulk_mailer ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/bulk_mailer.README ${DOCSDIR}/README
+ ${INSTALL_DATA} ${WRKSRC}/bulk_mailer.ps ${DOCSDIR}
+.endif
.include <bsd.port.mk>
diff -ruN /usr/ports/mail/bulk_mailer/files/patch-ab ./files/patch-ab
--- /usr/ports/mail/bulk_mailer/files/patch-ab Thu Jun 8 14:00:45 2000
+++ ./files/patch-ab Thu Sep 12 17:40:11 2002
@@ -1,5 +1,5 @@
---- bulk_mailer.c.orig Wed May 24 22:34:33 2000
-+++ bulk_mailer.c Thu Jun 8 12:35:46 2000
+--- bulk_mailer.c.orig Wed May 24 23:34:33 2000
++++ bulk_mailer.c Thu Sep 12 17:32:58 2002
@@ -95,11 +95,16 @@
#include <sysexits.h>
#include <errno.h>
@@ -17,7 +17,19 @@
#ifndef PIPECOMMAND
#define PIPECOMMAND "/usr/lib/sendmail -bs %s"
#endif
-@@ -296,6 +301,7 @@
+@@ -122,9 +127,11 @@
+ char *strchr();
+ char *strrchr();
+ #endif
++#ifndef __FreeBSD__
+ char *malloc ();
+ char *realloc ();
+ char *mktemp ();
++#endif
+
+ /*
+ * (default) max different domains per envelope.
+@@ -296,6 +303,7 @@
* memory, appending a NUL to the copy.
*/
@@ -25,7 +37,7 @@
static char *
strndup (str, len)
char *str;
-@@ -307,6 +313,7 @@
+@@ -307,6 +315,7 @@
result[len] = '\0';
return result;
}
@@ -33,7 +45,7 @@
/*
* sort by case-folded reversed domain
-@@ -337,15 +344,15 @@
+@@ -337,15 +346,15 @@
{
char *at;
char *ptr;
@@ -52,7 +64,7 @@
num_addr_slots += 1000;
if (address_list == NULL)
-@@ -571,12 +578,12 @@
+@@ -571,12 +580,12 @@
open_envelope ()
{
FILE *fp;
@@ -67,7 +79,7 @@
if ((fp = popen (command_buf, "w")) == NULL) {
fprintf (stderr, "can't open pipe to sendmail: %s\n",
-@@ -927,7 +934,7 @@
+@@ -927,7 +936,7 @@
{
struct tm gmt;
struct tm *lt;
@@ -76,7 +88,7 @@
int gmtoff;
char sign;
static char *months[] = {
-@@ -960,7 +967,7 @@
+@@ -960,7 +969,7 @@
sign = '-';
gmtoff = -gmtoff;
}
@@ -85,7 +97,7 @@
wdays[lt->tm_wday], lt->tm_mday, months[lt->tm_mon], lt->tm_year + 1900,
lt->tm_hour, lt->tm_min, lt->tm_sec,
sign,
-@@ -985,7 +992,7 @@
+@@ -985,7 +994,7 @@
copy_message (out, in)
FILE *out, *in;
{
@@ -94,7 +106,7 @@
char linebuf[32*1024];
int has_valid_approved_hdr = 0;
int has_resent_to_hdr = 0;
-@@ -1218,14 +1225,14 @@
+@@ -1218,14 +1227,14 @@
*/
lines = 0;
while (fgets (linebuf, sizeof (linebuf), in) != NULL) {
@@ -111,7 +123,7 @@
saw_command = 1;
++lines;
fputs (linebuf, out);
-@@ -1326,13 +1333,14 @@
+@@ -1326,13 +1335,14 @@
int argc;
char *argv[];
{
@@ -129,7 +141,7 @@
while (argc > 1 && (*argv[1] == '-' || *argv[1] == '+')) {
if (strcmp (argv[1], "-comment") == 0 && argc > 2) {
-@@ -1513,8 +1521,9 @@
+@@ -1513,8 +1523,9 @@
exit (EX_OSFILE);
}
@@ -141,7 +153,7 @@
switch (copy_message (tmp, stdin)) {
case HAS_EMBEDDED_COMMAND:
-@@ -1592,4 +1601,5 @@
+@@ -1592,4 +1603,5 @@
exit (EX_OK);
}
diff -ruN /usr/ports/mail/bulk_mailer/pkg-plist ./pkg-plist
--- /usr/ports/mail/bulk_mailer/pkg-plist Thu Jun 8 14:00:45 2000
+++ ./pkg-plist Thu Sep 12 17:47:28 2002
@@ -1,3 +1,4 @@
bin/bulk_mailer
-share/doc/bulk_mailer/README
-@dirrm share/doc/bulk_mailer
+%%PORTDOCS%%share/doc/bulk_mailer/README
+%%PORTDOCS%%share/doc/bulk_mailer/bulk_mailer.ps
+%%PORTDOCS%%@dirrm share/doc/bulk_mailer
--- bulk_mailer.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020912141239.65201.qmail>