Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Jun 2002 02:31:35 +0200 (CEST)
From:      Matthias Andree <matthias.andree@web.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Lawrence Mayer <Lawrence.Mayer@dsg.ki.se>, petef@FreeBSD.org, <demon@FreeBSD.org>, <edwin@mavetju.org>, <osa@freebsd.org.ru>, <dannyboy@FreeBSD.org>, <ma@dt.e-technik.uni-dortmund.de>
Subject:   ports/39903: Update port: www/links -> 2.0 (new graphics, javascript)
Message-ID:  <20020627003135.442121B24B@emma.line.org>

next in thread | raw e-mail | index | archive | help

>Number:         39903
>Category:       ports
>Synopsis:       Update port: www/links -> 2.0 (new graphics, javascript)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 26 17:40:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Bourne-again Superuser
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD merlin.emma.line.org 4.6-STABLE FreeBSD 4.6-STABLE #5: Tue Jun 25 02:27:28 CEST 2002 toor@merlin.emma.line.org:/usr/src/sys/compile/MA i386


	
>Description:
SUPERSEDES: PR: 38793
(PR #38793 offered a port for the links 2.0 prerelease version)

There is a new release version of Links, which supports graphics mode
(to be enabled with the run-time command line option -g) and Javascript.

The SHAR below contains a port for the new version of Links, to replace
the old port. To build a "small" version, graphics or javascript can be
disabled at port build time, with -DWITHOUT_X11 or -DWITHOUT_JAVASCRIPT.
JPEG or TIFF support can also be selectively disabled when X11 support
is enabled (default).

	
>How-To-Repeat:
	
>Fix:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	links
#	links/Makefile
#	links/distinfo
#	links/pkg-comment
#	links/pkg-descr
#	links/pkg-plist
#	links/files
#	links/files/patch-aa
#
echo c - links
mkdir -p links > /dev/null 2>&1
echo x - links/Makefile
sed 's/^X//' >links/Makefile << 'END-of-links/Makefile'
X# New ports collection makefile for:	links-devel
X# Date created:		2002-05-27
X# Whom:			Matthias Andree <matthias.andree@web.de>
X#
X# $FreeBSD$
X#
X
XPORTNAME=	links
XPORTVERSION=	2.0
XCATEGORIES=	www
XMASTER_SITES=	http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/download/ \
X		http://artax.karlin.mff.cuni.cz/~mikulas/links/download/
X
XMAINTAINER=	matthias.andree@web.de
X
X.if !defined(WITHOUT_X11)
XLIB_DEPENDS+=	png:${PORTSDIR}/graphics/png
X.if !defined(WITHOUT_JPEG)
XLIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
X.endif
X.if !defined(WITHOUT_TIFF)
XLIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff
X.endif
X.endif
X
XUSE_BZIP2=	yes
X
XGNU_CONFIGURE=	yes
X
X.if !defined(WITHOUT_X11)
XUSE_XLIB=	yes
X.endif
X
X.if !defined(WITHOUT_SSL)
XUSE_OPENSSL=	yes
X.endif
X
X.if !defined(WITHOUT_JAVASCRIPT)
XCONFIGURE_ARGS+=	--enable-javascript
X.endif
X.if !defined(WITHOUT_X11)
XCONFIGURE_ARGS+=	--enable-graphics
X.endif
X.if defined(WITHOUT_SSL)
XCONFIGURE_ARGS+=	--without-ssl
X.endif
X.if defined(WITHOUT_JPEG)
XCONFIGURE_ARGS+=	--without-libjpeg
X.endif
X.if defined(WITHOUT_TIFF)
XCONFIGURE_ARGS+=	--without-libtiff
X.endif
X
Xpre-everything:
X	@${ECHO_MSG} ""
X	@${ECHO_MSG} "You can pass several options to make to modify the build of ${PORTNAME}:"
X	@${ECHO_MSG} "-DWITHOUT_SSL        - compile without OpenSSL support"
X	@${ECHO_MSG} "-DWITHOUT_JAVASCRIPT - compile without JavaScript support"
X	@${ECHO_MSG} "-DWITHOUT_X11        - compile without graphics support"
X	@${ECHO_MSG} ""
X	@${ECHO_MSG} "These will be ignored when -DWITHOUT_X11 is set:"
X	@${ECHO_MSG} "-DWITHOUT_JPEG       - compile without JPEG support"
X	@${ECHO_MSG} "-DWITHOUT_TIFF       - compile without TIFF support"
X	@${ECHO_MSG} ""
X
XMAN1=		links.1
X
Xpost-install:
X	@${MKDIR} ${PREFIX}/share/icons/links/
X	@${INSTALL_DATA} -o 0 -g wheel -m 644 \
X		${WRKSRC}/graphics/links.xpm ${PREFIX}/share/icons/links/
X.if !defined(NOPORTDOCS)
X	@${MKDIR} ${DOCSDIR}/links_cal
X.for i in AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README SITES TODO
X	@${INSTALL_MAN} ${WRKSRC}/$i ${DOCSDIR}/
X.endfor
X	@cd ${WRKSRC}/doc/links_cal && ${INSTALL_DATA} * ${DOCSDIR}/links_cal
X	@${ECHO_MSG} "Installed documentation in ${DOCSDIR}"
X.endif
X
X.include <bsd.port.mk>
END-of-links/Makefile
echo x - links/distinfo
sed 's/^X//' >links/distinfo << 'END-of-links/distinfo'
XMD5 (links-2.0.tar.bz2) = c41b3dea2c4a93ed77636db3c67807e2
END-of-links/distinfo
echo x - links/pkg-comment
sed 's/^X//' >links/pkg-comment << 'END-of-links/pkg-comment'
XText and graphic mode browser with JavaScript support
END-of-links/pkg-comment
echo x - links/pkg-descr
sed 's/^X//' >links/pkg-descr << 'END-of-links/pkg-descr'
XLynx-like text and graphic mode WWW browser with many features like JavaScript,
Xdisplaying tables, menus, etc.
X
XWWW: http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/
X
X- Matthias Andree
Xmatthias.andree@web.de
END-of-links/pkg-descr
echo x - links/pkg-plist
sed 's/^X//' >links/pkg-plist << 'END-of-links/pkg-plist'
Xbin/links
X%%PORTDOCS%%share/doc/links/AUTHORS
X%%PORTDOCS%%share/doc/links/BUGS
X%%PORTDOCS%%share/doc/links/COPYING
X%%PORTDOCS%%share/doc/links/ChangeLog
X%%PORTDOCS%%share/doc/links/INSTALL
X%%PORTDOCS%%share/doc/links/NEWS
X%%PORTDOCS%%share/doc/links/README
X%%PORTDOCS%%share/doc/links/SITES
X%%PORTDOCS%%share/doc/links/TODO
X%%PORTDOCS%%share/doc/links/links_cal/adjusted.png
X%%PORTDOCS%%share/doc/links/links_cal/black-control-rocking.png
X%%PORTDOCS%%share/doc/links/links_cal/black-icon.png
X%%PORTDOCS%%share/doc/links/links_cal/calibration.html
X%%PORTDOCS%%share/doc/links/links_cal/elbow.png
X%%PORTDOCS%%share/doc/links/links_cal/kalibrace.html
X%%PORTDOCS%%share/doc/links/links_cal/picture-crank-0.png
X%%PORTDOCS%%share/doc/links/links_cal/picture-crank-up.png
X%%PORTDOCS%%share/doc/links/links_cal/picture-icon.png
X%%PORTDOCS%%share/doc/links/links_cal/test_pattern.png
X%%PORTDOCS%%share/icons/links/links.xpm
X%%PORTDOCS%%@dirrm share/doc/links/links_cal
X%%PORTDOCS%%@dirrm share/doc/links
X%%PORTDOCS%%@dirrm share/icons/links
END-of-links/pkg-plist
echo c - links/files
mkdir -p links/files > /dev/null 2>&1
echo x - links/files/patch-aa
sed 's/^X//' >links/files/patch-aa << 'END-of-links/files/patch-aa'
XThis patch is taken from diff'ing links-2.1pre1 against links-2.0 and fixes
Xpossible mem_free(NULL) issues.
X
Xdiff -Nur x.c.orig x.c
X--- x.c.orig	Fri Jun  7 15:24:31 2002
X+++ x.c	Tue Jun 11 14:08:26 2002
X@@ -998,7 +998,7 @@
X 			}
X 			
X 		x_free_hash_table();
X-		mem_free(x_driver_param);
X+		if (x_driver_param) mem_free(x_driver_param);
X 		return stracpy("No supported color depth found.\n");
X visual_found:;
X 	}
X@@ -1030,7 +1030,7 @@
X 			snprintf(nevidim_te_ani_te_neslysim_ale_smrdis_jako_lejno,MAX_STR_LEN,
X 			"Unsupported graphics mode: x_depth=%d, bits_per_pixel=%d, bytes_per_pixel=%d\n",x_driver.depth, x_depth, x_bitmap_bpp);
X 			x_free_hash_table();
X-			mem_free(x_driver_param);
X+			if (x_driver_param) mem_free(x_driver_param);
X 			return stracpy(nevidim_te_ani_te_neslysim_ale_smrdis_jako_lejno);
X 		}
X 		
X@@ -1053,7 +1053,7 @@
X 		unsigned char *t;
X 
X 		x_have_palette=1;
X-		if((t=x_set_palette())){x_free_hash_table(); mem_free(x_driver_param); return t;}
X+		if((t=x_set_palette())){x_free_hash_table(); if (x_driver_param) mem_free(x_driver_param); return t;}
X 	}
X 
X 	x_black_pixel=BlackPixel(x_display,x_screen);
X@@ -1090,16 +1090,16 @@
X 	);
X 
X 	x_normal_gc=XCreateGC(x_display,fake_window,GCFillStyle|GCBackground,&gcv);
X-	if (!x_normal_gc) {x_free_hash_table(); mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
X+	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 	
X 	x_copy_gc=XCreateGC(x_display,fake_window,GCFunction,&gcv);
X-	if (!x_copy_gc) {x_free_hash_table(); mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
X+	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 	
X 	x_drawbitmap_gc=XCreateGC(x_display,fake_window,GCFunction,&gcv);
X-	if (!x_drawbitmap_gc) {x_free_hash_table(); mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
X+	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 	
X 	x_scroll_gc=XCreateGC(x_display,fake_window,GCGraphicsExposures|GCBackground,&gcv);
X-	if (!x_scroll_gc) {x_free_hash_table(); mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
X+	if (!x_scroll_gc) {x_free_hash_table(); if (x_driver_param) mem_free(x_driver_param); return stracpy("Cannot create graphic context.\n");}
X 
X 	XSetLineAttributes(x_display,x_normal_gc,1,LineSolid,CapRound,JoinRound);
X 
END-of-links/files/patch-aa
exit

	


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020627003135.442121B24B>