4 files changed, 55 insertions, 20 deletions

diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index a574b1d46ffa..503af0191792 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	snownews
 PORTVERSION=	1.5.7
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://kiza.kcore.de/software/snownews/download/
 
@@ -20,6 +21,8 @@ USE_GNOME=	libxml2
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 
+OPTIONS=	OPML		"Outline Processor Markup Support" on
+
 .if defined(CHARSET)
 CONFIGURE_ARGS=	--charset=${CHARSET}
 .if ${CHARSET} == "UTF-8"
@@ -35,6 +38,16 @@ PLIST_SUB+=	NLS=""
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if defined(WITHOUT_OPML)
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile
+PLIST_SUB+=	OPML="@comment "
+.else
+RUN_DEPENDS=	${SITE_PERL}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
+PLIST_SUB+=	OPML=""
+# opml2snow only have "" manpage
+_MANPAGES+=	${PREFIX}/man/man1/opml2snow.1
+.endif
+
 MAN1=		snownews.1
 MANLANG=	"" de nl fr it ru_RU.KOI8-R
 
@@ -50,6 +63,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS=|CFLAGS+=|g' ${WRKSRC}/platform_settings
 	@${REINPLACE_CMD} -e 's|^PREFIX|#PREFIX|' ${WRKSRC}/platform_settings
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|make|${GMAKE}|' ${WRKSRC}/Makefile
 .if defined(WITHOUT_NLS)
 	${REINPLACE_CMD} -e 's/ install-locales / /g' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's/ locales$$//g' ${WRKSRC}/Makefile
diff --git a/www/snownews/files/extra-patch-Makefile b/www/snownews/files/extra-patch-Makefile
new file mode 100644
index 000000000000..6332af748c2e
--- /dev/null
+++ b/www/snownews/files/extra-patch-Makefile
@@ -0,0 +1,39 @@
+--- Makefile.orig	Sun Jun  5 17:50:22 2005
++++ Makefile	Fri Oct 21 11:50:27 2005
+@@ -12,7 +12,7 @@
+ 
+ VERSION= `grep VERSION version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
+ DISTDIR= snownews-$(VERSION)
+-DISTFILES = AUTHOR COPYING CREDITS Changelog README README.de README.patching INSTALL opml2snow snowsync \
++DISTFILES = AUTHOR COPYING CREDITS Changelog README README.de README.patching INSTALL snowsync \
+ 	Makefile platform_settings configure \
+ 	doc po scripts \
+ 	main.c interface.c netio.c xmlparse.c updatecheck.c os-support.c conversions.c dialog.c ui-support.c categories.c about.c cookies.c setup.c net-support.c digcalc.c md5.c filters.c io-internal.c zlib_interface.c support.c \
+@@ -60,10 +60,6 @@
+ 		mkdir -p $(DESTDIR)$(PREFIX)/bin; \
+ 	fi
+ 	$(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin
+-	$(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin
+-	if [ ! -f "$(DESTDIR)$(PREFIX)/bin/snow2opml" ]; then \
+-		ln -sf $(DESTDIR)$(PREFIX)/bin/opml2snow $(DESTDIR)$(PREFIX)/bin/snow2opml; \
+-	fi;
+ 	$(INSTALL) snowsync $(DESTDIR)$(PREFIX)/bin
+ 
+ install-locales: locales
+@@ -79,7 +75,6 @@
+ 		mkdir -p $(DESTDIR)$(PREFIX)/man/man1; \
+ 	fi
+ 	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/man/man1
+-	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/man/man1
+ 	
+ 	for L in $(LANGS); do \
+ 		if [ ! -d "$(DESTDIR)$(PREFIX)/man/$$L/man1" ]; then \
+@@ -127,7 +122,7 @@
+ 	mkdir $(DISTDIR)/man/it
+ 	mkdir $(DISTDIR)/man/ru_RU.KOI8-R
+ 	mkdir $(DISTDIR)/po
+-	cp AUTHOR COPYING CREDITS Changelog README README.de INSTALL.binary snownews opml2snow $(DISTDIR)
++	cp AUTHOR COPYING CREDITS Changelog README README.de INSTALL.binary snownews $(DISTDIR)
+ 	cp doc/man/de/snownews.1 $(DISTDIR)/man/de
+ 	cp doc/man/nl/snownews.1 $(DISTDIR)/man/nl
+ 	cp doc/man/fr/snownews.1 $(DISTDIR)/man/fr
diff --git a/www/snownews/files/patch-Makefile b/www/snownews/files/patch-Makefile
deleted file mode 100644
index 8972d363e438..000000000000
--- a/www/snownews/files/patch-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig	Thu Dec  9 19:29:08 2004
-+++ Makefile	Wed Jan 26 16:03:01 2005
-@@ -1,5 +1,5 @@
--CC=         gcc
--MAKE=       make
-+CC=         cc
-+MAKE=       gmake
- INSTALL=    install
- LOCALEPATH= $(PREFIX)/share/locale
- 
-@@ -77,7 +77,6 @@
- 		mkdir -p $(DESTDIR)$(PREFIX)/man/man1; \
- 	fi
- 	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(DESTDIR)$(PREFIX)/man/man1
--	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(DESTDIR)$(PREFIX)/man/man1
- 	
- 	for L in $(LANGS); do \
- 		if [ ! -d "$(DESTDIR)$(PREFIX)/man/$$L/man1" ]; then \
diff --git a/www/snownews/pkg-plist b/www/snownews/pkg-plist
index d3bacc196145..e8dcfdb58a73 100644
--- a/www/snownews/pkg-plist
+++ b/www/snownews/pkg-plist
@@ -1,5 +1,5 @@
-bin/opml2snow
-bin/snow2opml
+%%OPML%%bin/opml2snow
+%%OPML%%bin/snow2opml
 bin/snownews
 bin/snowsync
 %%NLS%%share/locale/de/LC_MESSAGES/snownews.mo