From thierry@pompo.net  Fri Aug  6 19:30:43 2004
Return-Path: <thierry@pompo.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 235A316A4D9
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  6 Aug 2004 19:30:43 +0000 (GMT)
Received: from ws90bj.pompo.net (graf.pompo.net [81.56.186.139])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 421F243D4C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  6 Aug 2004 19:30:40 +0000 (GMT)
	(envelope-from thierry@pompo.net)
Received: by ws90bj.pompo.net (Postfix, from userid 1001)
	id 377F022B8D2; Fri,  6 Aug 2004 21:30:19 +0200 (CEST)
Message-Id: <20040806193019.377F022B8D2@ws90bj.pompo.net>
Date: Fri,  6 Aug 2004 21:30:19 +0200 (CEST)
From: Thierry Thomas <thierry@pompo.net>
Reply-To: Thierry Thomas <thierry@pompo.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Christian Lackas <delta@lackas.net>
Subject: www/wml: install files in a standard directory.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         70091
>Category:       ports
>Synopsis:       www/wml: install files in a standard directory.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    thierry
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 06 19:40:23 GMT 2004
>Closed-Date:    Sun Aug 08 22:14:19 GMT 2004
>Last-Modified:  Mon Aug 09 17:29:09 GMT 2004
>Originator:     Thierry Thomas
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD ws90bj.pompo.net 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #1: Tue Jul 13 18:16:08 CEST 2004 thierry@ws90bj.pompo.net:/usr/obj/usr/src/sys/WS90BJ-040102 i386


	
>Description:
	www/wml installs perl arch-dependent files in a special directory
	which requires running `perl -MConfig -we 'print $Config{archname}'`
	to build pkg-plist.

>How-To-Repeat:
	make install.

>Fix:
	The following patch uses $PERL_ARCH.

--- wml.diff begins here ---
diff -urN www/wml.orig/Makefile www/wml/Makefile
--- www/wml.orig/Makefile	Fri Aug  6 20:37:28 2004
+++ www/wml/Makefile	Fri Aug  6 20:40:05 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	wml
 PORTVERSION=	2.0.9
+PORTREVISION=	1
 CATEGORIES=	www lang
 MASTER_SITES=	http://thewml.org/distrib/ \
 		ftp://thewml.org/distrib/
@@ -19,11 +20,12 @@
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl=${PERL5}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"	\
+		PERL_ARCH="${PERL_ARCH}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LIBTOOL_VER=	15
 LIBTOOLFILES=	wml_backend/p2_mp4h/configure
-PLIST_SUB+=	ARCH=${LOCAL_PERL_ARCH}
+PLIST_SUB+=	ARCH=${PERL_ARCH}
 
 CAT1=	wml_aux_txt2html.1 wml_aux_tidy.1 wml_p4_gm4.1
 
@@ -57,12 +59,6 @@
 MAN7=	wml_intro.7 wml_macros.7 wml_tutorial.7 wml_faq.7 wml_tags.7
 
 .include <bsd.port.pre.mk>
-
-.if exists(${PERL5})
-LOCAL_PERL_ARCH!=	${PERL5} -MConfig -e 'print "$$Config{archname}"'
-.else
-LOCAL_PERL_ARCH=	${ARCH}-freebsd
-.endif
 
 .if ${ARCH} == "amd64"
 BROKEN=		"Build fails on amd64 (needs to build shared libraries with -fPIC)"
diff -urN www/wml.orig/files/patch-configure www/wml/files/patch-configure
--- www/wml.orig/files/patch-configure	Mon May 10 00:54:54 2004
+++ www/wml/files/patch-configure	Fri Aug  6 00:11:43 2004
@@ -1,5 +1,5 @@
---- configure.orig	Sat May  8 01:58:52 2004
-+++ configure	Sat May  8 01:58:59 2004
+--- configure.orig	Fri Oct 18 23:44:21 2002
++++ configure	Thu Aug  5 23:40:57 2004
 @@ -1170,7 +1170,7 @@
      esac
      case " $ac_configure_args " in
@@ -9,3 +9,12 @@
      esac
    fi
  done
+@@ -2740,7 +2740,7 @@
+ 
+ dummy:
+ 	@echo INSTALLPRIVLIB=`echo $(INSTALLPRIVLIB) | $(abs2prefix)`
+-	@echo INSTALLARCHLIB=`echo $(INSTALLARCHLIB) | $(abs2prefix)`
++	@echo INSTALLARCHLIB=`echo $(INSTALLPRIVLIB) | $(abs2prefix)`/$(PERL_ARCH)
+ };
+ }
+ EOT
--- wml.diff ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->thierry 
Responsible-Changed-By: thierry 
Responsible-Changed-When: Fri Aug 6 19:41:58 GMT 2004 
Responsible-Changed-Why:  

Handle. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=70091 
State-Changed-From-To: open->feedback 
State-Changed-By: thierry 
State-Changed-When: Fri Aug 6 19:42:33 GMT 2004 
State-Changed-Why:  

Waiting for maintainer's approval. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=70091 
State-Changed-From-To: feedback->closed 
State-Changed-By: thierry 
State-Changed-When: Sun Aug 8 22:13:39 GMT 2004 
State-Changed-Why:  

Approved by maintainer and committed. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=70091 
>Unformatted:

=====================================================

[Copied from PR 70188]

 * Thierry Thomas <thierry@pompo.net> [040806 21:40]:

 Hello Thomas,

 > >Description:
 >      www/wml installs perl arch-dependent files in a special directory
 >      which requires running `perl -MConfig -we 'print $Config{archname}'`
 >      to build pkg-plist.
 > >How-To-Repeat:
 >      make install.
 > >Fix:
 >      The following patch uses $PERL_ARCH.

 works for me.

 Regards,
  Christian

 --
 Lieber Himbeergeist als gar keinen Verstand.
 http://www.lackas.net/ Perl Delphi Linux MP3 Searchengines Domainchecker

