pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
agm: Imported into pkgsrc
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Wed Jul 27 22:56:37 2016 +0200
Changeset: 50df5db88edb2f6be91f2063f3b31e6939d5163f
Removed Files:
agm/DESCR
agm/Makefile
agm/PLIST
agm/distinfo
agm/patches/patch-Makefile
agm/patches/patch-agm.h
agm/patches/patch-gobble.c
agm/patches/patch-listfuncs.c
agm/patches/patch-main.c
agm/patches/patch-output.c
agm/patches/patch-process.c
agm/patches/patch-progress.c
agm/patches/patch-sort.c
agm/patches/patch-wordfuncs.c
Log Message:
agm: Imported into pkgsrc
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=50df5db88edb2f6be91f2063f3b31e6939d5163f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
agm/DESCR | 1 -
agm/Makefile | 38 --------------------------------
agm/PLIST | 5 -----
agm/distinfo | 16 --------------
agm/patches/patch-Makefile | 45 --------------------------------------
agm/patches/patch-agm.h | 24 --------------------
agm/patches/patch-gobble.c | 25 ---------------------
agm/patches/patch-listfuncs.c | 30 -------------------------
agm/patches/patch-main.c | 26 ----------------------
agm/patches/patch-output.c | 28 ------------------------
agm/patches/patch-process.c | 23 -------------------
agm/patches/patch-progress.c | 49 -----------------------------------------
agm/patches/patch-sort.c | 18 ---------------
agm/patches/patch-wordfuncs.c | 51 -------------------------------------------
14 files changed, 379 deletions(-)
diffs:
diff --git a/agm/DESCR b/agm/DESCR
deleted file mode 100644
index 33d6af6..0000000
--- a/agm/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Multiple-word anagram search program.
diff --git a/agm/Makefile b/agm/Makefile
deleted file mode 100644
index fe3bb3d..0000000
--- a/agm/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD$
-
-DISTNAME= agm-1.3.1
-CATEGORIES= games
-MASTER_SITES= ftp://ftp.ibiblio.org/pub/linux/games/amusements/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= ftp://ftp.ibiblio.org/pub/linux/games/amusements/
-COMMENT= Multiple-word anagram search program
-LICENSE= generic-nonlicense
-
-SUBST_CLASSES+= rcsids
-SUBST_MESSAGE.rcsids= Strip RCS IDs as they cause problems when patching.
-SUBST_STAGE.rcsids= pre-patch
-SUBST_FILES.rcsids+= agm.h
-SUBST_FILES.rcsids+= gobble.c
-SUBST_FILES.rcsids+= listfuncs.c
-SUBST_FILES.rcsids+= main.c
-SUBST_FILES.rcsids+= output.c
-SUBST_FILES.rcsids+= process.c
-SUBST_FILES.rcsids+= progress.c
-SUBST_FILES.rcsids+= sort.c
-SUBST_FILES.rcsids+= wordfuncs.c
-SUBST_SED.rcsids= -e "s!.Revision: !Revision: !"
-
-MAKE_FLAGS+= BINDIR=${PREFIX}/bin
-MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
-MAKE_FLAGS+= WORDDIR=${PREFIX}/share/agm
-MAKE_FLAGS+= CC=${CC:Q}
-
-INSTALL_TARGET= install install-words
-
-REPLACE_INTERPRETER+= wish
-REPLACE.wish.old= /usr/bin/wish
-REPLACE.wish.new= ${PREFIX}/bin/wish
-REPLACE_FILES.wish= xagm
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/agm/PLIST b/agm/PLIST
deleted file mode 100644
index b9effce..0000000
--- a/agm/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD$
-bin/agm
-bin/xagm
-man/man6/agm.6
-share/agm/words
diff --git a/agm/distinfo b/agm/distinfo
deleted file mode 100644
index 5809720..0000000
--- a/agm/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-SHA1 (agm-1.3.1.tar.gz) = 9afcbd47e8bbb79e2f08d009d10e9690ae9f200d
-RMD160 (agm-1.3.1.tar.gz) = b348b99ef9ef58f474d7a0acff572c369bbaf55e
-SHA512 (agm-1.3.1.tar.gz) = 143c6c3a31e542f59bbb0fab4372a2747f78b299fff07b9f136b41c930423b27a56f1c9635efa1248caf05d0449f6e63a0c5ed86d136a1c3ffa6309d64297687
-Size (agm-1.3.1.tar.gz) = 420211 bytes
-SHA1 (patch-Makefile) = c110bb95255a95e704bdf22982e37e70e3f88ea3
-SHA1 (patch-agm.h) = f42842dd674aef9916db797e3129d4f19ed08874
-SHA1 (patch-gobble.c) = 3de1579992333e14ac4b79aa3af769ec8b90a36a
-SHA1 (patch-listfuncs.c) = 5435c91ef466ed5b4d45a07e901719d351aead0c
-SHA1 (patch-main.c) = 2c78fe21976e70c2c4c0901eb43e47e3d1a9c481
-SHA1 (patch-output.c) = d2cef6500c8e3722b2b8585e225404f8eacb4447
-SHA1 (patch-process.c) = e45c178c4222bfe22322a6b021695555dc04292f
-SHA1 (patch-progress.c) = e78a24afff320c0d01431b514a1c61d1c3426a03
-SHA1 (patch-sort.c) = 77f811b6eb166182a0cbe133546a4fc2ac222bac
-SHA1 (patch-wordfuncs.c) = 2b180cbabc3f5c7178b2c52a8deb619ed54c485a
diff --git a/agm/patches/patch-Makefile b/agm/patches/patch-Makefile
deleted file mode 100644
index d58172f..0000000
--- a/agm/patches/patch-Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-Adapt install target for pkgsrc.
-
---- Makefile.orig 1998-03-18 01:02:29.000000000 +0000
-+++ Makefile
-@@ -40,6 +40,7 @@
- RELEASE=-DRELEASE=\"1.3\"
- # Set this to the destination directory for the executable
- #BINDIR=../../bin/`uname`
-+DESTDIR?=
- BINDIR=/usr/local/bin
- # Location of manual pages
- #MANDIR=../../man
-@@ -93,18 +94,22 @@ sample_output: agm
- ./agm -c2 williamshatner leonardnimoy > sample_output
-
- $(MANDIR)/man6:
-- mkdir $(MANDIR)/man6
-+ install -d $(DESTDIR)$(MANDIR)/man6
-
- install: agm agm.6 $(MANDIR)/man6
-- strip agm
-- cp {,x}agm $(BINDIR)
-- chmod 755 $(BINDIR)/{,x}agm
-- cp agm.6 $(MANDIR)/man6
-- chmod 644 $(MANDIR)/man6/agm.6
-+ install -d $(DESTDIR)$(BINDIR)
-+ cp agm $(DESTDIR)$(BINDIR)
-+ cp xagm $(DESTDIR)$(BINDIR)
-+ chmod 755 $(DESTDIR)$(BINDIR)/agm
-+ chmod 755 $(DESTDIR)$(BINDIR)/xagm
-+ install -d $(DESTDIR)$(MANDIR)/man6
-+ cp agm.6 $(DESTDIR)$(MANDIR)/man6
-+ chmod 644 $(DESTDIR)$(MANDIR)/man6/agm.6
-
- install-words:
-- cp words $(WORDDIR)
-- chmod 644 $(WORDDIR)/words
-+ install -d $(DESTDIR)$(WORDDIR)
-+ cp words $(DESTDIR)$(WORDDIR)
-+ chmod 644 $(DESTDIR)$(WORDDIR)/words
-
- clean:
- rm -f agm agm.o agm*.tar* agm*.shar agm.ps *.o
diff --git a/agm/patches/patch-agm.h b/agm/patches/patch-agm.h
deleted file mode 100644
index a1b6ee0..0000000
--- a/agm/patches/patch-agm.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Fix K&R code.
-
---- agm.h.orig 2016-07-27 20:12:55.337407545 +0000
-+++ agm.h
-@@ -134,5 +134,15 @@ extern struct wnode *lstart, *lend;
- extern char main_RCSid[], gobble_RCSid[], listfuncs_RCSid[], output_RCSid[],
- process_RCSid[], sort_RCSid[], wordfuncs_RCSid[], progress_RCSid[];
-
--extern void copysmall();
--extern void arm_timer(), disarm_timer();
-+extern void copysmall(char *, char *);
-+extern void arm_timer(void), disarm_timer(void);
-+extern int contains (char *, char *, unsigned int *);
-+extern int addword (char *, struct wnode **, struct wnode **);
-+extern int eliminate (char *, char *, char *);
-+extern void print_prevs (int);
-+extern void destroy_list (struct wnode *, struct wnode *);
-+extern void gobble_file (char *, char *);
-+extern void merge_sort (struct wnode **, int);
-+extern void list_dictionary (struct wnode *);
-+extern void minus_process (char *, char *);
-+extern void process (char *, struct wnode *, struct wnode *, unsigned int, unsigned int, unsigned int);
diff --git a/agm/patches/patch-gobble.c b/agm/patches/patch-gobble.c
deleted file mode 100644
index 3a03a09..0000000
--- a/agm/patches/patch-gobble.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-Fix K&R code.
-
---- gobble.c.orig 2016-07-27 20:12:55.340913088 +0000
-+++ gobble.c
-@@ -22,8 +22,11 @@ char gobble_RCSid[] = "Revision: 1.4 $";
-
- #include "agm.h"
-
--gobble_file (filename, command)
-- char *filename, *command;
-+#include <stdlib.h>
-+#include <unistd.h>
-+
-+void
-+gobble_file (char *filename, char *command)
- {
- FILE *fp;
- int is_a_tty2 = 0;
-@@ -81,4 +84,3 @@ gobble_file (filename, command)
- }
- if (notquiet) printf (" %d words\n", wordcount - before_count);
- }
--
diff --git a/agm/patches/patch-listfuncs.c b/agm/patches/patch-listfuncs.c
deleted file mode 100644
index df135dc..0000000
--- a/agm/patches/patch-listfuncs.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-Fix K&R code.
-
---- listfuncs.c.orig 2016-07-27 20:12:55.344357171 +0000
-+++ listfuncs.c
-@@ -18,8 +18,10 @@ char listfuncs_RCSid[] = "Revision: 1.3
-
- #include "agm.h"
-
--destroy_list (ls, le)
-- struct wnode *ls, *le;
-+#include <stdlib.h>
-+
-+void
-+destroy_list (struct wnode *ls, struct wnode *le)
- {
- struct wnode *loop = ls, *last;
-
-@@ -30,9 +32,7 @@ destroy_list (ls, le)
- }
- }
-
--int addword (word, ls, le)
-- char *word;
-- struct wnode **ls, **le;
-+int addword (char *word, struct wnode **ls, struct wnode **le)
- {
- struct wnode *new;
- int i;
diff --git a/agm/patches/patch-main.c b/agm/patches/patch-main.c
deleted file mode 100644
index 858b24f..0000000
--- a/agm/patches/patch-main.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-Fix K&R code.
-
---- main.c.orig 2016-07-27 20:12:55.347835407 +0000
-+++ main.c
-@@ -60,6 +60,7 @@ char main_RCSid[] = "Revision: 1.11 $";
- #include "agm.h"
- /* following just for getrusage () */
- #include <unistd.h>
-+#include <stdlib.h>
-
- int listdict = FALSE; /* just output the final word dictionary */
- int hardmin = FALSE; /* hard minimums on words */
-@@ -86,9 +87,8 @@ struct wnode *lstart = NULL, *lend = NUL
-
- int pct= 0, lastpct = -1; /* percentage complete counters */
-
--main (argc, argv)
-- int argc;
-- char **argv;
-+int
-+main (int argc, char **argv)
- {
- int wordno; /* loops along argument list */
- void matchwords ();
diff --git a/agm/patches/patch-output.c b/agm/patches/patch-output.c
deleted file mode 100644
index 3fb5dbf..0000000
--- a/agm/patches/patch-output.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-Fix K&R code.
-
---- output.c.orig 2016-07-27 20:12:55.351278093 +0000
-+++ output.c
-@@ -24,8 +24,8 @@ char output_RCSid[] = "Revision: 1.5 $";
-
- #include "agm.h"
-
--print_prevs (percent)
-- int percent;
-+void
-+print_prevs (int percent)
- {
- int loop;
-
-@@ -46,8 +46,8 @@ print_prevs (percent)
- spos += totlen + prevcount + 1;
- }
-
--list_dictionary (p)
-- struct wnode *p;
-+void
-+list_dictionary (struct wnode *p)
- {
- while (p != NULL) {
- puts (p->word);
diff --git a/agm/patches/patch-process.c b/agm/patches/patch-process.c
deleted file mode 100644
index 26ed600..0000000
--- a/agm/patches/patch-process.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-Fix K&R code.
-
---- process.c.orig 2016-07-27 20:12:55.354713027 +0000
-+++ process.c
-@@ -27,14 +27,11 @@ char process_RCSid[] = "Revision: 1.6 $"
-
- #include "agm.h"
-
--process (word, ls, le, minlen, maxw, depth)
-+void
-+process (char *word, struct wnode *ls, struct wnode *le, unsigned int minlen, unsigned int maxw, unsigned int depth)
- /* searches the list ls - le for words which can be extracted from
- word; if a word extracts exactly, the words in prevs are printed out,
- otherwise, a sublist is built, and process() called recursively */
-- char *word;
-- struct wnode *ls, *le;
-- unsigned int minlen;
-- unsigned int depth;
- {
- char newword[WORDLEN];
- struct wnode *loop;
diff --git a/agm/patches/patch-progress.c b/agm/patches/patch-progress.c
deleted file mode 100644
index 7928894..0000000
--- a/agm/patches/patch-progress.c
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
-Fix K&R code.
-
---- progress.c.orig 2016-07-27 20:12:55.358141535 +0000
-+++ progress.c
-@@ -7,18 +7,20 @@ char progress_RCSid[] = "Revision: 1.1 $
-
- #include "agm.h"
-
--void print_progress () {
-+#include <signal.h>
-+
-+void print_progress (int unused) {
- printf ("%02d\b\b", pct);
- fflush (stdout);
- }
-
--void arm_timer ()
-+void arm_timer (void)
- {
- struct sigaction action;
- struct itimerval tmr;
-
-- action.sa_handler = &print_progress;
-- action.sa_mask = 0;
-+ action.sa_handler = print_progress;
-+ sigemptyset(&action.sa_mask);
- action.sa_flags = 0;
- sigaction (SIGALRM, &action, NULL);
-
-@@ -29,7 +31,7 @@ void arm_timer ()
- setitimer (ITIMER_REAL, &tmr, NULL);
- }
-
--void disarm_timer ()
-+void disarm_timer (void)
- {
- struct sigaction action;
- struct itimerval tmr;
-@@ -41,7 +43,7 @@ void disarm_timer ()
- setitimer (ITIMER_REAL, &tmr, NULL);
-
- action.sa_handler = SIG_DFL;
-- action.sa_mask = 0;
-+ sigemptyset(&action.sa_mask);
- action.sa_flags = 0;
- sigaction (SIGALRM, &action, NULL);
- }
diff --git a/agm/patches/patch-sort.c b/agm/patches/patch-sort.c
deleted file mode 100644
index 93495af..0000000
--- a/agm/patches/patch-sort.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Fix K&R code.
-
---- sort.c.orig 2016-07-27 20:12:55.361585478 +0000
-+++ sort.c
-@@ -14,9 +14,8 @@ char sort_RCSid[] = "Revision: 1.2 $";
-
- #include "agm.h"
-
--merge_sort (start, length)
-- struct wnode **start;
-- int length;
-+void
-+merge_sort (struct wnode **start, int length)
- {
- struct wnode *p, *q, *s1, *s2;
- int i, cmp;
diff --git a/agm/patches/patch-wordfuncs.c b/agm/patches/patch-wordfuncs.c
deleted file mode 100644
index a65eebc..0000000
--- a/agm/patches/patch-wordfuncs.c
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD$
-
-Fix K&R code.
-
---- wordfuncs.c.orig 2016-07-27 20:12:55.365038920 +0000
-+++ wordfuncs.c
-@@ -14,9 +14,9 @@ char wordfuncs_RCSid[] = "Revision: 1.2
-
- #include "agm.h"
-
--int contains (word, subword, length)
-- char *word, *subword;
-- unsigned int *length;
-+#include <stdlib.h>
-+
-+int contains (char *word, char *subword, unsigned int *length)
- {
- char copyword[WORDLEN];
- char *cpos, *sloop;
-@@ -36,8 +36,7 @@ int contains (word, subword, length)
- return TRUE;
- }
-
--int eliminate (word, subword, remains)
-- char *word, *subword, *remains;
-+int eliminate (char *word, char *subword, char *remains)
- {
- char copyword[WORDLEN];
- char *remloop = remains, *copyloop = copyword;
-@@ -55,8 +54,8 @@ int eliminate (word, subword, remains)
- *remloop = '\0';
- }
-
--minus_process (word, command)
-- char *word, *command;
-+void
-+minus_process (char *word, char *command)
- {
- char *minus_pos, copy[WORDLEN];
- unsigned int dummy;
-@@ -78,9 +77,7 @@ minus_process (word, command)
- }
- }
-
--void copysmall (s1, s2)
-- char
-- *s1, *s2;
-+void copysmall (char *s1, char *s2)
- {
- while (*s2 != '\0') {
- if (*s2 >= 'A' && *s2 <= 'Z') {
Home |
Main Index |
Thread Index |
Old Index