4 files changed, 17 insertions, 19 deletions

diff --git a/multimedia/vdr-plugin-epgsearch/Makefile b/multimedia/vdr-plugin-epgsearch/Makefile
index c102647a7081..29f00390e86f 100644
--- a/multimedia/vdr-plugin-epgsearch/Makefile
+++ b/multimedia/vdr-plugin-epgsearch/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	vdr-plugin-epgsearch
-PORTVERSION=	0.9.25b20s20110221
-PORTREVISION=	6
+PORTVERSION=	1.0.1s20120322
 CATEGORIES=	multimedia
 MASTER_SITES=	http://winni.vdr-developer.org/epgsearch/downloads/beta/:beta \
 		LOCAL/nox/:snapshot
-DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${PORTVERSION:S/b/.beta/}${DISTVERSIONSUFFIX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:snapshot
 
 MAINTAINER=	nox@FreeBSD.org
diff --git a/multimedia/vdr-plugin-epgsearch/distinfo b/multimedia/vdr-plugin-epgsearch/distinfo
index a63c6bd731fb..e6ab78088e1c 100644
--- a/multimedia/vdr-plugin-epgsearch/distinfo
+++ b/multimedia/vdr-plugin-epgsearch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vdr/vdr-epgsearch-0.9.25.beta20s20110221.tar.bz2) = 9e2cad75601a68897841184574fe04e264ee26407c6f28f5ae9c23c888522615
-SIZE (vdr/vdr-epgsearch-0.9.25.beta20s20110221.tar.bz2) = 358904
+SHA256 (vdr/vdr-plugin-epgsearch-1.0.1s20120322.tar.bz2) = 3aeba4e396fcab71a15cb7a6dbd84f359b7770ef8d15aee05f0fffecb69e276e
+SIZE (vdr/vdr-plugin-epgsearch-1.0.1s20120322.tar.bz2) = 355342
diff --git a/multimedia/vdr-plugin-epgsearch/files/patch-Makefile b/multimedia/vdr-plugin-epgsearch/files/patch-Makefile
index 5897dee386f4..7f3b80b4cac5 100644
--- a/multimedia/vdr-plugin-epgsearch/files/patch-Makefile
+++ b/multimedia/vdr-plugin-epgsearch/files/patch-Makefile
@@ -1,9 +1,9 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -226,19 +226,35 @@ generate-i18n: i18n-template.h $(I18Npot
+@@ -235,19 +235,35 @@ i18n: $(I18Nmsgs) $(I18Npot)
  
  libvdr-$(PLUGIN).so: $(OBJS)
- 	$(CXX) $(CXXFLAGS)  -shared $(OBJS) $(LIBS) -o $@
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
 +ifdef FREEBSD
 +	@cp -f $@ $(LIBDIR)/$@.$(APIVERSION)
 +else
@@ -11,7 +11,7 @@
 +endif
  
  libvdr-$(PLUGIN2).so: $(OBJS2)
- 	$(CXX) $(CXXFLAGS) -shared $(OBJS2) $(LIBS2) -o $@
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS2) $(LIBS2) -o $@
 +ifdef FREEBSD
 +	@cp -f $@ $(LIBDIR)/$@.$(APIVERSION)
 +else
@@ -19,7 +19,7 @@
 +endif
  
  libvdr-$(PLUGIN3).so: $(OBJS3)
- 	$(CXX) $(CXXFLAGS) -shared $(OBJS3) $(LIBS3) -o $@
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS3) $(LIBS3) -o $@
 +ifdef FREEBSD
 +	@cp -f $@ $(LIBDIR)/$@.$(APIVERSION)
 +else
@@ -27,7 +27,7 @@
 +endif
  
  libvdr-$(PLUGIN4).so: $(OBJS4)
- 	$(CXX) $(CXXFLAGS) -shared $(OBJS4) $(LIBS4) -o $@
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS4) $(LIBS4) -o $@
 +ifdef FREEBSD
 +	@cp -f $@ $(LIBDIR)/$@.$(APIVERSION)
 +else
@@ -35,11 +35,11 @@
 +endif
  
  createcats: createcats.o Makefile
- 	$(CXX) $(CXXFLAGS) createcats.o -o $@
-@@ -278,3 +294,15 @@ install-doc:
- clean:
- 	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot $(PODIR)/*~
- 	@-rm -f $(OBJS) $(OBJS2) $(OBJS3) $(OBJS4) $(DEPFILE) *.so *.tgz core* *~ createcats createcats.o pod2*.tmp
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) createcats.o -o $@
+@@ -299,3 +315,15 @@ clean:
+ 	@-rm -f $(OBJS) $(OBJS2) $(OBJS3) $(OBJS4) $(DEPFILE) *.so *.tgz core* createcats createcats.o pod2*.tmp
+ 	@-find . \( -name "*~" -o -name "#*#" \) -print0 | xargs -0r rm -f
+ 	@-rm -rf doc html man
 +
 +install:
 +	${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION)
diff --git a/multimedia/vdr-plugin-epgsearch/pkg-plist b/multimedia/vdr-plugin-epgsearch/pkg-plist
index 930835d0cc27..dc7073776186 100644
--- a/multimedia/vdr-plugin-epgsearch/pkg-plist
+++ b/multimedia/vdr-plugin-epgsearch/pkg-plist
@@ -1,7 +1,7 @@
-lib/vdr/libvdr-epgsearch.so.1.7.22
-lib/vdr/libvdr-epgsearchonly.so.1.7.22
-lib/vdr/libvdr-conflictcheckonly.so.1.7.22
-lib/vdr/libvdr-quickepgsearch.so.1.7.22
+lib/vdr/libvdr-epgsearch.so.%%APIVERSION%%
+lib/vdr/libvdr-epgsearchonly.so.%%APIVERSION%%
+lib/vdr/libvdr-conflictcheckonly.so.%%APIVERSION%%
+lib/vdr/libvdr-quickepgsearch.so.%%APIVERSION%%
 %%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr-epgsearch.mo
 %%NLS%%share/locale/cs_CZ/LC_MESSAGES/vdr-epgsearch.mo
 %%NLS%%share/locale/da_DK/LC_MESSAGES/vdr-epgsearch.mo