- Update to version 2.0.4.

- Remove from virtual category "net" and add to "www".
- Remove pkg-message.in and patch-libprozilla_src_Makefile.in (now the
  upstream version installs headers under a "prozilla" subdirectory).
- Change pkg-plist and remove patch-libprozilla_ltmain.sh to install .la
  (libtool archive) files.

Approved by:	garga (mentor)

6 files changed, 10 insertions, 59 deletions

diff --git a/ftp/prozilla/Makefile b/ftp/prozilla/Makefile
index b5782bc7e99c..956147bdfd0d 100644
--- a/ftp/prozilla/Makefile
+++ b/ftp/prozilla/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	prozilla
-PORTVERSION=	2.0.3
-PORTREVISION=	2
-CATEGORIES=	ftp net
+PORTVERSION=	2.0.4
+CATEGORIES=	ftp www
 MASTER_SITES=	http://prozilla.genesys.ro/downloads/prozilla/tarballs/
 
 MAINTAINER=	alepulver@FreeBSD.org
@@ -21,17 +20,11 @@ USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-MAN1=		proz.1
-
-SUB_FILES=	pkg-message
-PKGMESSAGE=	${FILESDIR}/pkg-message
+CPPFLAGS=	${CFLAGS} -I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
-post-install:
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
+MAN1=		proz.1
 
 .include <bsd.port.mk>
diff --git a/ftp/prozilla/distinfo b/ftp/prozilla/distinfo
index 843bbd0f21f1..2192b69cca37 100644
--- a/ftp/prozilla/distinfo
+++ b/ftp/prozilla/distinfo
@@ -1,3 +1,3 @@
-MD5 (prozilla-2.0.3.tar.bz2) = 0a3b9c179ffd7390e52a2b6f6f98111d
-SHA256 (prozilla-2.0.3.tar.bz2) = 4caf32abd8152fd00aecb9483429e702ae9888292c020f8013d65c3333be530e
-SIZE (prozilla-2.0.3.tar.bz2) = 879687
+MD5 (prozilla-2.0.4.tar.bz2) = 220f03968ddac79c2d6b48a507cd9c71
+SHA256 (prozilla-2.0.4.tar.bz2) = 0fda675f6032543a73a4cd0dec02fd16b35708694f5dbae235354751e00616ac
+SIZE (prozilla-2.0.4.tar.bz2) = 745429
diff --git a/ftp/prozilla/files/patch-libprozilla_ltmain.sh b/ftp/prozilla/files/patch-libprozilla_ltmain.sh
deleted file mode 100644
index d78d6635cc96..000000000000
--- a/ftp/prozilla/files/patch-libprozilla_ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- libprozilla/ltmain.sh.orig	Fri Jan 28 12:29:23 2005
-+++ libprozilla/ltmain.sh	Fri Nov 25 13:05:58 2005
-@@ -5620,10 +5620,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/ftp/prozilla/files/patch-libprozilla_src_Makefile.in b/ftp/prozilla/files/patch-libprozilla_src_Makefile.in
deleted file mode 100644
index 152ae5d86223..000000000000
--- a/ftp/prozilla/files/patch-libprozilla_src_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- libprozilla/src/Makefile.in.orig	Sun Dec 11 21:19:15 2005
-+++ libprozilla/src/Makefile.in	Sun Feb 12 20:29:58 2006
-@@ -226,11 +226,11 @@
- 
- install-includeHEADERS: $(include_HEADERS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(includedir)
-+	$(mkinstalldirs) $(DESTDIR)$(includedir)/prozilla
- 	@list='$(include_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
--	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
--	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
-+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/prozilla/$$p"; \
-+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/prozilla/$$p; \
- 	done
- 
- uninstall-includeHEADERS:
diff --git a/ftp/prozilla/files/pkg-message.in b/ftp/prozilla/files/pkg-message.in
deleted file mode 100644
index 6b63a128199b..000000000000
--- a/ftp/prozilla/files/pkg-message.in
+++ /dev/null
@@ -1,11 +0,0 @@
-==============================================================================
-
-ProZilla has been installed!
-
-The libprozilla header files are now installed in a "prozilla" subdirectory to
-avoid problems caused by the file named "common.h".
-
-Now to compile a program that uses libprozilla you have to add the
-"-I%%PREFIX%%/include/prozilla" flag to the compiler.
-
-==============================================================================
diff --git a/ftp/prozilla/pkg-plist b/ftp/prozilla/pkg-plist
index 70ed10e8ee36..1ddf6295b480 100644
--- a/ftp/prozilla/pkg-plist
+++ b/ftp/prozilla/pkg-plist
@@ -3,6 +3,7 @@ include/prozilla/common.h
 include/prozilla/netrc.h
 include/prozilla/prozilla.h
 lib/libprozilla.a
+lib/libprozilla.la
 share/locale/fr/LC_MESSAGES/proz.mo
 share/locale/it/LC_MESSAGES/.mo
 share/locale/it/LC_MESSAGES/proz.mo