- Change default status of Ghostscript support

- Fix pkg/DESCR to apply locale naming rule of FreeBSD
- Fix pkg/PLIST

PR:		16426
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

6 files changed, 14 insertions, 34 deletions

diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index 4801bce5905f..ba4a2bc21ea7 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -20,28 +20,18 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
 
-.if defined(WANT_GS_SUPPORT)
-RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript5
-.endif
-
 USE_IMAKE=	yes
 MAN1=		xfig.1
 
 pre-fetch:
-.if !defined(WANT_GS_SUPPORT)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "If you would like build xfig with Ghostscript support"
-	@${ECHO_MSG} "you must set the variable WANT_GS_SUPPORT"
-	@${ECHO_MSG} ""
-.else
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Building xfig with Ghostscript support"
-	@${ECHO_MSG} ""
+.if !defined(NO_GSBIT)
+	@${ECHO_MSG} "To build this port without Ghostscript support,"
+	@${ECHO_MSG} "define \"NO_GSBIT\"."
 .endif
 
 post-patch:
 	@${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Imakefile
-.if !defined(WANT_GS_SUPPORT)
+.if defined(NO_GSBIT)
 	@${PERL} -pi -e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
 .endif
 
diff --git a/graphics/xfig-devel/pkg-descr b/graphics/xfig-devel/pkg-descr
index 49fdc469f0f1..bd4330dd870c 100644
--- a/graphics/xfig-devel/pkg-descr
+++ b/graphics/xfig-devel/pkg-descr
@@ -14,8 +14,8 @@ Xfig acts as non-i18n version without -international option. If you put
 "Fig.international: true" into your resource file, -international option may 
 omitted.
 
-ja_JP.EUC is tested for input, display, and printing.
-For zh_CN.eucCN and ko_KR.eucKR, only display is confirmed.
+ja_JP.EUC and ko_KR.EUC is tested for input, display, and printing.
+For zh_CN.EUC, only display is confirmed.
 
 Read /usr/X11R6/lib/X11/xfig/xfig.html for more information.
 
diff --git a/graphics/xfig-devel/pkg-plist b/graphics/xfig-devel/pkg-plist
index 5d435b826d99..99d101e19fb2 100644
--- a/graphics/xfig-devel/pkg-plist
+++ b/graphics/xfig-devel/pkg-plist
@@ -722,4 +722,4 @@ lib/X11/xfig/xfig.html
 @dirrm lib/X11/xfig/Libraries/Computers
 @dirrm lib/X11/xfig/Libraries/Buildings
 @dirrm lib/X11/xfig/Libraries
-@dirrm lib/X11/xfig
+@unexec rmdir %D/lib/X11/xfig 2>/dev/null || true
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 4801bce5905f..ba4a2bc21ea7 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -20,28 +20,18 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
 
-.if defined(WANT_GS_SUPPORT)
-RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript5
-.endif
-
 USE_IMAKE=	yes
 MAN1=		xfig.1
 
 pre-fetch:
-.if !defined(WANT_GS_SUPPORT)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "If you would like build xfig with Ghostscript support"
-	@${ECHO_MSG} "you must set the variable WANT_GS_SUPPORT"
-	@${ECHO_MSG} ""
-.else
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Building xfig with Ghostscript support"
-	@${ECHO_MSG} ""
+.if !defined(NO_GSBIT)
+	@${ECHO_MSG} "To build this port without Ghostscript support,"
+	@${ECHO_MSG} "define \"NO_GSBIT\"."
 .endif
 
 post-patch:
 	@${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Imakefile
-.if !defined(WANT_GS_SUPPORT)
+.if defined(NO_GSBIT)
 	@${PERL} -pi -e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
 .endif
 
diff --git a/graphics/xfig/pkg-descr b/graphics/xfig/pkg-descr
index 49fdc469f0f1..bd4330dd870c 100644
--- a/graphics/xfig/pkg-descr
+++ b/graphics/xfig/pkg-descr
@@ -14,8 +14,8 @@ Xfig acts as non-i18n version without -international option. If you put
 "Fig.international: true" into your resource file, -international option may 
 omitted.
 
-ja_JP.EUC is tested for input, display, and printing.
-For zh_CN.eucCN and ko_KR.eucKR, only display is confirmed.
+ja_JP.EUC and ko_KR.EUC is tested for input, display, and printing.
+For zh_CN.EUC, only display is confirmed.
 
 Read /usr/X11R6/lib/X11/xfig/xfig.html for more information.
 
diff --git a/graphics/xfig/pkg-plist b/graphics/xfig/pkg-plist
index 5d435b826d99..99d101e19fb2 100644
--- a/graphics/xfig/pkg-plist
+++ b/graphics/xfig/pkg-plist
@@ -722,4 +722,4 @@ lib/X11/xfig/xfig.html
 @dirrm lib/X11/xfig/Libraries/Computers
 @dirrm lib/X11/xfig/Libraries/Buildings
 @dirrm lib/X11/xfig/Libraries
-@dirrm lib/X11/xfig
+@unexec rmdir %D/lib/X11/xfig 2>/dev/null || true