-fpkg ${CLOOG_PPL} "ftp://gcc.gnu.org/pub/gcc/infrastructure"
-fpkg_gnu ${BINUTILS}
-fpkg_gnu ${GCC} "gcc/${GCC}"
-fpkg ${EGLIBC} "http://cross-lfs.org/files/packages/svn"
-fpkg ${EGLIBC_PORTS} "http://cross-lfs.org/files/packages/svn"
+fpkg -e "tar.gz" ${CLOOG_PPL} "ftp://gcc.gnu.org/pub/gcc/infrastructure"
+fpkg -m gnu ${BINUTILS}
+fpkg -m gnu -s "gcc/${GCC}" ${GCC}
+fpkg ${EGLIBC} ${CLFS_PKG_SVN_URL}
+fpkg ${EGLIBC_PORTS} ${CLFS_PKG_SVN_URL}