Retire obsolete PARALLEL_PACKAGE_BUILD in favour of PACKAGE_BUILDING.

11 files changed, 13 insertions, 14 deletions

diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 213638df9bd5..0557d068d7fc 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -33,7 +33,7 @@ INSTALLS_ICONS=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 	       	LDFLAGS="-L${LOCALBASE}/lib"
 
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.if defined(PACKAGE_BUILDING)
 .undef WITHOUT_GNOME
 .undef WITHOUT_ALL
 WITH_GNOME=	yes
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index f445f7d1d637..915904828df7 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -68,7 +68,7 @@ libtests:
 
 test: libtests prtests
 
-#.if defined(PARALLEL_PACKAGE_BUILD)
+#.if defined(PACKAGE_BUILDING)
 #post-build: test
 #.else
 post-build:
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index f32956fe7e38..d759183b5197 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -46,8 +46,7 @@ OPTIONS=	DVI		"Enable DVI viewer support"		off \
 
 .include <bsd.port.pre.mk>
 
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) \
-		|| exists(${LOCALBASE}/lib/libdbus-glib-1.so)
+.if defined(PACKAGE_BUILDING) || exists(${LOCALBASE}/lib/libdbus-glib-1.so)
 WITH_DBUS=	yes
 .endif
 
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index ffbe31368899..197352bad809 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -56,7 +56,7 @@ OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 USE_LDCONFIG=	${PREFIX}/lib/evolution/${EVO_VERSION}
 .include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
 
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.if defined(PACKAGE_BUILDING)
 WITH_DBUS=	yes
 .endif
 
diff --git a/ports-mgmt/vulnerability-test-port/Makefile b/ports-mgmt/vulnerability-test-port/Makefile
index 5457da85008e..12697be3e295 100644
--- a/ports-mgmt/vulnerability-test-port/Makefile
+++ b/ports-mgmt/vulnerability-test-port/Makefile
@@ -15,7 +15,7 @@ COMMENT=		Standard vulnerability test for port auditing systems
 
 NO_BUILD=		yes
 
-.if defined(PARALLEL_PACKAGE_BUILD)
+.if defined(PACKAGE_BUILDING)
 IGNORE=			is disabled on package building systems
 INSTALLATION_DATE=	2004.01.25
 .else
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index c52529193b27..636231b55fb9 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -44,7 +44,7 @@ GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 		desktop_gnome_font_rendering.schemas \
 		fontilus.schemas themus.schemas
 
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.if defined(PACKAGE_BUILDING)
 .undef WITHOUT_GNOME
 WITH_GNOME=	yes
 .endif
diff --git a/www/mnogosearch31/Makefile b/www/mnogosearch31/Makefile
index 1c7ca62fb2d3..69eae67940c2 100644
--- a/www/mnogosearch31/Makefile
+++ b/www/mnogosearch31/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+=--enable-phrase \
 		--localstatedir=/var/mnogosearch
 CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}"
 
-.if defined(PARALLEL_PACKAGE_BUILD)
+.if defined(PACKAGE_BUILDING)
 # OPTIONS not counted, workaround
 WITH_MNOGO_BUILTIN=true
 .endif
diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile
index 4762820c2a10..f08af281be74 100644
--- a/x11-toolkits/rep-gtk/Makefile
+++ b/x11-toolkits/rep-gtk/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.if defined(PACKAGE_BUILDING)
 .undef WITHOUT_GNOME
 .undef WITHOUT_ALL
 WITH_GNOME=	yes
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index bb8170448701..ad6f6de021a0 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -46,7 +46,7 @@ GCONF_SCHEMAS=	clock.schemas fish.schemas \
 
 OPTIONS=	EVOLUTION "use the Evolution calendar if installed" on
 
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.if defined(PACKAGE_BUILDING)
 .undef WITHOUT_GNOME
 WITH_GNOME=	yes
 .endif
diff --git a/x11/kde3/Makefile.kde b/x11/kde3/Makefile.kde
index 701b2ec30735..7670b4ed3491 100644
--- a/x11/kde3/Makefile.kde
+++ b/x11/kde3/Makefile.kde
@@ -45,12 +45,12 @@ CONFIGURE_ARGS+=--enable-final
 .endif
 
 .if !defined(_NO_KDE_NDEBUG)
-.if defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG)
+.if defined(PACKAGE_BUILDING) || !defined(WANT_KDE_DEBUG)
 CONFIGURE_ARGS+=--disable-debug
 .else
 CONFIGURE_ARGS+=--enable-debug=full
 STRIP=''
-.endif # defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG)
+.endif # defined(PACKAGE_BUILDING) || !defined(WANT_KDE_DEBUG)
 .endif # !defined(_NO_KDE_NDEBUG)
 
 .if !defined(_NO_KDE_XINERAMA)
diff --git a/x11/kde4/Makefile.kde b/x11/kde4/Makefile.kde
index 701b2ec30735..7670b4ed3491 100644
--- a/x11/kde4/Makefile.kde
+++ b/x11/kde4/Makefile.kde
@@ -45,12 +45,12 @@ CONFIGURE_ARGS+=--enable-final
 .endif
 
 .if !defined(_NO_KDE_NDEBUG)
-.if defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG)
+.if defined(PACKAGE_BUILDING) || !defined(WANT_KDE_DEBUG)
 CONFIGURE_ARGS+=--disable-debug
 .else
 CONFIGURE_ARGS+=--enable-debug=full
 STRIP=''
-.endif # defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG)
+.endif # defined(PACKAGE_BUILDING) || !defined(WANT_KDE_DEBUG)
 .endif # !defined(_NO_KDE_NDEBUG)
 
 .if !defined(_NO_KDE_XINERAMA)