Date: Sun, 9 Dec 2001 07:40:02 -0800 (PST) From: John Merryweather Cooper <john_m_cooper@yahoo.com> To: freebsd-ports@FreeBSD.org Subject: ports/32645 build broken on lang/fpc Message-ID: <200112091540.fB9Fe2c09896@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/32645; it has been noted by GNATS.
From: John Merryweather Cooper <john_m_cooper@yahoo.com>
To: "FreeBSD-gnats-submit @ freebsd . org" <FreeBSD-gnats-submit@freebsd.org>
Cc: Kuang-che Wu <kcwu@ck.tp.edu.tw>,
Mario Sergio Fujikawa Ferreira <lioux@uol.com.br>
Subject: ports/32645 build broken on lang/fpc
Date: Sun, 9 Dec 2001 07:31:28 -0800
--=_GlQXeG3ziZS81+
Content-Type: text/plain; format=flowed; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
See attached patch. This fixes things. There was a remaining BASH-ism
in the configure script that need eradicating, and two files needed
execute permission that weren't getting it. Also, resynced the build
so repeated make deinstall reinstall sequences won't fail.
P.S. lioux, this patch fixes the remaining issues that I discussed with
you earlier. Use this patch.
--
jmc || MacroHard -- \
|| the perfection of form over |
----------------------------------|| substance, marketing over |
Web: http://www.borgsdemons.com || performance, and greed over |
|| design . . . |
=====================================================================/
Public Key: http://www.borgsdemons.com/Personal/pgpkey.asc |
=====================================================================\
--=_GlQXeG3ziZS81+
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="fix-fpc1.txt"
# This is a patch for fpc to update it to fpc.new
#
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'patch' program with this file as input.
#
#### End of Preamble ####
#### Patch data follows ####
diff -u 'fpc/Makefile' 'fpc.new/Makefile'
Index: ./Makefile
--- ./Makefile Sat Dec 8 18:28:27 2001
+++ ./Makefile Sun Dec 9 07:16:55 2001
@@ -54,9 +54,10 @@
PLIST_SUB= LIBDIR=${LIBDIR}
# install staging area
-pre-install:
+pre-patch:
@${TAR} xf ${WRKSRC}/binary.tar --directory ${WRKSRC}
@${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC}
+ @${RM} -f ${WRKSRC}/install.sh
@${MKDIR} ${TEMP_PREFIX}
#unpack base system
@${TAR} zxf ${WRKSRC}/basefreebsd.tar.gz \
@@ -66,7 +67,6 @@
@${TAR} zxf ${WRKSRC}/basefreebsd.tar.gz \
--files-from ${FILESDIR}/tar-xlist \
--directory ${TEMP_PREFIX}/share
- @${RM} -f ${TEMP_EXECDIR}/ppc386
#unpack units
@${TAR} zxf ${WRKSRC}/utilfreebsd.tar.gz --directory ${TEMP_PREFIX}
@${TAR} zxf ${WRKSRC}/unitsfclfreebsd.tar.gz --directory ${TEMP_PREFIX}
@@ -99,8 +99,14 @@
${TEMP_PREFIX}/share/examples
@${RM} -rfd ${TEMP_EXMPDIR}/src
.endif
+
+do-patch:
#unpack and patch sample (working) configuration file
@${PATCH} --dir ${TEMP_LIBDIR} < ${FILESDIR}/fix-samplecfg
+
+post-patch:
+ @${RM} -f ${TEMP_EXECDIR}/ppc386
+ @${RM} -f ${TEMP_EXECDIR}/rstconv
do-install: install-parse-plist install-run-scripts run-pkg-install-script
diff -u 'fpc/files/fix-samplecfg' 'fpc.new/files/fix-samplecfg'
Index: ./files/fix-samplecfg
--- ./files/fix-samplecfg Thu Nov 29 07:44:42 2001
+++ ./files/fix-samplecfg Sun Dec 9 07:12:48 2001
@@ -1,5 +1,5 @@
--- samplecfg Sat Dec 23 15:02:40 2000
-+++ samplecfg.new Thu Nov 29 07:44:20 2001
++++ samplecfg.new Sun Dec 9 07:12:15 2001
@@ -4,7 +4,7 @@
#
# Generate Sample Free Pascal configuration file
@@ -9,6 +9,15 @@
echo 'Usage :'
echo 'samplecfg fpcdir confdir'
echo 'fpcdir = Path where FPC is installed'
+@@ -29,7 +29,7 @@
+ #
+ if [ -f $thefile ] ; then
+ mv $thefile $thefile.orig >/dev/null 2>&1
+- if [ $? == 0 ]; then
++ if [ $? -eq 0 ]; then
+ echo Saved old config to $thefile.orig
+ else
+ echo Could not save old config. Bailing out...
@@ -38,9 +38,15 @@
fi
diff -u 'fpc/pkg-install' 'fpc.new/pkg-install'
Index: ./pkg-install
--- ./pkg-install Sat Dec 8 18:28:27 2001
+++ ./pkg-install Sun Dec 9 07:16:12 2001
@@ -9,12 +9,15 @@
LN=/bin/ln
SH=/bin/sh
+CHMOD=/bin/chmod
case "$ACTION" in
POST-INSTALL)
- @${LN} -sf ${LIBDIR}/ppc386 ${PKG_PREFIX}/bin/ppc386
- @${SH} ${LIBDIR}/samplecfg ${LIBDIR} ${PKG_PREFIX}/etc
+ ${CHMOD} +x ${LIBDIR}/ppc386
+ ${CHMOD} +x ${LIBDIR}/samplecfg
+ ${LN} -sf ${LIBDIR}/ppc386 ${PKG_PREFIX}/bin/ppc386
+ ${SH} ${LIBDIR}/samplecfg ${LIBDIR} ${PKG_PREFIX}/etc
;;
DEINSTALL)
diff -u 'fpc/pkg-plist' 'fpc.new/pkg-plist'
Index: ./pkg-plist
--- ./pkg-plist Sat Dec 8 18:28:27 2001
+++ ./pkg-plist Sat Dec 8 23:22:54 2001
@@ -8,15 +8,12 @@
bin/h2pas
bin/plex
bin/postw32
-bin/ppc386
bin/ppdep
bin/ppudump
bin/ppufiles
bin/ppumove
bin/ptop
bin/pyacc
-bin/rstconv
-etc/ppc386.cfg
lib/fpc/1.0.4/msg/errord.msg
lib/fpc/1.0.4/msg/errore.msg
lib/fpc/1.0.4/msg/errores.msg
#### End of Patch data ####
#### ApplyPatch data follows ####
# Data version : 1.0
# Date generated : Sun Dec 9 07:21:19 2001
# Generated by : makepatch 2.00
# Recurse directories : Yes
# p 'Makefile' 5454 1007911015 0100644
# p 'files/fix-samplecfg' 794 1007910768 0100644
# p 'pkg-install' 427 1007910972 0100644
# p 'pkg-plist' 126580 1007882574 0100644
#### End of ApplyPatch data ####
#### End of Patch kit [created: Sun Dec 9 07:21:19 2001] ####
#### Checksum: 140 4120 51876 ####
--=_GlQXeG3ziZS81+--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112091540.fB9Fe2c09896>