Attachment 18101 Details for Bug 32645 – fix-fpc1.txt

fix-fpc1.txt

fix-fpc1.txt (text/plain; charset=us-ascii), 4.06 KB, created by John Merryweather Cooper on 2001-12-09 15:31:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Merryweather Cooper

Created: 2001-12-09 15:31:28 UTC

Size: 4.06 KB

patch

obsolete

># 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 ####

Actions: View

Attachments on bug 32645: 18101