Date: Mon, 12 Nov 2001 19:27:10 -0800 (PST) From: John Merryweather Cooper <john_m_cooper@yahoo.com> To: FreeBSD-gnats-submit@freebsd.org Cc: sobomax@freebsd.org, gnome@freebsd.org, edwin@mavetju.org Subject: ports/31946: [PATCH] Fix and update screem to screem-0.4.1 Message-ID: <20011113032710.ACC8B15503@johncoop.MSHOME>
next in thread | raw e-mail | index | archive | help
>Number: 31946
>Category: ports
>Synopsis: [PATCH] Fix and update screem to screem-0.4.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 12 19:30:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: John Merryweather Cooper
>Release: FreeBSD 4.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD johncoop.MSHOME 4.4-STABLE FreeBSD 4.4-STABLE #5: Mon Nov 12 01:16:03 PST 2001 jmcoopr@johncoop.MSHOME:/usr/obj/usr/src/sys/JOHNCOOP i386
>Description:
As described in my response to PR ports/31942, this patch does
everything Edwin's does and:
* updates to screem-0.4.1
* fixes gdk-pixbuf problem
* fixes configure failure to detect gtkhtml
* fixes configure failure to detect gnome-print (which
results in disabled printing)
* enables SSL upload
However, the Help is broken (the sgml isn't quiet complete, and I
don't have a working db2html to build the html) :(
I'll take over maintainership, unless the gnome group wants it.
>How-To-Repeat:
N/A
>Fix:
makepatch -nomanifest -diff "diff -u" screem screem.new (a fancy
diff -ru -- see textproc/makepatch) follows:
# This is a patch for screem to update it to screem.new
#
# 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.new/Makefile'
Index: ./Makefile
--- ./Makefile Tue Jun 19 02:43:07 2001
+++ ./Makefile Mon Nov 12 17:28:42 2001
@@ -2,31 +2,38 @@
# Date created: 05 Nov 1999
# Whom: Will Andrews <andrews@technologist.com>
#
-# $FreeBSD: ports/www/screem/Makefile,v 1.21 2001/06/19 09:43:07 ade Exp $
+# $FreeBSD$
#
PORTNAME= screem
-PORTVERSION= 0.4.0
-PORTREVISION= 2
+PORTVERSION= 0.4.1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.screem.org/src/
MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= jmcoopr@webmail.bmi.net
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_XPM= yes
USE_GNOME= yes
USE_LIBTOOL= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-gnomevfs
+USE_OPENSSL= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
+ -I${X11BASE}/include \
+ -I${X11BASE}/include/gnome-1.0 \
+ `gdk-pixbuf-config --cflags` \
+ ${PTHREAD_CFLAGS}" \
+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+ PTHREAD_LIBS="${PTHREAD_LIBS}" \
+ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+ X11BASE="${X11BASE}"
+CONFIGURE_ARGS= --with-gnomevfs --with-ssl
pre-patch:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
- s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+ @${PERL} -pi -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
+ ${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
's|\@GNOME_DATA_PREFIX\@|\$$\(datadir\)|g ; \
s|\$\(datadir\)/gnome|\$\(datadir\)|g ; \
diff -u 'screem/distinfo' 'screem.new/distinfo'
Index: ./distinfo
--- ./distinfo Wed Feb 28 02:51:58 2001
+++ ./distinfo Mon Nov 12 15:43:38 2001
@@ -1 +1 @@
-MD5 (screem-0.4.0.tar.gz) = 19743289b85849775538b1f41daeabc5
+MD5 (screem-0.4.1.tar.gz) = 8424eb59a232e976f9dd276320727f5b
diff -u 'screem/files/patch-ab' 'screem.new/files/patch-ab'
Index: ./files/patch-ab
--- ./files/patch-ab Mon Aug 21 03:55:21 2000
+++ ./files/patch-ab Mon Nov 12 17:27:05 2001
@@ -1,6 +1,24 @@
---- configure 2000/08/21 10:10:04 1.1
-+++ configure 2000/08/21 10:10:33
-@@ -5006,7 +5006,7 @@
+--- configure Mon Nov 12 17:17:17 2001
++++ configure.new Mon Nov 12 17:26:23 2001
+@@ -4851,7 +4851,7 @@
+ #include "confdefs.h"
+ #include <gtkhtml/gtkhtml.h>
+ EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++ac_try="$ac_cpp -I${X11BASE}/include conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:4856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+@@ -4916,7 +4916,7 @@
+ #include "confdefs.h"
+ #include <libgnomeprint/gnome-print.h>
+ EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++ac_try="$ac_cpp -I${X11BASE}include/gnome-1.0 conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:4921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+@@ -5029,7 +5029,7 @@
HAVE_PTHREADS_FALSE=
fi
diff -u /dev/null 'screem.new/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 Mon Nov 12 16:53:42 2001
@@ -0,0 +1,11 @@
+--- plugins/uploadWizard/Makefile.in Wed Mar 14 12:50:51 2001
++++ plugins/uploadWizard/Makefile.in.new Mon Nov 12 16:53:15 2001
+@@ -168,7 +168,7 @@
+
+
+ uploadWizard_la_LDFLAGS = -avoid-version -module
+-uploadWizard_la_LIBADD = $(LIBGLADE_LIBS) $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(PTHREAD_LIB) $(NEONOBJS)
++uploadWizard_la_LIBADD = $(LIBGLADE_LIBS) $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(PTHREAD_LIB) $(NEONOBJS) -lssl -lcrypto
+
+ config_h = $(top_builddir)/config.h
+ obj_ext = o
diff -u 'screem/pkg-descr' 'screem.new/pkg-descr'
Index: ./pkg-descr
--- ./pkg-descr Sun Dec 26 18:18:07 1999
+++ ./pkg-descr Mon Nov 12 19:12:40 2001
@@ -3,9 +3,9 @@
functions from your bluefish installation!
SCREEM makes a rather ideal GUI HTML editor, especially for
-Unixheads like myself who like using CVS to manage source trees,
-as SCREEM has functional CVS interaction.
+Unixheads who like using CVS to manage source trees, as SCREEM
+has functional CVS interaction.
WWW: http://www.screem.org/
-- Will <andrews@technologist.com>
+-- John Merryweather Cooper <jmcoopr@webmail.bmi.net>
#### End of Patch data ####
#### ApplyPatch data follows ####
# Data version : 1.0
# Date generated : Mon Nov 12 19:14:26 2001
# Generated by : makepatch 2.00
# Recurse directories : Yes
# p 'Makefile' 962 1005614922 0100644
# p 'distinfo' 61 1005608618 0100644
# p 'files/patch-ab' 219 1005614825 0100644
# c 'files/patch-plugins::uploadWizard::Makefile.in' 0 1005612822 0100644
# p 'pkg-descr' 406 1005621160 0100644
#### End of ApplyPatch data ####
#### End of Patch kit [created: Mon Nov 12 19:14:26 2001] ####
#### Checksum: 169 6163 17060 ####
>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?20011113032710.ACC8B15503>