4 files changed, 32 insertions, 96 deletions

diff --git a/sysutils/portmanager/Makefile b/sysutils/portmanager/Makefile
index 2fc30f044f09..d8d5448fa793 100644
--- a/sysutils/portmanager/Makefile
+++ b/sysutils/portmanager/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		portmanager
-PORTVERSION=		0.1.3
+PORTVERSION=		0.1.7
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	portmanager
@@ -14,9 +14,30 @@ MASTER_SITE_SUBDIR=	portmanager
 MAINTAINER=		ringworm@inbox.lv
 COMMENT=		FreeBSD port management software
 
-BUILD_DEPENDS=		c2html:${PORTSDIR}/textproc/c2html
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS=		c2html:${PORTSDIR}/textproc/c2html	\
+			tidy:${PORTSDIR}/www/tidy
+.endif
 
+USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=		yes
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	docbook.css index.html libPMGR.3.html libPMGR.h.html PMGRrDbCreate.3.html	\
+		PMGRrDbCreate.c.html PMGRrDbCreate.h.html PMGRrMakeDescribe.3.html		\
+		PMGRrMakeDescribe.c.html PMGRrMakeDescribe.h.html MGrDbArray.3.html		\
+		MGrDbArray.c.html MGrDbArray.h.html MGrFileSize.3.html MGrFileSize.c.html	\
+		MGrFileSize.h.html MGrFileTime.3.html MGrFileTime.c.html MGrFileTime.h.html	\
+		MGrIfFileExist.3.html MGrIfFileExist.c.html MGrIfFileExist.h.html		\
+		MGrInStringSwap.3.html MGrInStringSwap.c.html MGrInStringSwap.h.html		\
+		MGrIntToString.3.html MGrIntToString.c.html MGrIntToString.h.html		\
+		MGsDb.7.html MGsProperty.7.html libMG.3.html libMG.h.html mgmlParse.1.html	\
+		mgmlParse.c.html mgmlParse.h.html portmanager.1.html portmanager.c.html 	\
+		portmanager.h.html pmStatus.1.html pmStatus.c.html pmStatus.h.html 		\
+		pmUpgrade.1.html pmUpgrade.c.html pmUpgrade.h.html
+INSTALL_TARGET=	install info
+.endif
+
 .include <bsd.port.mk>
diff --git a/sysutils/portmanager/distinfo b/sysutils/portmanager/distinfo
index d9af84cb626c..eb42cc793cff 100644
--- a/sysutils/portmanager/distinfo
+++ b/sysutils/portmanager/distinfo
@@ -1,2 +1,2 @@
-MD5 (portmanager-0.1.3.tar.gz) = f4efc4514923bc93cc20ebe8e46cb7e6
-SIZE (portmanager-0.1.3.tar.gz) = 591261
+MD5 (portmanager-0.1.7.tar.gz) = 88bd800b2f8c8d0e30ad334026b8dc73
+SIZE (portmanager-0.1.7.tar.gz) = 357665
diff --git a/sysutils/portmanager/files/patch-configure b/sysutils/portmanager/files/patch-configure
deleted file mode 100644
index 88163cbec380..000000000000
--- a/sysutils/portmanager/files/patch-configure
+++ /dev/null
@@ -1,30 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/sysutils/portmanager/files/Attic/patch-configure,v 1.1 2004-07-31 17:18:26 sem Exp $
-
---- configure.orig	Wed Aug 28 11:02:51 2002
-+++ configure	Sat Sep 14 11:42:16 2002
-@@ -8592,13 +8592,6 @@
- 	;;
-     esac
- 
--    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
--    then
--      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
--echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
--   { (exit 1); exit 1; }; }
--    fi
--
-     # Update the list of available tags.
-     if test -n "$tagname"; then
-       echo appending configuration tag \"$tagname\" to $ofile
-@@ -16819,6 +16812,10 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+save_CC="$CC"
-+CC="$CXX"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-+CC="$save_CC"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/sysutils/portmanager/pkg-plist b/sysutils/portmanager/pkg-plist
index 07a90461de06..041efeac8834 100644
--- a/sysutils/portmanager/pkg-plist
+++ b/sysutils/portmanager/pkg-plist
@@ -1,11 +1,8 @@
 etc/portmanager/portmanager.conf.SAMPLE
 bin/mgmlParse
-bin/pmCvsSup
-bin/pmFreeBSDdoc
 bin/pmStatus
 bin/pmUpgrade
 bin/portmanager
-include/MGrCommandLine.h
 include/MGrDbArray.h
 include/MGrFileSize.h
 include/MGrFileTime.h
@@ -16,64 +13,12 @@ include/PMGRrDbCreate.h
 include/PMGRrMakeDescribe.h
 include/libMG.h
 include/libPMGR.h
+include/pmStatus.h
+include/pmUpgrade.h
 lib/libMG.a
-lib/libMG.so
-lib/libMG.so.0
+lib/libMG
+lib/libMG.0
 lib/libPMGR.a
-lib/libPMGR.so
-lib/libPMGR.so.0
-%%PORTDOCS%%%%DOCSDIR%%/docbook.css
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/libPMGR.3.html
-%%PORTDOCS%%%%DOCSDIR%%/libPMGR.h.html
-%%PORTDOCS%%%%DOCSDIR%%/PMGRrDbCreate.3.html
-%%PORTDOCS%%%%DOCSDIR%%/PMGRrDbCreate.c.html
-%%PORTDOCS%%%%DOCSDIR%%/PMGRrDbCreate.h.html
-%%PORTDOCS%%%%DOCSDIR%%/PMGRrMakeDescribe.3.html
-%%PORTDOCS%%%%DOCSDIR%%/PMGRrMakeDescribe.c.html
-%%PORTDOCS%%%%DOCSDIR%%/PMGRrMakeDescribe.h.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrCommandLine.3.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrCommandLine.c.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrCommandLine.h.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrDbArray.3.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrDbArray.c.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrDbArray.h.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrFileSize.3.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrFileSize.c.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrFileSize.h.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrFileTime.3.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrFileTime.c.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrFileTime.h.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrIfFileExist.3.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrIfFileExist.c.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrIfFileExist.h.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrInStringSwap.3.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrInStringSwap.c.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrInStringSwap.h.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrIntToString.3.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrIntToString.c.html
-%%PORTDOCS%%%%DOCSDIR%%/MGrIntToString.h.html
-%%PORTDOCS%%%%DOCSDIR%%/MGsDb.7.html
-%%PORTDOCS%%%%DOCSDIR%%/MGsProperty.7.html
-%%PORTDOCS%%%%DOCSDIR%%/libMG.3.html
-%%PORTDOCS%%%%DOCSDIR%%/libMG.h.html
-%%PORTDOCS%%%%DOCSDIR%%/mgmlParse.1.html
-%%PORTDOCS%%%%DOCSDIR%%/mgmlParse.c.html
-%%PORTDOCS%%%%DOCSDIR%%/mgmlParse.h.html
-%%PORTDOCS%%%%DOCSDIR%%/pmCvsSup.1.html
-%%PORTDOCS%%%%DOCSDIR%%/pmCvsSup.c.html
-%%PORTDOCS%%%%DOCSDIR%%/pmCvsSup.h.html
-%%PORTDOCS%%%%DOCSDIR%%/portmanager.1.html
-%%PORTDOCS%%%%DOCSDIR%%/portmanager.c.html
-%%PORTDOCS%%%%DOCSDIR%%/portmanager.h.html
-%%PORTDOCS%%%%DOCSDIR%%/pmFreeBSDdoc.1.html
-%%PORTDOCS%%%%DOCSDIR%%/pmFreeBSDdoc.c.html
-%%PORTDOCS%%%%DOCSDIR%%/pmFreeBSDdoc.h.html
-%%PORTDOCS%%%%DOCSDIR%%/pmStatus.1.html
-%%PORTDOCS%%%%DOCSDIR%%/pmStatus.c.html
-%%PORTDOCS%%%%DOCSDIR%%/pmStatus.h.html
-%%PORTDOCS%%%%DOCSDIR%%/pmUpgrade.1.html
-%%PORTDOCS%%%%DOCSDIR%%/pmUpgrade.c.html
-%%PORTDOCS%%%%DOCSDIR%%/pmUpgrade.h.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/portmanager
+lib/libPMGR
+lib/libPMGR.0
+@unexec rmdir %D/etc/portmanager 2>/dev/null || true