Update to 2.1pre7

4 files changed, 3 insertions, 74 deletions

diff --git a/www/links/Makefile b/www/links/Makefile
index 57ea98df1c92..2de6bc90850d 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	links
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.1.p7
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/download/ \
 		http://unixpages.org/distfiles/
+DISTNAME=	${PORTNAME}-2.1pre7
 
 MAINTAINER=	demon@FreeBSD.org
 
@@ -39,10 +39,4 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/default.c
 
-post-install:
-.if !defined(NOPORTDOCS)
-		@${MKDIR} ${DOCSDIR}
-		@${INSTALL_DATA} ${WRKSRC}/doc/links_cal/* ${DOCSDIR}
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/links/distinfo b/www/links/distinfo
index 3d2b1143eb27..889a8f77c107 100644
--- a/www/links/distinfo
+++ b/www/links/distinfo
@@ -1 +1 @@
-MD5 (links-2.0.tar.bz2) = c41b3dea2c4a93ed77636db3c67807e2
+MD5 (links-2.1pre7.tar.bz2) = 73579a90ed96d43a5db053d67ddaf261
diff --git a/www/links/files/patch-ac b/www/links/files/patch-ac
deleted file mode 100644
index 7fd68f375e5f..000000000000
--- a/www/links/files/patch-ac
+++ /dev/null
@@ -1,54 +0,0 @@
-This patch is taken from diff'ing links-2.1pre1 against links-2.0 and fixes
-possible mem_free(NULL) issues.
-
-diff -Nur x.c.orig x.c
---- x.c.orig	Fri Jun  7 15:24:31 2002
-+++ x.c	Tue Jun 11 14:08:26 2002
-@@ -998,7 +998,7 @@
- 			}
- 			
- 		x_free_hash_table();
--		mem_free(x_driver_param);
-+		if (x_driver_param) mem_free(x_driver_param);
- 		return stracpy("No supported color depth found.\n");
- visual_found:;
- 	}
-@@ -1030,7 +1030,7 @@
- 			snprintf(nevidim_te_ani_te_neslysim_ale_smrdis_jako_lejno,MAX_STR_LEN,
- 			"Unsupported graphics mode: x_depth=%d, bits_per_pixel=%d, bytes_per_pixel=%d\n",x_driver.depth, x_depth, x_bitmap_bpp);
- 			x_free_hash_table();
--			mem_free(x_driver_param);
-+			if (x_driver_param) mem_free(x_driver_param);
- 			return stracpy(nevidim_te_ani_te_neslysim_ale_smrdis_jako_lejno);
- 		}
- 		
-@@ -1053,7 +1053,7 @@
- 		unsigned char *t;
- 
- 		x_have_palette=1;
--		if((t=x_set_palette())){x_free_hash_table(); mem_free(x_driver_param); return t;}
-+		if((t=x_set_palette())){x_free_hash_table(); if (x_driver_param) mem_free(x_driver_param); return t;}
- 	}
- 
- 	x_black_pixel=BlackPixel(x_display,x_screen);
-@@ -1090,16 +1090,16 @@
- 	);
- 
- 	x_normal_gc=XCreateGC(x_display,fake_window,GCFillStyle|GCBackground,&gcv);
--	if (!x_normal_gc) {x_free_hash_table(); mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
-+	if (!x_normal_gc) {x_free_hash_table(); if (x_driver_param) mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
- 	
- 	x_copy_gc=XCreateGC(x_display,fake_window,GCFunction,&gcv);
--	if (!x_copy_gc) {x_free_hash_table(); mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
-+	if (!x_copy_gc) {x_free_hash_table(); if (x_driver_param) mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
- 	
- 	x_drawbitmap_gc=XCreateGC(x_display,fake_window,GCFunction,&gcv);
--	if (!x_drawbitmap_gc) {x_free_hash_table(); mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
-+	if (!x_drawbitmap_gc) {x_free_hash_table(); if (x_driver_param) mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
- 	
- 	x_scroll_gc=XCreateGC(x_display,fake_window,GCGraphicsExposures|GCBackground,&gcv);
--	if (!x_scroll_gc) {x_free_hash_table(); mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
-+	if (!x_scroll_gc) {x_free_hash_table(); if (x_driver_param) mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
- 
- 	XSetLineAttributes(x_display,x_normal_gc,1,LineSolid,CapRound,JoinRound);
- 
diff --git a/www/links/pkg-plist b/www/links/pkg-plist
index 328baa89325b..191550099363 100644
--- a/www/links/pkg-plist
+++ b/www/links/pkg-plist
@@ -1,12 +1 @@
 bin/links
-%%PORTDOCS%%share/doc/links/adjusted.png
-%%PORTDOCS%%share/doc/links/black-control-rocking.png
-%%PORTDOCS%%share/doc/links/black-icon.png
-%%PORTDOCS%%share/doc/links/calibration.html
-%%PORTDOCS%%share/doc/links/elbow.png
-%%PORTDOCS%%share/doc/links/kalibrace.html
-%%PORTDOCS%%share/doc/links/picture-crank-0.png
-%%PORTDOCS%%share/doc/links/picture-crank-up.png
-%%PORTDOCS%%share/doc/links/picture-icon.png
-%%PORTDOCS%%share/doc/links/test_pattern.png
-@dirrm share/doc/links