Date: Wed, 22 Sep 2004 02:45:08 +0800 (CST) From: Yen-Ming Lee <leeym@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: max@FreeBSD.org Subject: ports/71982: [PATCH] lang/swi-pl: unbreak Message-ID: <20040921184508.1744D3EADE7@utopia.leeym.com> Resent-Message-ID: <200409211850.i8LIoQvF004325@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 71982
>Category: ports
>Synopsis: [PATCH] lang/swi-pl: unbreak
>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 Sep 21 18:50:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Yen-Ming Lee
>Release: FreeBSD 5.3-BETA4 i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.3-BETA4 FreeBSD 5.3-BETA4 #7: Mon Sep 13 05:12:30 CST 2004
>Description:
- swi-pi now installs files ARCH, not in ARCH-OS directories.
- correct CONFLICTS
Port maintainer (max@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- swi-pl-5.2.8_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/swi-pl/Makefile,v
retrieving revision 1.34
diff -u -u -r1.34 Makefile
--- Makefile 3 Jul 2004 23:49:08 -0000 1.34
+++ Makefile 21 Sep 2004 18:43:40 -0000
@@ -15,7 +15,7 @@
MAINTAINER= max@FreeBSD.org
COMMENT= Edinburgh-style Prolog compiler
-CONFLICTS= ploticus-* slffea-* TenDRA-*
+CONFLICTS= ploticus-[0-9]* slffea-[0-9]* TenDRA-[0-9]*
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --host=${MACHINE_ARCH}-${OPSYS:L} --disable-mt
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/lang/swi-pl/pkg-plist,v
retrieving revision 1.18
diff -u -u -r1.18 pkg-plist
--- pkg-plist 14 Jun 2004 22:28:17 -0000 1.18
+++ pkg-plist 21 Sep 2004 18:43:40 -0000
@@ -3,9 +3,9 @@
bin/plrc
include/SWI-Prolog.h
include/SWI-Stream.h
-lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%/pl
-lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%/plld
-lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%/plrc
+lib/%%DISTNAME%%/bin/%%ARCH%%/pl
+lib/%%DISTNAME%%/bin/%%ARCH%%/plld
+lib/%%DISTNAME%%/bin/%%ARCH%%/plrc
lib/%%DISTNAME%%/bin/swipl
lib/%%DISTNAME%%/boot/apply.pl
lib/%%DISTNAME%%/boot/autoload.pl
@@ -71,17 +71,17 @@
lib/%%DISTNAME%%/library/threadutil.pl
lib/%%DISTNAME%%/library/tty.pl
lib/%%DISTNAME%%/library/url.pl
-lib/%%DISTNAME%%/runtime/%%ARCH%%-%%OS%%/libpl.a
+lib/%%DISTNAME%%/runtime/%%ARCH%%/libpl.a
lib/%%DISTNAME%%/swipl
-@dirrm lib/%%DISTNAME%%/runtime/%%ARCH%%-%%OS%%
+@dirrm lib/%%DISTNAME%%/runtime/%%ARCH%%
@dirrm lib/%%DISTNAME%%/runtime
@dirrm lib/%%DISTNAME%%/man
@dirrm lib/%%DISTNAME%%/library
-@dirrm lib/%%DISTNAME%%/lib/%%ARCH%%-%%OS%%
+@dirrm lib/%%DISTNAME%%/lib/%%ARCH%%
@dirrm lib/%%DISTNAME%%/lib
@dirrm lib/%%DISTNAME%%/include
@dirrm lib/%%DISTNAME%%/dotfiles
@dirrm lib/%%DISTNAME%%/boot
-@dirrm lib/%%DISTNAME%%/bin/%%ARCH%%-%%OS%%
+@dirrm lib/%%DISTNAME%%/bin/%%ARCH%%
@dirrm lib/%%DISTNAME%%/bin
@dirrm lib/%%DISTNAME%%
--- swi-pl-5.2.8_2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040921184508.1744D3EADE7>