- Use OPTIONS_MULTI and OPTIONS_GROUP.

- Add dependency on libpaper unconditionally to 8.x and 9.x.
- Fix CONFLICTS_INSTALL.
- Remove ABI version numbers from LIB_DEPENDS.

2 files changed, 13 insertions, 7 deletions

diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 0909dee7c21b..a0049e844961 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -25,9 +25,13 @@ LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
-CONFLICTS_INSTALL=	gambc-[0-9]* ghostscript[89]-[0-9]* \
-			ghostscript[89]-nox11-[0-9]* \
-			ghostscript9-agpl-*-[0-9]*
+CONFLICTS_INSTALL= \
+		gambc-[0-9]* \
+		ghostscript[89]-[0-9]* \
+		ghostscript[89]-nox11-[0-9]* \
+		ghostscript9-agpl-[0-9]* \
+		ghostscript9-agpl-nox11-[0-9]*
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
@@ -50,8 +54,8 @@ XCFLAGS=	${PTHREAD_CFLAGS}
 XLDFLAGS=	-L${LOCALBASE}/lib -L${WRKSRC}/gimp-print ${PTHREAD_LIBS}
 PLIST_SUB=	GS_VERSION="${PORTVERSION}"
 
-OPTIONS_DEFINE=	DOCS A4SIZE X11
-OPTIONS_DEFAULT=     A4SIZE X11
+OPTIONS_DEFINE=	X11 DOCS A4SIZE
+OPTIONS_DEFAULT=X11 DOCS A4SIZE
 NO_OPTIONS_SORT=yes
 A4SIZE_DESC=	Set A4 (not Letter) as the default paper size
 
diff --git a/print/ghostscript7/Makefile.drivers b/print/ghostscript7/Makefile.drivers
index 3dc833a1daf8..a9703ad24180 100644
--- a/print/ghostscript7/Makefile.drivers
+++ b/print/ghostscript7/Makefile.drivers
@@ -12,14 +12,16 @@ OPTIONS_X11= \
 	GS_x11mono \
 	GS_x11rg16x \
 	GS_x11rg32x
+OPTIONS_MULTI=	X11
+OPTIONS_MULTI_X11=	${OPTIONS_X11}
 
 OPTIONS_SVGALIB= \
 	GS_lvga256 \
 	GS_vgalib
+OPTIONS_GROUP=	SVGALIB
+OPTIONS_GROUP_SVGALIB=	${OPTIONS_SVGALIB}
 
 OPTIONS_DEFINE+= \
-	${OPTIONS_X11} \
-	${OPTIONS_SVGALIB} \
 	GS_md2k \
 	GS_md5k \
 	GS_md50Mono \