- Move kde31-apireference to kde3-apireference in order to carry the latest

  stable apireference of KDE3 [1]
- Update to version 3.4 [2]
- Use KDE as DIST_SUBDIR

PR:		ports/83199 [1]
Submitted by:	Heiner <h.eichmann@gmx.de> [2]
Repocopy by:	marcus

7 files changed, 18 insertions, 50 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 7acc4434f5db..4a0e426148fb 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -87,7 +87,7 @@
     SUBDIR += kb2mb2
     SUBDIR += kde-lite
     SUBDIR += kde3
-    SUBDIR += kde31-apireference
+    SUBDIR += kde3-apireference
     SUBDIR += kdebase3
     SUBDIR += kdelibs3
     SUBDIR += kdelibs3-nocups
diff --git a/x11/kde3-apireference/Makefile b/x11/kde3-apireference/Makefile
index 2c25415f5c34..366067109aa1 100644
--- a/x11/kde3-apireference/Makefile
+++ b/x11/kde3-apireference/Makefile
@@ -1,18 +1,19 @@
-# New ports collection makefile for:    kde_api_reference_31
+# New ports collection makefile for:    kde3-apireference
 # Date created:                         2004/01/02
 # Whom:                                 Heiner <h.eichmann@gmx.de>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	kde31-apireference
-PORTVERSION=	3.1
+PORTNAME=	kde3-apireference
+PORTVERSION=	3.4
 CATEGORIES=	x11 kde
-MASTER_SITES=	http://developer.kde.org/documentation/library/3.1-api/
-DISTNAME=	3.1-api
+MASTER_SITES=	http://developer.kde.org/documentation/library/${PORTVERSION}-api/
+DISTNAME=	${PORTVERSION}-api
+DIST_SUBDIR=	KDE
 
 MAINTAINER=	h.eichmann@gmx.de
-COMMENT=	API reference for KDE 3.1
+COMMENT=	API reference for KDE 3
 
 IGNOREFILES=	${ALLFILES}
 USE_BZIP2=	yes
@@ -20,12 +21,14 @@ USE_BZIP2=	yes
 PLIST=	${WRKDIR}/plist
 
 do-build:
-	@cd ${WRKSRC} ; ${FIND} * -type f | ${SED} -e "s#^#share/doc/kdeapi31/#" > ${WRKDIR}/plist
-	@cd ${WRKSRC} ; ${FIND} * -type d | sort -r | ${SED} -e "s#^#@dirrm share/doc/kdeapi31/#" >> ${WRKDIR}/plist
-	@${ECHO} "@dirrm share/doc/kdeapi31" >> ${WRKDIR}/plist
+	@cd ${WRKSRC} ; ${FIND} * -type d -delete
+	@cd ${WRKSRC} ; ${FIND} * -type f | ${SED} -e "s#^#share/doc/kdeapi3/#" > ${WRKDIR}/plist
+	@cd ${WRKSRC} ; ${FIND} * -type l | ${SED} -e "s#^#share/doc/kdeapi3/#" >> ${WRKDIR}/plist
+	@cd ${WRKSRC} ; ${FIND} * -type d | ${SORT} -r | ${SED} -e "s#^#@dirrm share/doc/kdeapi3/#" >> ${WRKDIR}/plist
+	@${ECHO} "@dirrm share/doc/kdeapi3" >> ${WRKDIR}/plist
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/doc/kdeapi31
-	@${CP} -r ${WRKSRC}/* ${PREFIX}/share/doc/kdeapi31
+	@${MKDIR} ${PREFIX}/share/doc/kdeapi3
+	@${CP} -r ${WRKSRC}/* ${PREFIX}/share/doc/kdeapi3
 
 .include <bsd.port.mk>
diff --git a/x11/kde3-apireference/distinfo b/x11/kde3-apireference/distinfo
index ec5803bc8d6f..2ff8a225f17f 100644
--- a/x11/kde3-apireference/distinfo
+++ b/x11/kde3-apireference/distinfo
@@ -1 +1 @@
-MD5 (3.1-api.tar.bz2) = IGNORE
+MD5 (KDE/3.4-api.tar.bz2) = IGNORE
diff --git a/x11/kde3-apireference/pkg-descr b/x11/kde3-apireference/pkg-descr
index 2926c3aa3fae..03bf9c75c8c9 100644
--- a/x11/kde3-apireference/pkg-descr
+++ b/x11/kde3-apireference/pkg-descr
@@ -1,3 +1,3 @@
-API reference for KDE 3.1
+API reference for KDE 3.x
 
-WWW: http://developer.kde.org/documentation/library/3.1-api/
+WWW: http://developer.kde.org/documentation/library/libraryref.html
diff --git a/x11/kde31-apireference/Makefile b/x11/kde31-apireference/Makefile
deleted file mode 100644
index 2c25415f5c34..000000000000
--- a/x11/kde31-apireference/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:    kde_api_reference_31
-# Date created:                         2004/01/02
-# Whom:                                 Heiner <h.eichmann@gmx.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	kde31-apireference
-PORTVERSION=	3.1
-CATEGORIES=	x11 kde
-MASTER_SITES=	http://developer.kde.org/documentation/library/3.1-api/
-DISTNAME=	3.1-api
-
-MAINTAINER=	h.eichmann@gmx.de
-COMMENT=	API reference for KDE 3.1
-
-IGNOREFILES=	${ALLFILES}
-USE_BZIP2=	yes
-
-PLIST=	${WRKDIR}/plist
-
-do-build:
-	@cd ${WRKSRC} ; ${FIND} * -type f | ${SED} -e "s#^#share/doc/kdeapi31/#" > ${WRKDIR}/plist
-	@cd ${WRKSRC} ; ${FIND} * -type d | sort -r | ${SED} -e "s#^#@dirrm share/doc/kdeapi31/#" >> ${WRKDIR}/plist
-	@${ECHO} "@dirrm share/doc/kdeapi31" >> ${WRKDIR}/plist
-
-do-install:
-	@${MKDIR} ${PREFIX}/share/doc/kdeapi31
-	@${CP} -r ${WRKSRC}/* ${PREFIX}/share/doc/kdeapi31
-
-.include <bsd.port.mk>
diff --git a/x11/kde31-apireference/distinfo b/x11/kde31-apireference/distinfo
deleted file mode 100644
index ec5803bc8d6f..000000000000
--- a/x11/kde31-apireference/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (3.1-api.tar.bz2) = IGNORE
diff --git a/x11/kde31-apireference/pkg-descr b/x11/kde31-apireference/pkg-descr
deleted file mode 100644
index 2926c3aa3fae..000000000000
--- a/x11/kde31-apireference/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-API reference for KDE 3.1
-
-WWW: http://developer.kde.org/documentation/library/3.1-api/