- Fix build. Unbreak.

PR:		ports/83860
Submitted by:	Ports Fury

textproc/gxmlviewer/Makefile

@@ -8,7 +8,7 @@
 
 PORTNAME=	gxmlviewer
 PORTVERSION=	1.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,23 +16,21 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xmlviewer with a netscape plugin, and now a bonobo control as well
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
-
-BROKEN=		Incomplete pkg-plist
-
+USE_X_PREFIX=	yes
+USE_GNOME=	bonobo gnomehack gnomelibs gnomeprefix libxml2
 USE_GETTEXT=	yes
 USE_REINPLACE=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomelibs bonobo gnomeprefix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}"
 
-.if ${MACHINE_ARCH:L} == "amd64"
-CFLAGS+=	-fPIC
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|intl||g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|= -DXP_UNIX|= -fPIC -DXP_UNIX|g ; \
+		s|/netscape/|/gxmlviewer/|g' ${WRKSRC}/src/nsplugin/Makefile.in
+
+post-install:
+	@${MKDIR} ${X11BASE}/lib/browser_plugins
+	@${LN} -sf ${PREFIX}/lib/gxmlviewer/plugins/npgxmlviewer.so \
+		${X11BASE}/lib/browser_plugins/npgxmlviewer.so
 
 .include <bsd.port.mk>

textproc/gxmlviewer/pkg-plist

@@ -1,5 +1,11 @@
 bin/gxmlviewer
 bin/xmlview-control
 bin/xmlformatter
-lib/netscape/plugins/npgxmlviewer.so
+lib/gxmlviewer/plugins/npgxmlviewer.so
 share/gnome/oaf/GNOME_XMLView.oaf
+@unexec rm -f %%X11BASE%%/lib/browser_plugins/npgxmlviewer.so
+@unexec rmdir %%X11BASE%%/lib/browser_plugins 2>/dev/null || true
+@exec mkdir -p %%X11BASE%%/lib/browser_plugins 2>/dev/null || true
+@exec ln -sf %D/lib/gxmlviewer/plugins/npgxmlviewer.so %%X11BASE%%/lib/browser_plugins/npgxmlviewer.so
+@dirrm lib/gxmlviewer/plugins
+@dirrm lib/gxmlviewer