Do not arbitrary rename packages

21 files changed, 0 insertions, 23 deletions

diff --git a/audio/dumb/Makefile b/audio/dumb/Makefile
index eb18c3b9f3c1..1ef1c0804260 100644
--- a/audio/dumb/Makefile
+++ b/audio/dumb/Makefile
@@ -23,7 +23,6 @@ LIB_DEPENDS+=	alleg:${PORTSDIR}/devel/allegro
 PLIST_SUB+=	ALLEGRO=""
 MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`"
 MAKE_ARGS+=	LINK_ALLEGRO="-lm -L${LOCALBASE}/lib -lalleg"
-PKGNAMESUFFIX=	-allegro
 CONFLICTS=	dumb-[0-9]*
 .else
 PLIST_SUB+=	ALLEGRO="@comment "
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 95a8a5568a9b..38f2fc1f5372 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -26,7 +26,6 @@ INFO=		mikmod
 .if ${HAVE_GNOME:Mesound}!=""
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--enable-esd
-PKGNAMESUFFIX=	-esound
 .else
 CONFIGURE_ARGS+=	--disable-esd
 .endif
diff --git a/audio/mp3info/Makefile b/audio/mp3info/Makefile
index 870a6ddd15e6..0865d4ebffef 100644
--- a/audio/mp3info/Makefile
+++ b/audio/mp3info/Makefile
@@ -32,7 +32,6 @@ ALL_TARGET=	doc mp3info
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK2}
-PKGNAMESUFFIX=	-gtk
 USE_GNOME+=	gtk20
 ALL_TARGET+=	gmp3info
 MAKE_ARGS=	install-gmp3info
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 49408adc86f2..93660d970404 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -38,7 +38,6 @@ PLIST_FILES+=	share/locale/${lang}/LC_MESSAGES/muse.mo
 .if ${PORT_OPTIONS:MX11}
 USE_GNOME+=	gtk20
 .else
-PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=--without-x --with-rubik
 .endif
 
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index 36931c8cef7c..8a5ea82fca3b 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -27,7 +27,6 @@ USE_LDCONFIG=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MRCC}
-PKGNAMESUFFIX=	-rcc
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-rcc
 LIB_DEPENDS+=	rcc:${PORTSDIR}/devel/librcc
 PLIST_SUB+=	RCC=""
diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile
index df7e85a23cce..7bc0a648b312 100644
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -23,7 +23,6 @@ NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgtk12}!=""
-PKGNAMESUFFIX=	-gtk
 USE_GNOME+=	gtk12
 PROGRAMS=	xmixer xgmixer
 MLINKS+=	xmixer.1 xgmixer.1
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index fcc46e74b034..2ad007979888 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -31,8 +31,6 @@ NO_STAGE=	yes
 .if ${PORT_OPTIONS:MX11}
 USES+=		motif
 CONFIGURE_ARGS+=	--with-motif --with-x
-.else
-PKGNAMESUFFIX=	-nox11
 .endif
 
 post-patch:
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 01343e30cee3..857727768c50 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -112,7 +112,6 @@ DISPLAY_MSG=		${DO_NADA}
 .if ${PORT_OPTIONS:MX11}
 USE_XORG=		x11 xrender xrandr xextproto
 .else
-PKGNAMESUFFIX=		-nox11
 CONFIGURE_ARGS+=	--disable-video-x11
 .endif
 
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index 6a06f5ae7ad1..1120e0185853 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -25,7 +25,6 @@ NO_STAGE=	yes
 
 # Support building on systems with or without X11 installed.
 .if defined(WITHOUT_X11)
-PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=	--without-x
 .else
 USE_XORG=	xpm
diff --git a/editors/hte/Makefile b/editors/hte/Makefile
index 774106234ca6..b9cba6319a7d 100644
--- a/editors/hte/Makefile
+++ b/editors/hte/Makefile
@@ -40,7 +40,6 @@ USE_XORG=	x11
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .else
-PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=--disable-x11-textmode
 .endif
 
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 49109dde1d46..39b586bede94 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -59,7 +59,6 @@ CONFIGURE_ARGS+=	--disable-jma
 CONFIGURE_ARGS+=	--with-x
 .else
 CONFIGURE_ARGS+=	--without-x
-PKGNAMESUFFIX=	-nox11
 .endif
 
 .if ${PORT_OPTIONS:MOPENGL}
diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 8bbeab6f7146..68993f649e2f 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -41,7 +41,6 @@ USE_GNOME+=	gtk20
 CONFIGURE_ENV+=	_GTHREAD_LIBS="-lgthread-2.0"
 .else
 CONFIGURE_ARGS+=--disable-gtkport
-PKGNAMESUFFIX=	-nox11
 USE_GNOME+=	glib20
 PLIST_SUB+=	NOX11:="@comment "
 .endif
@@ -60,7 +59,6 @@ PLIST_SUB+=	NLS="@comment "
 
 .if ${HAVE_GNOME:Mgnomelibs}!="" && ! ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gnomeprefix gnomelibs
-PKGNAMESUFFIX+=	-gnome
 PLIST_SUB+=	MYGNOME=""
 MAKE_ENV=	HAVE_GNOME=1
 .else
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index f89593f98316..7c7075cc5610 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -37,7 +37,6 @@ PLIST_SUB+=	NLS="@comment "
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgtk20}!=""
-PKGNAMESUFFIX=	-gtk
 USE_GNOME+=	gtk20
 .else
 CONFIGURE_ARGS+=	--disable-gtk
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 6d5cc1d7ef44..535d0c7c6729 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -48,7 +48,6 @@ CONFIGURE_ARGS+=--enable-client=gtk
 CONFLICTS=	freeciv-nox11-[0-9]*
 PLIST_SUB+=	X11="" GTK=""
 .else
-PKGNAMESUFFIX?=	-nox11
 CONFIGURE_ARGS+=--enable-client=no
 CONFLICTS=	freeciv-[0-9]*
 PLIST_SUB+=	X11="@comment " GTK="@comment "
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index deaac7c3dd53..f62bac8754df 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -76,7 +76,6 @@ CONFIGURE_ARGS+=	--with-windows-font-dir="${WINDOWS_FONT_DIR}"
 .endif
 
 .if ${PORT_OPTIONS:MX11} == ""
-PKGNAMESUFFIX+=	-nox11
 CONFIGURE_ARGS+=--without-x
 LIB_DEPENDS+=	wmflite:${PORTSDIR}/graphics/libwmf-nox11
 .else
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index 5e0f31ea7600..7ccd64d57db9 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -116,7 +116,6 @@ CONFIGURE_ARGS+=	--with-windows-font-dir="${WINDOWS_FONT_DIR}"
 .endif
 
 .if ${PORT_OPTIONS:MX11} == ""
-PKGNAMESUFFIX+=	-nox11
 CONFIGURE_ARGS+=--without-x
 LIB_DEPENDS+=	wmflite:${PORTSDIR}/graphics/libwmf-nox11
 .else
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index eb47b09a0966..0d80b279081d 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -117,7 +117,6 @@ CONFIGURE_ARGS+=	--with-windows-font-dir="${WINDOWS_FONT_DIR}"
 .endif
 
 .if ${PORT_OPTIONS:MX11} == ""
-PKGNAMESUFFIX+=	-nox11
 CONFIGURE_ARGS+=--without-x
 LIB_DEPENDS+=	wmflite:${PORTSDIR}/graphics/libwmf-nox11
 .else
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 3b30d5c7dd49..a77dfe3d9cf5 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -350,7 +350,6 @@ USE_GHOSTSCRIPT=	yes
 .endif
 
 .if defined(WITHOUT_X11)
-PKGNAMESUFFIX+=		-nox11
 CONFIGURE_ARGS+=	--without-x
 CONFLICTS+=		ImageMagick-6*
 PLIST_SUB+=		X11='@comment '
diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index 435bc1082b24..630bd4ffab47 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -26,7 +26,6 @@ NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MX11}
-PKGNAMESUFFIX=	-nox11
 CONFIGURE_ARGS+=	--without-x --disable-gifview
 .else
 USE_XORG=	x11
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 9750b9c98a04..f9ac96ab591a 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -42,7 +42,6 @@ CONFIGURE_ARGS+=	--disable-amd64
 
 .if ! ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS+=	--without-x
-PKGNAMESUFFIX+=	-nox11
 PLIST_SUB=	X11="@comment "
 .else
 USE_XORG=	x11 sm xext
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 8a5e54c05cdb..2b06b5e7f3ec 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -65,7 +65,6 @@ USES+=			motif
 MAN1+=			xpdf.1
 PLIST_SUB+=		X11=""
 .else
-PKGNAMESUFFIX+=		-nox11
 CONFIGURE_ARGS+=	--without-x
 PLIST_SUB+=		X11="@comment "
 .endif