Skip site navigation (1)Skip section navigation (2)
Date:      Sat,  7 Feb 2004 20:55:41 -0800 (PST)
From:      John Merryweather Cooper <coop9211@uidaho.edu>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/62514: [MAINTAINER-UPDATE] Re-enable www/neon support on www/screem
Message-ID:  <20040208045541.6C70D1EC@borgdemon.losaca.adelphia.net>
Resent-Message-ID: <200402080500.i1850YPR089475@freefall.freebsd.org>

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

>Number:         62514
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] Re-enable www/neon support on www/screem
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 07 21:00:34 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     John Merryweather Cooper
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD borgdemon.losaca.adelphia.net 4.9-STABLE FreeBSD 4.9-STABLE #10: Thu Feb 5 10:10:14 PST 2004 root@borgdemon.losaca.adelphia.net:/usr/obj/usr/src/sys/K6-2 i386


>Description:
	Now that www/neon is at an appropriate version, re-enable building
	www/screem with it.

	NOTE!!!  www/screem will not build if krb5-config exists AND
	Kerberos V is not installed (a separte PR has been filed).
 
>How-To-Repeat:
	www/screem will not build if krb5-config exists and Kerberos V
	is NOT installed

>Fix:


--- update-screem-0.8.2_1 begins here ---
# This is a patch for screem to update it to screem-0.8.2_1
# 
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# If you have a decent Bourne-type shell:
# STEP 2: Run the shell with this file as input.
# If you don't have such a shell, you may need to manually create
# the files as shown below.
# STEP 3: Run the 'patch' program with this file as input.
#
# These are the commands needed to create/delete files/directories:
#
touch 'files/patch-plugins::uploadWizard::Makefile.in'
chmod 0644 'files/patch-plugins::uploadWizard::Makefile.in'
#
# This command terminates the shell and need not be executed manually.
exit
#
#### End of Preamble ####

#### Patch data follows ####
diff -u 'screem/Makefile' 'screem-0.8.2_1/Makefile'
Index: ./Makefile
--- ./Makefile	Thu Feb  5 14:04:06 2004
+++ ./Makefile	Sat Jan 31 01:38:51 2004
@@ -2,7 +2,7 @@
 # Date created:		05 Nov 1999
 # Whom:			Will Andrews <andrews@technologist.com>
 #
-# $FreeBSD: ports/www/screem/Makefile,v 1.40 2004/02/04 05:09:34 marcus Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	screem
@@ -15,8 +15,7 @@
 MAINTAINER=	coop9211@uidaho.edu
 COMMENT=	Nice GNOME/GTK-based HTML editor
 
-# www/neon needs to be updated to 0.24.3
-#LIB_DEPENDS=	neon.24:${PORTSDIR}/www/neon
+LIB_DEPENDS+=	neon.24:${PORTSDIR}/www/neon
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -35,12 +34,16 @@
 USE_PERL5=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-#CONFIGURE_ARGS+=	--with-neon="${LOCALBASE}/bin"
+CONFIGURE_ARGS+=	--without-included-neon
+#			--with-neon="${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|\@GNOME_DATA_PREFIX\@|\$$\(datadir\)|g'
+
+post-configure:
+	@${REINPLACE_CMD} -e 's|\/\* #undef HAVE_LIMITS_H \*\/|#define HAVE_LIMITS_H 1|g' ${WRKSRC}/config.h
 
 .include <bsd.port.mk>
diff -u 'screem/distinfo' 'screem-0.8.2_1/distinfo'
Index: ./distinfo
--- ./distinfo	Sat Nov  1 14:25:23 2003
+++ ./distinfo	Sat Jan 31 01:38:51 2004
@@ -1 +1,2 @@
 MD5 (screem-0.8.2.tar.gz) = fd1c6f8c2867a43028621cbdd944b9df
+SIZE (screem-0.8.2.tar.gz) = 2193840
diff -u /dev/null 'screem-0.8.2_1/files/patch-plugins::uploadWizard::Makefile.in'
Index: ./files/patch-plugins::uploadWizard::Makefile.in
--- ./files/patch-plugins::uploadWizard::Makefile.in	Wed Dec 31 16:00:00 1969
+++ ./files/patch-plugins::uploadWizard::Makefile.in	Sat Jan 31 01:38:51 2004
@@ -0,0 +1,20 @@
+--- plugins/uploadWizard/Makefile.in.old	Sat Jan 31 01:09:09 2004
++++ plugins/uploadWizard/Makefile.in	Sat Jan 31 01:14:46 2004
+@@ -179,7 +179,7 @@
+ 
+ 
+ uploadWizard_la_LDFLAGS = -avoid-version -module
+-uploadWizard_la_LIBADD = $(NEONOBJS) 
++uploadWizard_la_LIBADD = 
+ 
+ config_h = $(top_builddir)/config.h
+ obj_ext = o
+@@ -191,7 +191,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-uploadWizard_la_DEPENDENCIES =  $(neon_dir)/*.lo
++uploadWizard_la_DEPENDENCIES =  
+ @HAVE_FNMATCH_FALSE@uploadWizard_la_OBJECTS =  netrc.lo rpmatch.lo \
+ @HAVE_FNMATCH_FALSE@fnmatch.lo common.lo davdriver.lo fileset.lo ftp.lo \
+ @HAVE_FNMATCH_FALSE@ftpdriver.lo rcfile.lo rshdriver.lo sitefiles.lo \
#### End of Patch data ####

#### ApplyPatch data follows ####
# Data version        : 1.0
# Date generated      : Sat Feb  7 20:33:00 2004
# Generated by        : makepatch 2.00
# Recurse directories : Yes
# p 'Makefile' 1200 1075541931 0100644
# p 'distinfo' 61 1075541931 0100644
# c 'files/patch-plugins::uploadWizard::Makefile.in' 0 1075541931 0100644
#### End of ApplyPatch data ####

#### End of Patch kit [created: Sat Feb  7 20:33:00 2004] ####
#### Checksum: 116 4144 59514 ####
--- update-screem-0.8.2_1 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



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