Index: head/graphics/netpbm/Makefile
===================================================================
--- head/graphics/netpbm/Makefile	(revision 239369)
+++ head/graphics/netpbm/Makefile	(revision 239370)
@@ -1,84 +1,80 @@
 # New ports collection makefile for:	netpbm
 # Date created:		?
 # Whom:			jmz (original)
 #
 # $FreeBSD$
 #
 
 PORTNAME=	netpbm
-.if defined(WITH_NETPBM_DEVEL)
-PORTVERSION=	${DEVEL_PORTVERSION}
-.else
-PORTVERSION=	10.26.63
-.endif
+PORTVERSION=	${NETPBM_PORTVERSION}
 PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-.if defined(WITH_NETPBM_DEVEL)
-PKGNAMESUFFIX=	-devel${PKGNAMESUFFIX2}
-.endif
+PKGNAMESUFFIX=	${NETPBM_SUFFIX}${PKGNAMESUFFIX2}
 EXTRACT_SUFX=	.tgz
 .if make(makesum) || defined(FETCH_ALL)
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	${PORTNAME}-${STABLE_PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-${DEVEL_PORTVERSION}${EXTRACT_SUFX}
 .endif
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A toolkit for conversion of images between different formats
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.10:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		jbig.1:${PORTSDIR}/graphics/jbigkit
 #		jasper.4:${PORTSDIR}/graphics/jasper
-.if defined(WITH_NETPBM_DEVEL)
-LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
-.endif
 
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	mgetty-1.*
-.if !defined(WITH_NETPBM_DEVEL)
-PORTSCOUT=	limit:^10\.26\.
-.endif
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	LN="${LN}" RANLIB="${RANLIB}"
 MAKEFILE=	GNUmakefile
 INSTALL_TARGET=	install.bin install.lib install.data install-dev
 USE_LDCONFIG=	yes
 
 MAN1=		netpbm.1
 
+STABLE_PORTVERSION=	10.26.63
 DEVEL_PORTVERSION=	10.31
 .if defined(WITH_NETPBM_DEVEL)
+NETPBM_PORTVERSION=	${DEVEL_PORTVERSION}
+NETPBM_SUFFIX=	${PKGNAMESUFFIX2}
+CONFLICTS+=	netpbm-10.26.*
 PATCHDIR?=	${MASTERDIR}/../netpbm-devel/files
 CFLAGS+=	-Iutil
 PLIST_SUB+=	DEVEL=""
 .else
+NETPBM_PORTVERSION=	${STABLE_PORTVERSION}
+CONFLICTS+=	netpbm-devel-10.26.*
+PORTSCOUT=	limit:^10\.26\.
+LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 PLIST_SUB+=	DEVEL="@comment "
 .endif
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		 -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		 ${WRKSRC}/pm_config.in.h
 	@${REINPLACE_CMD} -e 's|<shhopt.h>|<pm_shhopt.h>|g' ${WRKSRC}/lib/pm.h
 	@${REINPLACE_CMD} -e 's| jpeg2000||g' \
 		${WRKSRC}/converter/other/Makefile
 	@${CP} ${FILESDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config
 	@${LN} -sf ${WRKSRC}/lib/util/shhopt.h ${WRKSRC}/lib/util/pm_shhopt.h
 	@${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h
 
 post-install:
 	@${ECHO_MSG} "===>  Installing man pages..."
 	@${REINPLACE_CMD} -e 's|doc/USERDOC|${DOCSDIR}/USERDOC|g' \
 		${WRKSRC}/doc/netpbm.1
 	${INSTALL_MAN} ${WRKSRC}/doc/netpbm.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/USERDOC ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/graphics/netpbm/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.173
\ No newline at end of property
+1.174
\ No newline at end of property