Date: Tue, 23 Aug 2005 19:32:21 GMT From: Marco van de Voort <marcov@stack.nl> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/85255: [Maintainer] Fix [Broken] status of lang/fpc-devel Message-ID: <200508231932.j7NJWLg9003897@www.freebsd.org> Resent-Message-ID: <200508231940.j7NJeAbU085975@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85255
>Category: ports
>Synopsis: [Maintainer] Fix [Broken] status of lang/fpc-devel
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Aug 23 19:40:10 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Marco van de Voort
>Release: 5.4
>Organization:
Free Pascal Core
>Environment:
FreeBSD snail.stack.nl 5.4-RELEASE FreeBSD 5.4-RELEASE #11: Thu May 12 10:51:40 CEST 2005 root@snail.stack.nl:/usr/obj/usr/src/sys/SNAIL i386
>Description:
Fixes
- pkg-install paths being broken by addition of PORT_REVISION
- Newer GNU install refusing to install over old version.
>How-To-Repeat:
(no problems, just incomplete pkg-list as result of failing pkg-install)
>Fix:
diff -N -r -u fpc-devel.orig/Makefile fpc-devel/Makefile
--- fpc-devel.orig/Makefile Sun Jul 24 04:01:30 2005
+++ fpc-devel/Makefile Tue Aug 23 18:26:55 2005
@@ -13,6 +13,8 @@
ftp://ftp.freepascal.org/pub/fpc/beta/freebsd-${PORTVERSION}-ports/
DISTNAME= fpc-${PORTVERSION}-ports
EXTRACT_SUFX= .tar.bz2
+PATCHDIR= ${MASTERDIR}/patches
+PATCHFILES=
MAINTAINER= marco@freepascal.org
COMMENT= Delphi and Turbo Pascal compatible Pascal (commandline) compiler
@@ -20,7 +22,6 @@
BROKEN= Incomplete pkg-plist
DEPRECATED= ${BROKEN}
EXPIRATION_DATE=2005-09-22
-
.include <bsd.port.pre.mk>
USE_GMAKE= yes
diff -N -r -u fpc-devel.orig/patches/patch-rtl.freebsd.makefiles fpc-devel/patches/patch-rtl.freebsd.makefiles
--- fpc-devel.orig/patches/patch-rtl.freebsd.makefiles Thu Jan 1 01:00:00 1970
+++ fpc-devel/patches/patch-rtl.freebsd.makefiles Tue Aug 23 18:27:04 2005
@@ -0,0 +1,22 @@
+--- fpc/rtl/freebsd/Makefile.orig Tue Jan 6 00:34:24 2004
++++ fpc/rtl/freebsd/Makefile Tue Aug 23 16:32:05 2005
+@@ -232,7 +232,7 @@
+ ifndef USELIBGGI
+ USELIBGGI=NO
+ endif
+-override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings syscall sysctl baseunix unixutil unix initc dos dl termio objects printer sysutils typinfo systhrds classes math varutils
++override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings syscall sysctl baseunix unixutil unix initc dos dl termio objects printer sysutils typinfo systhrds classes math varutils
+ override TARGET_LOADERS+=prt0 cprt0 gprt0
+ override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
+ override INSTALL_FPCPACKAGE=y y
+--- fpc/rtl/freebsd/Makefile.fpc.orig Sat Jan 3 15:55:35 2004
++++ fpc/rtl/freebsd/Makefile.fpc Tue Aug 23 16:31:56 2005
+@@ -16,7 +16,7 @@
+ sysutils typinfo systhrds classes math varutils \
+ cpu mmx charset ucomplex crt getopts heaptrc lineinfo \
+ errors sockets gpm ipc terminfo \
+- video mouse keyboard console serial variants types sysctl dateutils \
++ video mouse keyboard console serial variants types dateutils \
+ sysconst cthreads
+
+ rsts=math varutils typinfo classes variants dateutils sysconst
diff -N -r -u fpc-devel.orig/pkg-install fpc-devel/pkg-install
--- fpc-devel.orig/pkg-install Wed Jan 7 11:14:04 2004
+++ fpc-devel/pkg-install Tue Aug 23 21:13:25 2005
@@ -7,7 +7,8 @@
FILES_DELETE="bin/ppc386 etc/fpc.cfg etc/fpc.cfg.orig"
-LIBDIR=${PKG_PREFIX}/lib/fpc/${PKGNAME##fpc-}
+LIBDIR=${PKG_PREFIX}/lib/fpc/${PKGNAME##fpc-devel-}
+LIBDIR=${LIBDIR%_*}
CHMOD=/bin/chmod
LN=/bin/ln
@@ -16,7 +17,7 @@
case "$ACTION" in
-POST-INSTALL)
+POST-INSTALL)
${CHMOD} 0555 ${LIBDIR}/ppc386
${CHMOD} 0555 ${LIBDIR}/samplecfg
${LN} -sf ${LIBDIR}/ppc386 ${PKG_PREFIX}/bin/ppc386
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508231932.j7NJWLg9003897>