--- Makefile.orig	2008-09-03 13:16:53.000000000 -0400
+++ Makefile	2008-09-03 13:20:31.000000000 -0400
@@ -7,6 +7,7 @@
 
 PORTNAME=	xerces-c2
 PORTVERSION=	2.7.0
+PORTREVISION=   1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_APACHE_XML}
 MASTER_SITE_SUBDIR=	xerces-c/source
@@ -84,9 +85,8 @@
 
 CONFIGURE_ARGS+=	-t ${TRANSCODER}
 
-.if !defined(WITHOUT_DEBUG)
-CONFIGURE_ARGS+=	-d
-STRIP=
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=        -d
 .endif
 
 .if defined(ARCH) && \
@@ -111,7 +111,7 @@
 			XERCESC_DEPDOM_LIB=${XERCESC_DEPDOM_LIB} \
 				XERCESC_LIB_VERSION=${XERCESC_LIB_VERSION}
 
-.if !defined(WITHOUT_SAMPLES)
+.if !(defined(NOPORTEXAMPLES) || defined(WITHOUT_SAMPLES))
 PLIST_SUB+=	NO_SAMPLES=""
 ALL_TARGET?=	all samples
 XERCES_BINS?=	CreateDOMDocument DOMCount DOMPrint EnumVal MemParse PParse \
@@ -129,7 +129,7 @@
 PLIST_SUB+=	NO_SAMPLES="@comment "
 .endif
 
-.if !defined(WITHOUT_PORTDOCS)
+.if !(defined(NOPORTDOCS) || defined(WITHOUT_PORTDOCS))
 PORTDOCS=	*
 .endif
 
@@ -149,7 +149,7 @@
 	@${CHMOD} 700 ${CONFIGURE_WRKSRC}/configure
 
 post-configure:
-.if !defined(WITHOUT_SAMPLES)
+.if !(defined(NOPORTEXAMPLES) || defined(WITHOUT_SAMPLES))
 .if defined(TRANSCODER) && (${TRANSCODER} == "icu")
 	@(cd ${WRKSRC}/samples && \
 		${SETENV} \
@@ -168,15 +168,11 @@
 .endif
 
 post-install:
-.if defined(WITHOUT_DEBUG)
-	@${STRIP_CMD} ${PREFIX}/lib/${XERCESC_LIB}
-	@${STRIP_CMD} ${PREFIX}/lib/${XERCESC_DEPDOM_LIB}
-.endif
-.if !defined(WITHOUT_PORTDOCS)
+.if  !(defined(NOPORTDOCS) || defined(WITHOUT_PORTDOCS))
 	@${MKDIR} ${DOCSDIR}
 	@${CP} -r ${WRKSRC}/doc/ ${DOCSDIR}
 .endif
-.if !defined(WITHOUT_SAMPLES)
+.if !(defined(NOPORTEXAMPLES) || defined(WITHOUT_SAMPLES))
 	@${MKDIR} ${EXAMPLESDIR}
 .for i in ${XERCES_BINS} data
 	@${CP} -r ${WRKSRC}/samples/$i ${EXAMPLESDIR}