From 0b7208c13602e0d03b2b55b40c11e109e193c5b5 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Sat, 22 Jul 2017 17:02:05 +0700 Subject: development/makedepf90: Removed (Upstream is gone). Signed-off-by: Willy Sudiarto Raharjo --- development/makedepf90/01-adds-B-PATH-option.patch | 243 --------------------- development/makedepf90/README | 12 - development/makedepf90/makedepf90.SlackBuild | 112 ---------- development/makedepf90/makedepf90.info | 10 - development/makedepf90/slack-desc | 19 -- 5 files changed, 396 deletions(-) delete mode 100644 development/makedepf90/01-adds-B-PATH-option.patch delete mode 100644 development/makedepf90/README delete mode 100644 development/makedepf90/makedepf90.SlackBuild delete mode 100644 development/makedepf90/makedepf90.info delete mode 100644 development/makedepf90/slack-desc (limited to 'development') diff --git a/development/makedepf90/01-adds-B-PATH-option.patch b/development/makedepf90/01-adds-B-PATH-option.patch deleted file mode 100644 index f1c217ea0f464..0000000000000 --- a/development/makedepf90/01-adds-B-PATH-option.patch +++ /dev/null @@ -1,243 +0,0 @@ -From 76a2fc5c3fa8edb17a6e9e15d5ef519768f9ccff Mon Sep 17 00:00:00 2001 -From: Jason Graham -Date: Wed, 18 Nov 2015 01:37:05 -0500 -Subject: [PATCH] makedepf90: Adds the '-B PATH' option to mirror src directory - structure in object PATH. - -When working on one of my projects, I wanted to preserve the directory -structure used in the source tree within the objects PATH. The main -issue was naming collisions with the '-b' option, since I have -sub-directories within the source tree and some of the files have the -same name resulting in the same objects within PATH. So '-B' behaves -similarly to '-b', but places resulting objects within PATH using the -same directory structure as the source files. The motivation for this -addition is to be able to have equivalent source file names contained -within different directories and still use the same top level objects -PATH. ---- - global.h | 3 +++ - main.c | 31 ++++++++++++++++++++++++------- - makedepf90.1 | 11 +++++++++-- - utils.c | 14 ++++++++++---- - utils.h | 3 ++- - 5 files changed, 48 insertions(+), 14 deletions(-) - -diff --git a/global.h b/global.h -index 1704f82..64a627e 100644 ---- a/global.h -+++ b/global.h -@@ -1,5 +1,6 @@ - /* - * Copyright (C) 2000-2005 Erik Edelmann -+ * Copyright (C) 2015 Jason Graham - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General Public -@@ -68,6 +69,8 @@ typedef struct { - char *link_rule; - bool coco; /* Look for coco set-files */ - bool obj_dir_set; /* Option -b obj_dir was used */ -+ bool obj_dir_mirror; /* Option -B obj_dir was used; turns on -+ mirroring of src directory structure */ - char *obj_dir; /* Directory set by option -b */ - bool src_dep; /* List the source file in the dependencys */ - bool src_path_set; /* option -I was used */ -diff --git a/main.c b/main.c -index e73bdef..d78f355 100644 ---- a/main.c -+++ b/main.c -@@ -1,5 +1,6 @@ - /* - * Copyright (C) 2000-2006 Erik Edelmann -+ * Copyright (C) 2015 Jason Graham - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General Public -@@ -86,6 +87,8 @@ static const char helpstring[] = - "\n-coco\tLook for coco set-files. Implies '-free'.\n" - "\n-D NAME\tDefine pre-processor symbol 'NAME'\n" - "\n-b PATH\tAssume object files are placed in PATH.\n" -+ "\n-B PATH\tAssume object files are placed in PATH using the same\n" -+ "\tdirectory structure as the source files.\n" - "\n-nosrc\tRemove the explicit dependency on the source file\n" - "\n-I PATH1:PATH2:...\n\tSearch path(s) for source files\n" - "\n\nReport bugs to erik.edelmann@iki.fi\n"; -@@ -143,6 +146,7 @@ int main (int argc, char **argv) - options.link_rule = (char *)LINK_RULE_DEFAULT; - options.coco = false; - options.obj_dir_set = false; -+ options.obj_dir_mirror = false; - options.obj_dir = ""; - options.src_dep = true; - options.ignore_mods = NULL; -@@ -276,9 +280,18 @@ int main (int argc, char **argv) - if (!list_find(macrolist, mac, ¯ocmp)) - macrolist = list_prepend(macrolist, mac); - -- } else if (strncmp(argv[i], "-b", 2) == 0) { -+ } else if (strncmp(argv[i], "-b", 2) == 0 || -+ strncmp(argv[i], "-B", 2) == 0 ) { -+ -+ /* Construct custom error message */ -+ char err_msg[32]; -+ char _argv[3]; -+ -+ strncpy(_argv,argv[i],2); _argv[2]='\0'; -+ snprintf(err_msg,sizeof(err_msg),"Option '%s' needs argument",_argv); -+ - if (strlen(argv[i]) == 2) { -- if (i == argc - 1) fatal_error("Option '-b' needs argument"); -+ if (i == argc - 1) fatal_error(err_msg); - options.obj_dir = xstrdup(argv[++i]); - } else - if (argv[i][2] == '=') { -@@ -292,7 +305,11 @@ int main (int argc, char **argv) - strcat(options.obj_dir, "/"); - } - -- options.obj_dir_set = true; -+ options.obj_dir_set = true; -+ /* Have to compare with '_argv' since 'i' may be modified above */ -+ if(strncmp(_argv, "-B", 2) == 0) { -+ options.obj_dir_mirror = true; -+ } - - } else if (strncmp(argv[i], "-I", 2) == 0) { - int jp; -@@ -383,7 +400,7 @@ int main (int argc, char **argv) - printf("FOBJ="); - for (h1 = obj; h1; h1 = h1->next) - if (options.obj_dir_set) -- printf("%s ", set_path(h1->data, options.obj_dir)); -+ printf("%s ", set_path(h1->data, options.obj_dir, options.obj_dir_mirror)); - else - printf("%s ", (char *)h1->data); - printf("\n\n%s: $(FOBJ)\n\t%s\n\n", options.exe_name,options.link_rule); -@@ -402,8 +419,8 @@ int main (int argc, char **argv) - /* Targets */ - for (h2 = dep->targets; h2; h2 = h2->next) - if (options.obj_dir_set) -- printf("%s ", set_path(h2->data, options.obj_dir)); -- else -+ printf("%s ", set_path(h2->data, options.obj_dir, options.obj_dir_mirror)); -+ else - printf("%s ", (char *)h2->data); - - printf(": ");; -@@ -430,7 +447,7 @@ int main (int argc, char **argv) - } else { - if (options.obj_dir_set) - printf("%s ", -- set_path(mod->modfile_name, options.obj_dir)); -+ set_path(mod->modfile_name, options.obj_dir, options.obj_dir_mirror)); - else - printf("%s ", mod->modfile_name); - } -diff --git a/makedepf90.1 b/makedepf90.1 -index 49bcfb7..738ce66 100644 ---- a/makedepf90.1 -+++ b/makedepf90.1 -@@ -1,5 +1,6 @@ - .\" - .\" Copyright (C) 2000--2003 Erik Edelmann -+.\" Copyright (C) 2015 Jason Graham - .\" - .\" This program is free software; you can redistribute it - .\" and/or modify it under the terms of the GNU General Public -@@ -18,7 +19,7 @@ - .\" Boston, MA 02111-1307 USA - .\" - .\" $Format: ".TH makedepf90 1 \"$Date$\""$ --.TH makedepf90 1 "Thu, 06 Dec 2001 23:28:54 +0200" -+.TH makedepf90 1 "Tue, 17 Nov 2015 23:21:02 -0500" - - .SH NAME - makedepf90 \- creates Makefile dependency list for Fortran source files. -@@ -45,7 +46,7 @@ makedepf90 \- creates Makefile dependency list for Fortran source files. - .RB [ \-coco ] - .RB [ \-D - .IR NAME ] --.RB [ \-b -+.RB [ \-b | \-B - .IR "path" ] - .RB [ \-I - .IR "PATH1:PATH2:..." ] -@@ -211,6 +212,12 @@ Dependency tree and link rule will assume objects are placed in \fIpath\fP. - This is useful if the build places object files in a different directory than - the source files. - .TP -+.BI \-B " path" -+Dependency tree and link rule will assume objects are placed in \fIpath\fP using -+the same directory structure as the source files. This is useful if the build -+places object files in a different directory than the source files and the -+source directory structure is needed to avoid object name collisions. -+.TP - .BI \-I " list-of-paths" - Look for source/include files in the \fIlist-of-paths\fP, if not found in - current working directory. Here, \fIlist-of-paths\fP is a colon separated -diff --git a/utils.c b/utils.c -index 08f6905..e5d3aff 100644 ---- a/utils.c -+++ b/utils.c -@@ -1,5 +1,6 @@ - /* - * Copyright (C) 2000-2005 Erik Edelmann -+ * Copyright (C) 2015 Jason Graham - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General Public -@@ -70,22 +71,27 @@ char *replace_suffix(const char *filename, const char *new_suffix) - - - /* If filename has no path, append 'path' to the beginning of the filename, -- * else replace the existing path (everything before the first '/') with 'path'. -+ * else replace the existing path if 'mirror=false' (everything before the first '/') with 'path' or -+ * prepend 'path' in the case that 'mirror=true' - */ - --char *set_path(const char *filename, const char *path) -+char *set_path(const char *filename, const char *path, const bool mirror) - { - char *rs; - int fl, n, pl, nl; - - pl = strlen(path); - -+ - fl = n = strlen(filename); -- while (filename[n] != '/' && n >= 0) n--; -+ if( !mirror ) -+ while (filename[n] != '/' && n >= 0) n--; -+ else -+ n=-1; - nl = fl - n - 1; - - if (n == -1) { -- /* if there was no '/' */ -+ /* if there was no '/' or 'mirror=true' */ - rs = (char *)xmalloc((fl+pl+2)*sizeof(char)); - strcpy(rs, path); - strcat(rs, filename); -diff --git a/utils.h b/utils.h -index 643d276..ca932ef 100644 ---- a/utils.h -+++ b/utils.h -@@ -1,5 +1,6 @@ - /* - * Copyright (C) 2000-2005 Erik Edelmann -+ * Copyright (C) 2015 Jason Graham - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General Public -@@ -21,7 +22,7 @@ - #define UTILS_H_ - - char *replace_suffix (const char *filename, const char *new_suffix); --char *set_path (const char *filename, const char *path); -+char *set_path (const char *filename, const char *path, const bool mirror); - char *remove_citation (const char *s); - char *expand_rule(const char *rule, const char *srcfile); - FILE *open_src_file (const char *fname, const List *path); --- -1.8.4 - diff --git a/development/makedepf90/README b/development/makedepf90/README deleted file mode 100644 index fc68a5eb038ae..0000000000000 --- a/development/makedepf90/README +++ /dev/null @@ -1,12 +0,0 @@ -Makedepf90 is a program for automatic creation of Makefile-style dependency -lists for Fortran source code. Makedepf90 supports MODULE:s, INCLUDE:s, cpp -#include:s, f90ppr $include:s and coco ??include:s and set-files. - -Also included is a patch which adds the '-B PATH' option to mirror the source -directory structure in PATH. This patch has been submitted to the current -makedepf90 maintainer Alastair McKinstry for inclusion in -future upstream releases. - -To build the patched version, do this: - - "PATCH=yes ./makedepf90.SlackBuild" diff --git a/development/makedepf90/makedepf90.SlackBuild b/development/makedepf90/makedepf90.SlackBuild deleted file mode 100644 index ee31fdfbcd50d..0000000000000 --- a/development/makedepf90/makedepf90.SlackBuild +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh - -# Slackware build script for makedepf90 - -# Copyright 2015 Jason Graham -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=makedepf90 -VERSION=${VERSION:-2.8.8} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# PATCH lets the user apply the "-B PATH" option patch -PATCH=${PATCH:-no} - -# Apply patches -if [ "$PATCH" = "yes" ]; then - for _p in $(ls $CWD/*.patch); do - patch -p1 -i $_p - done -fi - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --build=$ARCH-slackware-linux - -make -ginstall -d $PKG/usr/bin -ginstall $PRGNAM $PKG/usr/bin -ginstall -d $PKG/usr/man/man1 -ginstall $PRGNAM.1 $PKG/usr/man/man1 - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/development/makedepf90/makedepf90.info b/development/makedepf90/makedepf90.info deleted file mode 100644 index f5d48c56a3677..0000000000000 --- a/development/makedepf90/makedepf90.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="makedepf90" -VERSION="2.8.8" -HOMEPAGE="http://personal.inet.fi/private/erikedelmann/makedepf90/" -DOWNLOAD="http://personal.inet.fi/private/erikedelmann/makedepf90/makedepf90-2.8.8.tar.gz" -MD5SUM="514a32147e956264ac5e60cc12fd5f5d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Jason Graham" -EMAIL="jgraha8@gmail.com" diff --git a/development/makedepf90/slack-desc b/development/makedepf90/slack-desc deleted file mode 100644 index 58e8685b952f2..0000000000000 --- a/development/makedepf90/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -makedepf90: makedepf90 (Makefile-style dependency generator for Fortran) -makedepf90: -makedepf90: Makedepf90 is a program for automatic creation of Makefile-style -makedepf90: dependency lists for Fortran source code. Makedepf90 supports -makedepf90: MODULE:s, INCLUDE:s, cpp #include:s, f90ppr $include:s and coco -makedepf90: ??include:s and set-files. -makedepf90: -makedepf90: Homepage: http://personal.inet.fi/private/erikedelmann/makedepf90 -makedepf90: -makedepf90: -makedepf90: -- cgit v1.2.3