ports/82466: [PATCH] polite ports makefile

[Jose M Rodriguez]

>Number:         82466
>Category:       ports
>Synopsis:       [PATCH] polite ports makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 21 06:50:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jose M Rodriguez
>Release:        FreeBSD 5.4-RELEASE-p2 i386
>Organization:
RedesJM
>Environment:
System: FreeBSD orion.redesjm.local 5.4-RELEASE-p2 FreeBSD 5.4-RELEASE-p2 #0: Thu Jun 9 17:54:55 CEST 2005 root at orion.redesjm.local:/usr/obj/usr/src/sys/ORION i386

>Description:
	Polite port's Makefile and support new mldonkey-core-stable port
	(knocker SVN version)
>How-To-Repeat:
>Fix:

--- patch-mldonkey-devel begins here ---
Index: Makefile
===================================================================
RCS file: /home/cvs/freebsd/ports/net/mldonkey-devel/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile	12 Jun 2005 18:38:43 -0000	1.43
+++ Makefile	20 Jun 2005 19:53:23 -0000
@@ -8,23 +8,17 @@
 PORTNAME=	mldonkey
 PORTVERSION=	2.5.30.16
 CATEGORIES+=	net
-MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${DOWNLOADVERSION}
-
-PATCH_SITES=	http://download.berlios.de/pub/mldonkey/spiralvoice/patchpacks/
-#PATCHFILES=	patch_pack${PORTVERSION:C/^.\..\.(.)/\1/:C/\.//}.gz
 
 MAINTAINER?=	lioux at FreeBSD.org
 COMMENT?=	A OCAML client for multiple peer-to-peer networks
 
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
-#DOWNLOADVERSION=${PORTVERSION:R}
-DOWNLOADVERSION=2.5.30.16
-
 NO_LATEST_LINK=	yes
-CONFLICTS=	mldonkey-[0-9]* mldonkey-{core,gui}-[0.9]*
+CONFLICTS=	mldonkey-[0-9]*
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
@@ -43,8 +37,6 @@
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-#WRKSRC=		${WRKDIR}/${PORTNAME}-${DOWNLOADVERSION}
-
 ###
 ## Options activation
 ###
@@ -56,9 +48,15 @@
 CONFIGURE_ARGS+=--disable-gui \
 		--disable-gd
 PLIST_SUB+=	CORE="" GUI="@comment " GUICORE="@comment "
+CONFLICTS+=	mldonkey-core-[0.9]* mldonkey-core-stable-[0.9]* \
+		mldonkey-devel-[0-9]*
 PKGNAMESUFFIX=	-core-devel
 .else
 PLIST_SUB+=	GUI=""
+CONFLICTS+=	mldonkey-gui-[0.9]*
+.if !defined(WITHOUT_CORE)
+CONFLICTS+=	mldonkey-devel-[0-9]*
+.endif
 BUILD_DEPENDS+=	lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
 		${LOCALBASE}/lib/ocaml/jabbr.cma:${PORTSDIR}/net/ocaml-jabbr
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
@@ -77,6 +75,7 @@
 DOCFILES=	Authors.txt Bugs.txt ChangeLog Developers.txt FAQ.html \
 		Install.txt Readme.txt Todo.txt ed2k_links.txt
 PORTDOCS=	${DOCFILES}
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .include <bsd.port.pre.mk>
 
@@ -118,6 +117,10 @@
 		-e 's|^(PTHREAD_LIBS[^=]*=).*$$|\1${PTHREAD_LIBS}|' \
 		${BUILD_WRKSRC}/config/Makefile.config
 
+post-build:
+	@${SED} -e 's,%%DOCSDIR%%,${DOCSDIR},' \
+		< ${.CURDIR}/pkg-message > ${PKGMESSAGE}
+
 do-install:
 .ifndef(WITHOUT_CORE)
 	@${INSTALL_PROGRAM} ${WRKSRC}/mlnet		${PREFIX}/bin/mlnet-real
Index: pkg-message
===================================================================
RCS file: /home/cvs/freebsd/ports/net/mldonkey-devel/pkg-message,v
retrieving revision 1.3
diff -u -r1.3 pkg-message
--- pkg-message	15 Jun 2003 19:39:42 -0000	1.3
+++ pkg-message	20 Jun 2005 20:00:19 -0000
@@ -1,7 +1,7 @@
 	ATTENTIONATTENTION:
 
 - If you want to know how to use mldonkey, read "INSTALL" or
-  "FAQ.html" in the port docs (/usr/local/share/doc/mldonkey)
+  "FAQ.html" in the port docs (%%DOCSDIR%%)
 
 - It is not a bad idea to install mplayer. You will be able
   to preview half-downloaded files (if you have the beginning).
--- patch-mldonkey-devel ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: