diff options
| -rw-r--r-- | lang/fpc-devel/Makefile | 6 | ||||
| -rw-r--r-- | lang/fpc-devel/pkg-install | 16 | ||||
| -rw-r--r-- | lang/fpc-devel/pkg-plist | 3 | ||||
| -rw-r--r-- | lang/fpc/Makefile | 6 | ||||
| -rw-r--r-- | lang/fpc/pkg-install | 16 | ||||
| -rw-r--r-- | lang/fpc/pkg-plist | 3 |
6 files changed, 34 insertions, 16 deletions
diff --git a/lang/fpc-devel/Makefile b/lang/fpc-devel/Makefile index f26640ff4d44..9b8ffbe58212 100644 --- a/lang/fpc-devel/Makefile +++ b/lang/fpc-devel/Makefile @@ -54,7 +54,7 @@ TEMP_EXMPDIR= ${TEMP_PREFIX}/share/examples PLIST_SUB= LIBDIR=${LIBDIR} # install staging area -pre-install: +post-extract: @${TAR} xf ${WRKSRC}/binary.tar --directory ${WRKSRC} @${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC} @${MKDIR} ${TEMP_PREFIX} @@ -66,7 +66,6 @@ pre-install: @${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} @@ -97,8 +96,9 @@ pre-install: @${TAR} zxf ${WRKSRC}/demo.tar.gz --directory ${TEMP_EXMPDIR} @${MV} ${TEMP_EXMPDIR}/src/fpc-${PORTVERSION} \ ${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 diff --git a/lang/fpc-devel/pkg-install b/lang/fpc-devel/pkg-install index a41e51a80852..36c515e8ec43 100644 --- a/lang/fpc-devel/pkg-install +++ b/lang/fpc-devel/pkg-install @@ -5,19 +5,31 @@ PKGNAME=$1 ACTION=$2 +FILES_DELETE="bin/ppc386 etc/ppc386.cfg etc/ppc386.cfg.orig" + LIBDIR=${PKG_PREFIX}/lib/fpc/${PKGNAME##fpc-} +CHMOD=/bin/chmod LN=/bin/ln +RM=/bin/rm SH=/bin/sh case "$ACTION" in POST-INSTALL) - @${LN} -sf ${LIBDIR}/ppc386 ${PKG_PREFIX}/bin/ppc386 - @${SH} ${LIBDIR}/samplecfg ${LIBDIR} ${PKG_PREFIX}/etc + ${CHMOD} 0555 ${LIBDIR}/ppc386 + ${CHMOD} 0555 ${LIBDIR}/samplecfg + ${LN} -sf ${LIBDIR}/ppc386 ${PKG_PREFIX}/bin/ppc386 + ${SH} ${LIBDIR}/samplecfg ${LIBDIR} ${PKG_PREFIX}/etc ;; DEINSTALL) + for file in ${FILES_DELETE} + do + if [ -f ${PKG_PREFIX}/${file} ]; then + ${RM} ${PKG_PREFIX}/${file} + fi + done ;; PRE-INSTALL|POST-DEINSTALL) diff --git a/lang/fpc-devel/pkg-plist b/lang/fpc-devel/pkg-plist index 278d0280e1fb..21a2bfcaa503 100644 --- a/lang/fpc-devel/pkg-plist +++ b/lang/fpc-devel/pkg-plist @@ -8,15 +8,12 @@ bin/fprcp 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 diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile index f26640ff4d44..9b8ffbe58212 100644 --- a/lang/fpc/Makefile +++ b/lang/fpc/Makefile @@ -54,7 +54,7 @@ TEMP_EXMPDIR= ${TEMP_PREFIX}/share/examples PLIST_SUB= LIBDIR=${LIBDIR} # install staging area -pre-install: +post-extract: @${TAR} xf ${WRKSRC}/binary.tar --directory ${WRKSRC} @${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC} @${MKDIR} ${TEMP_PREFIX} @@ -66,7 +66,6 @@ pre-install: @${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} @@ -97,8 +96,9 @@ pre-install: @${TAR} zxf ${WRKSRC}/demo.tar.gz --directory ${TEMP_EXMPDIR} @${MV} ${TEMP_EXMPDIR}/src/fpc-${PORTVERSION} \ ${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 diff --git a/lang/fpc/pkg-install b/lang/fpc/pkg-install index a41e51a80852..36c515e8ec43 100644 --- a/lang/fpc/pkg-install +++ b/lang/fpc/pkg-install @@ -5,19 +5,31 @@ PKGNAME=$1 ACTION=$2 +FILES_DELETE="bin/ppc386 etc/ppc386.cfg etc/ppc386.cfg.orig" + LIBDIR=${PKG_PREFIX}/lib/fpc/${PKGNAME##fpc-} +CHMOD=/bin/chmod LN=/bin/ln +RM=/bin/rm SH=/bin/sh case "$ACTION" in POST-INSTALL) - @${LN} -sf ${LIBDIR}/ppc386 ${PKG_PREFIX}/bin/ppc386 - @${SH} ${LIBDIR}/samplecfg ${LIBDIR} ${PKG_PREFIX}/etc + ${CHMOD} 0555 ${LIBDIR}/ppc386 + ${CHMOD} 0555 ${LIBDIR}/samplecfg + ${LN} -sf ${LIBDIR}/ppc386 ${PKG_PREFIX}/bin/ppc386 + ${SH} ${LIBDIR}/samplecfg ${LIBDIR} ${PKG_PREFIX}/etc ;; DEINSTALL) + for file in ${FILES_DELETE} + do + if [ -f ${PKG_PREFIX}/${file} ]; then + ${RM} ${PKG_PREFIX}/${file} + fi + done ;; PRE-INSTALL|POST-DEINSTALL) diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist index 278d0280e1fb..21a2bfcaa503 100644 --- a/lang/fpc/pkg-plist +++ b/lang/fpc/pkg-plist @@ -8,15 +8,12 @@ bin/fprcp 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 |