The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for

FreeBSD.  The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ .  On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media.  Work
is also underway to tie webkit more closely into GNOME.  As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.

This release would not have been possible without the contributions and
testing efforts of the following people:

Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon

3 files changed, 12 insertions, 28 deletions

diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 6ffb98dbf0bc..6314f9811acc 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -35,7 +35,8 @@ USE_GMAKE=	yes
 WANT_GNOME=	yes
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
-		EXTRALIBS="${EXTRALIBS}"
+		EXTRALIBS="${EXTRALIBS}" \
+		SOC_LOADER="dxmainc.c"
 PLIST_SUB=	GS_VERSION="${GS_VERSION}" \
 		CIDFONTDIR="${CIDFONTDIR}"
 
@@ -44,7 +45,6 @@ OPTIONS=	A4SIZE	"Set A4 (not Letter) as a default paper size"	off \
 		FT_BRIDGE	"FreeType bridge"	off \
 		ICONV	"libiconv support (required by opvp/oprp drivers)" on \
 		JPNFONTS	"Japanese font support"	on \
-		SHLIB	"With shared libraries"	off \
 		SVGALIB	"svgalib support"	off
 .if defined(WITHOUT_X11)
 OPTIONS+=	X11	"X11 support"	off
@@ -107,22 +107,10 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libfreetype.a:${PORTSDIR}/print/freetype2
 MAKE_ENV+=	FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".a"
 .endif
 
-.if defined(WITH_SHLIB)
-.if defined(WITHOUT_X11)
-MAKE_ENV+=	SOC_LOADER="dxmainc.c"
-.else
-USE_GNOME+=	gtk20
-MAKE_ENV+=	SOC_LOADER="dxmain.c" \
-		SOC_CFLAGS="`pkg-config --cflags gtk+-2.0`" \
-		SOC_LIBS="`pkg-config --libs gtk+-2.0`"
-.endif
 ALL_TARGET=	so
 INSTALL_TARGET=	soinstall
 USE_LDCONFIG=	yes
-PLIST_SUB+=	SHLIB="" SHLIB_VER="${GS_VERSION:R}"
-.else
-PLIST_SUB+=	SHLIB="@comment "
-.endif
+PLIST_SUB+=	SHLIB_VER="${GS_VERSION:R}"
 
 GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
 IJS_SRCS=	ijs-0.35${EXTRACT_SUFX}
@@ -240,12 +228,8 @@ post-install:
 	${ECHO_MSG} ">>> in post-install ..."
 	${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont
 	${ECHO_MSG} ">>>   stripping gs ..."
-.if defined(WITH_SHLIB)
 	${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
 	${LN} -sf gsc ${PREFIX}/bin/gs
-.else
-	${STRIP_CMD} ${PREFIX}/bin/gs
-.endif
 # for PCL3 driver
 	${ECHO_MSG} ">>>   installing PCL3 utility in bindir ..."
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin
diff --git a/print/ghostscript-gpl/Makefile.inc b/print/ghostscript-gpl/Makefile.inc
index 25f98344187a..396004706b39 100644
--- a/print/ghostscript-gpl/Makefile.inc
+++ b/print/ghostscript-gpl/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	8.61
-GS_REVISION=	3
+GS_REVISION=	4
 GS_EPOCH=	0
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index 5391b6e65302..a50daa5553d3 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -8,13 +8,13 @@ bin/fixmswrd.pl
 bin/font2c
 bin/gs
 bin/gsbj
-%%SHLIB%%bin/gsc
+bin/gsc
 bin/gsdj
 bin/gsdj500
 bin/gslj
 bin/gslp
 bin/gsnd
-%%SHLIB%%bin/gsx
+bin/gsx
 bin/lprsetup.sh
 bin/pcl3opts
 bin/pdf2dsc
@@ -35,11 +35,11 @@ bin/ps2ps2
 bin/pv.sh
 bin/unix-lpr.sh
 bin/wftopfa
-%%SHLIB%%include/ghostscript/iapi.h
-%%SHLIB%%include/ghostscript/ierrors.h
-%%SHLIB%%lib/libgs.so
-%%SHLIB%%lib/libgs.so.%%SHLIB_VER%%
-%%SHLIB%%lib/libgs.so.%%GS_VERSION%%
+include/ghostscript/iapi.h
+include/ghostscript/ierrors.h
+lib/libgs.so
+lib/libgs.so.%%SHLIB_VER%%
+lib/libgs.so.%%GS_VERSION%%
 %%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/chp2200/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/chp2200/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ChangeLog
@@ -829,7 +829,7 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
 @exec ln -s -f %D/share/fonts/CIDFont %%CIDFONTDIR%%/CIDFont
 @unexec rm -f %%CIDFONTDIR%%/CIDFont
-%%SHLIB%%@dirrm include/ghostscript
+@dirrm include/ghostscript
 @dirrm %%DATADIR%%/%%GS_VERSION%%/pcl3
 @dirrm %%DATADIR%%/%%GS_VERSION%%/lib
 @dirrm %%DATADIR%%/%%GS_VERSION%%/examples