- Move CONFLICTS definition to slave ports itself instead of making it in

master port so that portmaster can pick this up correctly
- Remove MD5 checksum from distinfo

Reported by: Warren Block <wblock at wonkity.com> and dougb@

print/enscript-a4/Makefile

@@ -5,7 +5,11 @@
 # $FreeBSD$
 #
 
+CONFLICTS=	enscript-letter-* enscript-letterdj-*
+
 PAPERSIZE=	a4
+PS=		A4
+
 MASTERDIR=	${.CURDIR}/../enscript-letter
 
 .include "${MASTERDIR}/Makefile"

print/enscript-letter/Makefile

@@ -19,21 +19,15 @@ COMMENT=	ASCII to PostScript filter
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --with-media=${PS}
 
+CONFLICTS?=	enscript-a4-* enscript-letterdj-*
+
 INFO=		enscript
 MAN1=		diffpp.1 enscript.1 sliceprint.1 states.1
 
 PAPERSIZE?=	letter
+PS=		Letter
 
-.if ${PAPERSIZE} == a4
-PS=A4
-CONFLICTS=	enscript-letter-* enscript-letterdj-*
-.elif ${PAPERSIZE} == letter
-PS=Letter
-CONFLICTS=	enscript-a4-* enscript-letterdj-*
-.elif ${PAPERSIZE} == letterdj
-PS=Letterdj
-CONFLICTS=	enscript-a4-* enscript-letter-*
-.else
+.if (${PAPERSIZE} != a4 && ${PAPERSIZE} != letter && ${PAPERSIZE} != letterdj)
 .BEGIN:
 	@${ECHO} "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\""
 	@${ECHO} "Possible values are:  a4, letter, or letterdj"

print/enscript-letter/distinfo

@@ -1,3 +1,2 @@
-MD5 (enscript-1.6.4.tar.gz) = b5174b59e4a050fb462af5dbf28ebba3
 SHA256 (enscript-1.6.4.tar.gz) = 45299a4db47c9c08c3649d4f62b211ae79ef5143360c264a40371a728f6ad99b
 SIZE (enscript-1.6.4.tar.gz) = 1036734

print/enscript-letterdj/Makefile

@@ -5,7 +5,11 @@
 # $FreeBSD$
 #
 
+CONFLICTS=	enscript-a4-* enscript-letter-*
+
 PAPERSIZE=	letterdj
+PS=		Letterdj
+
 MASTERDIR=	${.CURDIR}/../enscript-letter
 
 .include "${MASTERDIR}/Makefile"