diff options
| -rw-r--r-- | net-p2p/napshare/Makefile | 5 | ||||
| -rw-r--r-- | net-p2p/napshare/distinfo | 2 | ||||
| -rw-r--r-- | net-p2p/napshare/files/patch-aa | 14 | ||||
| -rw-r--r-- | net-p2p/napshare/files/patch-ab | 11 | ||||
| -rw-r--r-- | net-p2p/napshare/pkg-plist | 2 | ||||
| -rw-r--r-- | net/napshare/Makefile | 5 | ||||
| -rw-r--r-- | net/napshare/distinfo | 2 | ||||
| -rw-r--r-- | net/napshare/files/patch-aa | 14 | ||||
| -rw-r--r-- | net/napshare/files/patch-ab | 11 | ||||
| -rw-r--r-- | net/napshare/pkg-plist | 2 |
10 files changed, 64 insertions, 4 deletions
diff --git a/net-p2p/napshare/Makefile b/net-p2p/napshare/Makefile index 0ddea2a..8841dce 100644 --- a/net-p2p/napshare/Makefile +++ b/net-p2p/napshare/Makefile @@ -6,7 +6,7 @@ # PORTNAME= napshare -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= napshare @@ -19,4 +19,7 @@ USE_GNOMENG= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes +post-extract: + @${RM} ${WRKSRC}/config.cache + .include <bsd.port.mk> diff --git a/net-p2p/napshare/distinfo b/net-p2p/napshare/distinfo index 2a15e2c..b952229 100644 --- a/net-p2p/napshare/distinfo +++ b/net-p2p/napshare/distinfo @@ -1 +1 @@ -MD5 (napshare-1.1.tar.gz) = 83d3c79f7db56feb5409b949900c9a81 +MD5 (napshare-1.2.tar.gz) = 862373717fd7bee31b9dca003a0840a0 diff --git a/net-p2p/napshare/files/patch-aa b/net-p2p/napshare/files/patch-aa new file mode 100644 index 0000000..9eb943e --- /dev/null +++ b/net-p2p/napshare/files/patch-aa @@ -0,0 +1,14 @@ +--- src/hosts.c.orig Sat Jan 4 13:25:05 2003 ++++ src/hosts.c Sat Jan 4 13:27:43 2003 +@@ -265,6 +265,11 @@ + g_snprintf(h_tmp, sizeof(h_tmp), "%s/NAPS-urlcache.txt", path); + cachef = fopen(h_tmp, "r"); // open the normal file + } ++ // Try opening from data directory ++ if (cachef == NULL) { ++ g_snprintf(h_tmp, sizeof(h_tmp), "%s/NAPS-urlcache.txt", PACKAGE_DATA_DIR); ++ cachef = fopen(h_tmp, "r"); ++ } + } + + if (!cachef) { diff --git a/net-p2p/napshare/files/patch-ab b/net-p2p/napshare/files/patch-ab new file mode 100644 index 0000000..a11691a --- /dev/null +++ b/net-p2p/napshare/files/patch-ab @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sat Jan 4 13:47:04 2003 ++++ Makefile.in Sat Jan 4 13:47:33 2003 +@@ -362,6 +362,8 @@ + fi \ + done \ + fi ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \ ++ $(INSTALL_DATA) $(srcdir)/NAPS-urlcache.txt $(DESTDIR)$(pkgdatadir); + + dist-hook: + if test -d pixmaps; then \ diff --git a/net-p2p/napshare/pkg-plist b/net-p2p/napshare/pkg-plist index b61cd0b..bb602b5 100644 --- a/net-p2p/napshare/pkg-plist +++ b/net-p2p/napshare/pkg-plist @@ -1 +1,3 @@ bin/napshare +share/napshare/NAPS-urlcache.txt +@dirrm share/napshare diff --git a/net/napshare/Makefile b/net/napshare/Makefile index 0ddea2a..8841dce 100644 --- a/net/napshare/Makefile +++ b/net/napshare/Makefile @@ -6,7 +6,7 @@ # PORTNAME= napshare -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= napshare @@ -19,4 +19,7 @@ USE_GNOMENG= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes +post-extract: + @${RM} ${WRKSRC}/config.cache + .include <bsd.port.mk> diff --git a/net/napshare/distinfo b/net/napshare/distinfo index 2a15e2c..b952229 100644 --- a/net/napshare/distinfo +++ b/net/napshare/distinfo @@ -1 +1 @@ -MD5 (napshare-1.1.tar.gz) = 83d3c79f7db56feb5409b949900c9a81 +MD5 (napshare-1.2.tar.gz) = 862373717fd7bee31b9dca003a0840a0 diff --git a/net/napshare/files/patch-aa b/net/napshare/files/patch-aa new file mode 100644 index 0000000..9eb943e --- /dev/null +++ b/net/napshare/files/patch-aa @@ -0,0 +1,14 @@ +--- src/hosts.c.orig Sat Jan 4 13:25:05 2003 ++++ src/hosts.c Sat Jan 4 13:27:43 2003 +@@ -265,6 +265,11 @@ + g_snprintf(h_tmp, sizeof(h_tmp), "%s/NAPS-urlcache.txt", path); + cachef = fopen(h_tmp, "r"); // open the normal file + } ++ // Try opening from data directory ++ if (cachef == NULL) { ++ g_snprintf(h_tmp, sizeof(h_tmp), "%s/NAPS-urlcache.txt", PACKAGE_DATA_DIR); ++ cachef = fopen(h_tmp, "r"); ++ } + } + + if (!cachef) { diff --git a/net/napshare/files/patch-ab b/net/napshare/files/patch-ab new file mode 100644 index 0000000..a11691a --- /dev/null +++ b/net/napshare/files/patch-ab @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sat Jan 4 13:47:04 2003 ++++ Makefile.in Sat Jan 4 13:47:33 2003 +@@ -362,6 +362,8 @@ + fi \ + done \ + fi ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \ ++ $(INSTALL_DATA) $(srcdir)/NAPS-urlcache.txt $(DESTDIR)$(pkgdatadir); + + dist-hook: + if test -d pixmaps; then \ diff --git a/net/napshare/pkg-plist b/net/napshare/pkg-plist index b61cd0b..bb602b5 100644 --- a/net/napshare/pkg-plist +++ b/net/napshare/pkg-plist @@ -1 +1,3 @@ bin/napshare +share/napshare/NAPS-urlcache.txt +@dirrm share/napshare |
