- updated for 5.2

Changed files:
    amap-destdir.patch -> 1.2
    amap-path.patch -> 1.2

diff --git a/amap-destdir.patch b/amap-destdir.patch
index 1737b3433884213b9dfe764e68f2e2a05b29584f..81df241453678b5822775b86d548b8c286504576 100644 (file)
--- a/amap-destdir.patch
+++ b/amap-destdir.patch
@@ -1,17 +1,28 @@
---- amap-4.7/Makefile.am.fix   2004-12-11 22:05:34.373145128 +0000
-+++ amap-4.7/Makefile.am       2004-12-11 22:07:04.351466344 +0000
-@@ -28,10 +28,10 @@
+diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
+--- amap-5.2/Makefile.am       2005-09-22 17:39:18.000000000 +0200
++++ amap-5.2.new/Makefile.am   2008-09-18 18:14:01.000000000 +0200
+@@ -34,15 +34,15 @@
        $(CC) $(OPT_DEBUG) -o amapcrap amapcrap.c $(XLIBS) $(XLIBPATHS) $(XIPATHS) $(XDEFINES)
  
  install:      all
--      @echo Installing to $(PREFIX)$(DIR), change this by running ./configure --prefix=path
--      -mkdir -vp $(PREFIX)$(DIR) 2> /dev/null
--      cp amap amapcrap $(SCRIPTS) $(PREFIX)$(DIR)
--      cp $(MANPAGE) $(MANDIR)
-+      @echo Installing to $(DESTDIR)$(PREFIX)$(DIR), change this by running ./configure --prefix=path
-+      -mkdir -vp $(DESTDIR)$(PREFIX)$(DIR) 2> /dev/null
-+      cp amap amapcrap $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DIR)
-+      cp $(MANPAGE) $(DESTDIR)$(MANDIR)
+-      @echo Installing to $(PREFIX), change this by running ./configure --prefix=path
+-      -mkdir -vp $(PREFIX)$(BINDIR) 2> /dev/null
+-      -mkdir -vp $(PREFIX)$(DATADIR) 2> /dev/null
+-      -mkdir -vp $(PREFIX)$(MANDIR) 2> /dev/null
+-      -test -e amap.exe || cp -f amap amap6 amapcrap $(PREFIX)$(BINDIR)
+-      -test -e amap.exe && cp -f amap.exe amapcrap.exe $(PREFIX)$(BINDIR) || echo
+-      -cp -f $(SCRIPTS) $(PREFIX)$(DATADIR)
+-      -cp -f $(MANPAGE) $(PREFIX)$(MANDIR)
+-      -test $(PREFIX)$(BINDIR)/amap6 || cd $(PREFIX)$(BINDIR) && ln -s amap amap6
++      @echo Installing to $(DESTDIR)$(PREFIX), change this by running ./configure --prefix=path
++      -mkdir -vp $(DESTDIR)$(PREFIX)$(BINDIR) 2> /dev/null
++      -mkdir -vp $(DESTDIR)$(PREFIX)$(DATADIR) 2> /dev/null
++      -mkdir -vp $(DESTDIR)$(PREFIX)$(MANDIR) 2> /dev/null
++      -test -e amap.exe || cp -f amap amap6 amapcrap $(DESTDIR)$(PREFIX)$(BINDIR)
++      -test -e amap.exe && cp -f amap.exe amapcrap.exe $(DESTDIR)$(PREFIX)$(BINDIR) || echo
++      -cp -f $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DATADIR)
++      -cp -f $(MANPAGE) $(DESTDIR)$(PREFIX)$(MANDIR)
++      -test $(DESTDIR)$(PREFIX)$(BINDIR)/amap6 || cd $(DESTDIR)$(PREFIX)$(BINDIR) && ln -s amap amap6
  
  clean:        
        cd pcre-3.9 && make clean

diff --git a/amap-path.patch b/amap-path.patch
index 484cbdccdcc0d76bf9f25deada2597223bce9868..cbbce67142734f2830e3721947747bbe76e2b2dd 100644 (file)
--- a/amap-path.patch
+++ b/amap-path.patch
@@ -1,38 +1,38 @@
---- amap-4.7/amap.h.fix        2004-12-11 23:04:05.412386032 +0000
-+++ amap-4.7/amap.h    2004-12-11 23:04:42.033818728 +0000
-@@ -29,11 +29,11 @@
-   #warning "PREFIX definition found, installing to this prefix directory location"
-   #define AMAP_PREFIX         PREFIX
-  #else
--  #define AMAP_PREFIX         "/usr/local"
-+  #define AMAP_PREFIX         "/usr"
-  #endif
- #endif
- 
--#define AMAP_APPDEF_PATH      AMAP_PREFIX"/bin"
-+#define AMAP_APPDEF_PATH      AMAP_PREFIX"/share/amap"
- #define AMAP_BUFSIZE          1024    // standard buffer size
- #define AMAP_BUFSIZE_BIG      65536   // big standard buffer size
- #define AMAP_REGEX_OPTIONS    ( PCRE_MULTILINE | PCRE_CASELESS | PCRE_DOTALL )
---- amap-4.7/Makefile.am.fix   2004-12-11 23:19:55.632930552 +0000
-+++ amap-4.7/Makefile.am       2004-12-11 23:20:09.084885544 +0000
-@@ -5,6 +5,7 @@
- DIR=/bin
+diff -urN amap-5.2/amap-lib.c amap-5.2.new/amap-lib.c
+--- amap-5.2/amap-lib.c        2005-09-07 23:22:24.000000000 +0200
++++ amap-5.2.new/amap-lib.c    2008-09-18 18:29:01.000000000 +0200
+@@ -306,7 +306,7 @@
+       strcpy(file_name, AMAP_PREFIX);
+       if (file_name[strlen(file_name) - 1] != '/')
+         strcat(file_name, "/");
+-      strcat(file_name, "etc/");
++      strcat(file_name, "share/amap/");
+       strcat(file_name, AMAP_DEFAULT_FILENAME);
+       strcat(file_name, extension);
+       f = fopen(file_name, "r");
+@@ -2032,9 +2032,9 @@
+   if (opt->update) {
+     printf("Running Online Update for fingerprints, connecting to %s\n", AMAP_RESOURCE);
+     if (opt->filename == NULL) {
+-      opt->filename = malloc(strlen(AMAP_PREFIX) + 5 + strlen(AMAP_DEFAULT_FILENAME) + 2);
++      opt->filename = malloc(strlen(AMAP_PREFIX) + 12 + strlen(AMAP_DEFAULT_FILENAME) + 2);
+       strcpy(opt->filename, AMAP_PREFIX);
+-      strcat(opt->filename, "/etc/");
++      strcat(opt->filename, "/share/amap/");
+       strcat(opt->filename, AMAP_DEFAULT_FILENAME);
+     }
+     opt->file_log = malloc(strlen(opt->filename) + 6);
+diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
+--- amap-5.2/Makefile.am       2005-09-22 17:39:18.000000000 +0200
++++ amap-5.2.new/Makefile.am   2008-09-18 18:32:07.000000000 +0200
+@@ -3,8 +3,8 @@
+ OPT=-O2
+ OPT_DEBUG=-ggdb -Wall -lefence
+ BINDIR=/bin
+-DATADIR=/etc
+-MANDIR=/man/man1
++DATADIR=/share/amap
++MANDIR=/share/man/man1
  SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
  MANPAGE=amap.1
-+DATADIR=/share/amap
  all:  pcre strip
- 
- pcre:
-@@ -30,7 +31,10 @@
- install:      all
-       @echo Installing to $(DESTDIR)$(PREFIX)$(DIR), change this by running ./configure --prefix=path
-       -mkdir -vp $(DESTDIR)$(PREFIX)$(DIR) 2> /dev/null
--      cp amap amapcrap $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DIR)
-+      mkdir -p $(DESTDIR)$(PREFIX)$(DATADIR)
-+      mkdir -p $(DESTDIR)$(MANDIR)
-+      cp amap amapcrap $(DESTDIR)$(PREFIX)$(DIR)
-+      cp $(SCRIPTS) $(DESTDIR)$(PREFIX)$(DATADIR)
-       cp $(MANPAGE) $(DESTDIR)$(MANDIR)
- 
- clean: