ports/69844: [MAINTAINER] mail/masqmail and mail/masqmail-devel: registering conflicts and fix trigraphs warning

[Andrey Slusar]

>Number:         69844
>Category:       ports
>Synopsis:       [MAINTAINER] mail/masqmail and mail/masqmail-devel: registering conflicts and fix trigraphs warning
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 31 12:40:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Andrey Slusar
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
Santinel
>Environment:
System: FreeBSD santinel.home.ua 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Thu Jul 29 19:48:26 EEST 2004 root at santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386
>Description:
	Registering conflicts masqmail<->masqmail-devel and fix trigraphs warning
	if build with gcc3.4
>How-To-Repeat:
	
>Fix:

--- masqmail.diff begins here ---
diff -ru /usr/ports/mail/masqmail/Makefile masqmail/Makefile
--- /usr/ports/mail/masqmail/Makefile	Sun May  2 23:24:06 2004
+++ masqmail/Makefile	Sat Jul 31 15:19:42 2004
@@ -14,10 +14,13 @@
 MAINTAINER=	vasallia at ukr.net
 COMMENT=	Mail server for hosts, not permanently connected to the internet
 
+CONFLICTS=	masqmail-0.2*
+
 MAN5=		masqmail.aliases.5 masqmail.conf.5 masqmail.get.5 masqmail.route.5
 MAN8=		masqmail.8
 
 GNU_CONFIGURE=	yes
+CFLAGS+=	-Wno-trigraphs
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man --with-user=mailnull --with-group=mail \
 		--with-conffile=${PREFIX}/etc/masqmail --with-logdir=/var/log/masqmail
 
--- masqmail.diff ends here ---

--- masqmail-devel.diff begins here ---
diff -ru /usr/ports/mail/masqmail-devel/Makefile masqmail-devel/Makefile
--- /usr/ports/mail/masqmail-devel/Makefile	Thu Jul 29 22:10:07 2004
+++ masqmail-devel/Makefile	Sat Jul 31 15:19:21 2004
@@ -13,10 +13,13 @@
 MAINTAINER=	vasallia at ukr.net
 COMMENT=	Mail server for hosts, not permanently connected to the internet
 
+CONFLICTS=	masqmail-0.1*
+
 MAN5=		masqmail.aliases.5 masqmail.conf.5 masqmail.get.5 masqmail.route.5
 MAN8=		masqmail.8 mservdetect.8
 
 GNU_CONFIGURE=	yes
+CFLAGS+=	-Wno-trigraphs
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man --with-user=mailnull --with-group=mail \
 		--with-confdir=${PREFIX}/etc/masqmail --with-logdir=/var/log/masqmail
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
--- masqmail-devel.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: