4 files changed, 68 insertions, 41 deletions

diff --git a/misc/gtktalog/Makefile b/misc/gtktalog/Makefile
index 98f3ce23af9c..ac5b3cea5d42 100644
--- a/misc/gtktalog/Makefile
+++ b/misc/gtktalog/Makefile
@@ -7,43 +7,38 @@
 
 PORTNAME=	gtktalog
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}.pkg/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GTKtalog is a tool to make disk catalogs
+COMMENT=	A tool to make disk catalogs
 
 BUILD_DEPENDS=	plaympeg:${PORTSDIR}/multimedia/smpeg
 RUN_DEPENDS=	plaympeg:${PORTSDIR}/multimedia/smpeg
 
-USE_GNOME=	gnomeprefix gnomelibs gnometarget
-GNU_CONFIGURE=	yes
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
-USE_REINPLACE=	yes
+USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack gnomelibs gnomeprefix gnometarget
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gtktalog.1
 
-DOCS=	AUTHORS BUGS ChangeLog NEWS README TODO
-
-CONFIGURE_ENV=	XGETTEXT=${LOCALBASE}/bin/xgettext
-
-post-patch:
-	@${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@" ${WRKSRC}/configure
-	@${REINPLACE_CMD} -E "s@^(Applicationsdir = ).*@\1${PREFIX}/share/gnome/apps/Applications@" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -E "s@^(localedir = ).*@\1${PREFIX}/share/locale@" \
-		${WRKSRC}/po/Makefile.in.in
-	@${REINPLACE_CMD} -E "s@^(gtktalog_helpdir = ).*@\1${PREFIX}/share/gnome/help/gtktalog/C@" ${WRKSRC}/Docs/C/Makefile.in
-	@${REINPLACE_CMD} -E "s@^(gtktalog_helpdir = ).*@\1${PREFIX}/share/gnome/help/gtktalog/fr@" ${WRKSRC}/Docs/fr/Makefile.in
-	@${REINPLACE_CMD} -E "s@^(MountPoint ).*@\1/cdrom@" \
-		${WRKSRC}/src/gtktalog/gtktalog.cf.in.in
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 post-install:
-	${RMDIR} ${PREFIX}/share/gnome/help/gtktalog/*/images 2>/dev/null || ${TRUE}
 .if !defined(NOPORTDOCS)
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
-.for f in ${DOCS}
+	@${MKDIR} ${DOCSDIR}
+.for f in AUTHORS BUGS ChangeLog NEWS README TODO
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
diff --git a/misc/gtktalog/files/patch-Docs::C::Makefile.in b/misc/gtktalog/files/patch-Docs::C::Makefile.in
index 84bdc048b2f0..6b596b37ab61 100644
--- a/misc/gtktalog/files/patch-Docs::C::Makefile.in
+++ b/misc/gtktalog/files/patch-Docs::C::Makefile.in
@@ -1,7 +1,7 @@
---- Docs/C/Makefile.in.orig	Fri Jul 11 00:24:00 2003
-+++ Docs/C/Makefile.in	Fri Jul 11 00:26:06 2003
-@@ -326,9 +326,6 @@
- 	-rm -rf man
+--- Docs/C/Makefile.in.orig	Tue Sep  2 06:57:08 2003
++++ Docs/C/Makefile.in	Mon Dec 13 14:13:46 2004
+@@ -387,9 +387,6 @@
+ 	-rm -rf man.junk
  
  gtktalog/gtktalog.html: $(SGML_FILES)
 -	-db2html gtktalog.sgml
@@ -10,3 +10,12 @@
  
  dist-hook: gtktalog/gtktalog.html
  	mkdir -p $(distdir)/gtktalog
+@@ -397,7 +394,7 @@
+ 	-cp gtktalog/stylesheet-images/* $(distdir)/gtktalog
+ 
+ install-data-local: gtktalog/gtktalog.html
+-	$(mkinstalldirs) $(DESTDIR)$(gtktalog_helpdir)/images
++	$(mkinstalldirs) $(DESTDIR)$(gtktalog_helpdir)
+ 	-for file in $(srcdir)/gtktalog/*.html $(srcdir)/gtktalog/*.css $(srcdir)/gtktalog/*.gif; do \
+ 	basefile=`basename $$file`; \
+ 	$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gtktalog_helpdir)/$$basefile; \
diff --git a/misc/gtktalog/files/patch-Docs::fr::Makefile.in b/misc/gtktalog/files/patch-Docs::fr::Makefile.in
index 91dcd3cfd425..ed6f291002b4 100644
--- a/misc/gtktalog/files/patch-Docs::fr::Makefile.in
+++ b/misc/gtktalog/files/patch-Docs::fr::Makefile.in
@@ -1,7 +1,7 @@
---- Docs/fr/Makefile.in.orig	Fri Jul 11 00:36:37 2003
-+++ Docs/fr/Makefile.in	Fri Jul 11 00:37:45 2003
-@@ -326,9 +326,6 @@
- 	-rm -rf man
+--- Docs/fr/Makefile.in.orig	Tue Sep  2 06:57:10 2003
++++ Docs/fr/Makefile.in	Mon Dec 13 14:14:17 2004
+@@ -387,9 +387,6 @@
+ 	-rm -rf man.junk
  
  gtktalog/gtktalog.html: $(SGML_FILES)
 -	-db2html gtktalog.sgml
@@ -10,3 +10,12 @@
  
  dist-hook: gtktalog/gtktalog.html
  	mkdir -p $(distdir)/gtktalog
+@@ -397,7 +394,7 @@
+ 	-cp gtktalog/stylesheet-images/* $(distdir)/gtktalog
+ 
+ install-data-local: gtktalog/gtktalog.html
+-	$(mkinstalldirs) $(DESTDIR)$(gtktalog_helpdir)/images
++	$(mkinstalldirs) $(DESTDIR)$(gtktalog_helpdir)
+ 	-for file in $(srcdir)/gtktalog/*.html $(srcdir)/gtktalog/*.css $(srcdir)/gtktalog/*.gif; do \
+ 	basefile=`basename $$file`; \
+ 	$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gtktalog_helpdir)/$$basefile; \
diff --git a/misc/gtktalog/pkg-plist b/misc/gtktalog/pkg-plist
index 88f46281d0ea..4985306d311a 100644
--- a/misc/gtktalog/pkg-plist
+++ b/misc/gtktalog/pkg-plist
@@ -1,9 +1,15 @@
 bin/gtktalog
 lib/gtktalog/aviinfo
-lib/gtktalog/mpeginfo
 lib/gtktalog/htmltitle
 lib/gtktalog/modinfo
 lib/gtktalog/mp3info
+lib/gtktalog/mpeginfo
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/apps/Applications/gtktalog.desktop
 share/gnome/gtktalog/gtktalog.cf
 share/gnome/gtktalog/icons/c.xpm
@@ -147,17 +153,25 @@ share/gnome/help/gtktalog/fr/x835.html
 share/gnome/help/gtktalog/fr/x846.html
 share/gnome/help/gtktalog/fr/x947.html
 share/gnome/pixmaps/gtktalog.png
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%NLS%%share/locale/ca/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/gtktalog.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gtktalog.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/gtktalog
-@dirrm share/gnome/gtktalog/icons
-@dirrm share/gnome/gtktalog/xpm
-@dirrm share/gnome/gtktalog
-@dirrm share/gnome/help/gtktalog/C
 @dirrm share/gnome/help/gtktalog/fr
+@dirrm share/gnome/help/gtktalog/C
 @dirrm share/gnome/help/gtktalog
+@dirrm share/gnome/gtktalog/xpm
+@dirrm share/gnome/gtktalog/icons
+@dirrm share/gnome/gtktalog
+@dirrm lib/gtktalog