- Tarball rerolled with changed Makefile

Reported by:	krismail

2 files changed, 54 insertions, 64 deletions

diff --git a/mail/smc-milter/distinfo b/mail/smc-milter/distinfo
index 4ba79b4b1bf4..2e34092b433e 100644
--- a/mail/smc-milter/distinfo
+++ b/mail/smc-milter/distinfo
@@ -1,2 +1,2 @@
-MD5 (smc-milter-1.5.tar.gz) = d772a8f0d2d6cfccd50ea8668a4881d0
-SIZE (smc-milter-1.5.tar.gz) = 96274
+MD5 (smc-milter-1.5.tar.gz) = ff48e7516fdaf27e30c0c2a1043fb31a
+SIZE (smc-milter-1.5.tar.gz) = 96270
diff --git a/mail/smc-milter/files/patch-Makefile b/mail/smc-milter/files/patch-Makefile
index c7646a450afd..b5fc3baa587f 100644
--- a/mail/smc-milter/files/patch-Makefile
+++ b/mail/smc-milter/files/patch-Makefile
@@ -1,62 +1,52 @@
-*** Makefile.orig	Mon Mar 14 08:27:09 2005
---- Makefile	Sun Apr  3 17:28:21 2005
-***************
-*** 10,20 ****
-  # CFLAGS	= -g -O2 -Wall -D_GNU_SOURCE -D_REENTRANT -I/usr/lib/bind/include
-  # LIBS		= /usr/lib/bind/lib/libbind_r.a -lmilter -pthread -lssl -ldb
-  # if glibc >= 2.2
-! CFLAGS		= -g -O2 -Wall -D_GNU_SOURCE -D_REENTRANT 
-! LIBS		= -lmilter -pthread -lssl -ldb -lresolv
-  MILTER		= smc-milter
-! INSDIR		= /opt/SMC
-! CC		= gcc
-  
-  all: milter
-  
---- 10,24 ----
-  # CFLAGS	= -g -O2 -Wall -D_GNU_SOURCE -D_REENTRANT -I/usr/lib/bind/include
-  # LIBS		= /usr/lib/bind/lib/libbind_r.a -lmilter -pthread -lssl -ldb
-  # if glibc >= 2.2
-! CFLAGS		+= -g -O2 -Wall -D_GNU_SOURCE -D_REENTRANT \
-! -I/usr/local/include/bind -I/usr/local/include/db42
-! LIBS		= -lmilter -pthread -lssl -L/usr/local/lib/db42 -ldb \
-! -L/usr/local/lib -lbind_r -lcrypto
-  MILTER		= smc-milter
-! BASEINSDIR	= /usr/local
-! CONFINSDIR	= $(BASEINSDIR)/etc/smc
-! BININSDIR	= $(BASEINSDIR)/bin
-! CC		?= gcc
-  
-  all: milter
-  
-***************
-*** 29,42 ****
-  
-  
-  install:
-! 	[ -d "$(INSDIR)" ] || mkdir $(INSDIR)
-  	if [ -n "$(MILTER)" ]; then \
-  		strip $(MILTER) ; \
-! 		install -m 755 $(MILTER) $(INSDIR) ; \
-  	fi
-! 	install -m 644 $(MILTER).conf $(INSDIR)
-! 	install -m 644 $(MILTER).policy $(INSDIR)
-! 	install -m 644 $(MILTER).users $(INSDIR)
-  
-  remove:
-  	rm -f $(INSDIR)/$(MILTER)*
---- 33,46 ----
-  
-  
-  install:
-! 	[ -d "$(CONFINSDIR)" ] || mkdir $(CONFINSDIR)
-  	if [ -n "$(MILTER)" ]; then \
-  		strip $(MILTER) ; \
-! 		install -m 755 $(MILTER) $(BININSDIR) ; \
-  	fi
-! 	install -m 644 $(MILTER).conf $(CONFINSDIR)
-! 	install -m 644 $(MILTER).policy $(CONFINSDIR)
-! 	install -m 644 $(MILTER).users $(CONFINSDIR)
-  
-  remove:
-  	rm -f $(INSDIR)/$(MILTER)*
+--- Makefile.orig	Sun Apr 10 11:29:10 2005
++++ Makefile	Tue Apr 19 10:23:16 2005
+@@ -5,22 +5,19 @@
+ SRCS		= utils.c relay.c smtp.c regex.c 
+ MILTER_OBJS	= utils.o relay.o smtp.o regex.o
+ MILTER		= smc-milter
+-INSDIR		= /opt/SMC
+-CC		= gcc
++PREFIX		?= /usr/local
++CONFINSDIR	= ${PREFIX}/etc/smc
++BININSDIR	= ${PREFIX}/bin
++CC		?= gcc
+ 
+ ifdef DEBUG
+     CFLAGS	= -g -ggdb2
+ else
+-    CFLAGS	= -O2
++    CFLAGS	?= -O2
+ endif
+ 
+-ifeq ($(LIBC_VERSION),2.1)
+-    CFLAGS	+= -Wall -D_GNU_SOURCE -D_REENTRANT -I/usr/lib/bind/include
+-    LIBS	= /usr/lib/bind/lib/libbind_r.a -lmilter -pthread -lssl -ldb
+-else
+-    CFLAGS	+= -Wall -D_GNU_SOURCE -D_REENTRANT 
+-    LIBS	= -lmilter -pthread -lssl -ldb -lresolv
+-endif
++    CFLAGS	+= -Wall -D_GNU_SOURCE -D_REENTRANT -I${LOCALBASE}/include/bind -I${LOCALBASE}/include/db42
++    LIBS	= -lmilter -pthread -lssl -ldb -lbind_r -lcrypto -L${LOCALBASE}/lib -L${LOCALBASE}/lib/db42
+ 
+ all: milter
+ 
+@@ -31,14 +28,14 @@
+ 	$(CC) $(CFLAGS) -c $<
+ 
+ install:
+-	[ -d "$(INSDIR)" ] || mkdir $(INSDIR)
++	[ -d "$(CONFINSDIR)" ] || mkdir $(CONFINSDIR)
+ 	if [ -n "$(MILTER)" ]; then \
+ 		strip $(MILTER) ; \
+-		install -m 755 $(MILTER) $(INSDIR) ; \
++		install -m 755 $(MILTER) $(BININSDIR) ; \
+ 	fi
+-	install -m 644 $(MILTER).conf $(INSDIR)
+-	install -m 644 $(MILTER).policy $(INSDIR)
+-	install -m 644 $(MILTER).users $(INSDIR)
++	install -m 644 $(MILTER).conf $(CONFINSDIR)
++	install -m 644 $(MILTER).policy $(CONFINSDIR)
++	install -m 644 $(MILTER).users $(CONFINSDIR)
+ 
+ remove:
+ 	rm -f $(INSDIR)/$(MILTER)*