Attachment #8321 for bug #17477

View | Details | Raw Unified | Return to bug 17477
Collapse All | Expand All




# New ports collection makefile for:	SCREEM
# Version required:	0.2.1
# Date created:		05 Nov 1999
# Whom:			Will Andrews <andrews@technologist.com>
#
# $FreeBSD: ports/www/screem/Makefile,v 1.1 1999/12/27 02:18:02 steve Exp $
#

DISTNAME=	screem-0.2.1
CATEGORIES=	www
MASTER_SITES=	ftp://download.sourceforge.net/pub/sourceforge/screem/ \
		http://www.screem.org/src/

MAINTAINER=	andrews@technologist.com

LIB_DEPENDS=	glade.2:${PORTSDIR}/devel/libglade
		pthread.13:${PORTSDIR}/devel/pth-devel

LIBGLADE_CONFIG?=	${LOCALBASE}/bin/libglade-config
USE_LIBTOOL=	yes
GNU_CONFIGURE=	yes
USE_GMAKE=	yes
USE_X_PREFIX=	yes

Line 1 Link Here

(-)files/md5 (-1 / +1 lines)
1	MD5 (screem-0.1.92.tar.gz) = a453d71ddb2cb751cad3dbb0948514e2	1	MD5 (screem-0.2.1.tar.gz) = 37a39c59e34399a13455b759e03e8eeb




--- configure	Mon Jan  3 09:33:01 2000
+++ configure.new	Sat Mar 18 16:23:46 2000
@@ -1922,8 +1922,8 @@
 LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -1937,7 +1937,7 @@
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -2405,6 +2405,7 @@
   fi
 
 
+if false; then
 	PTHREAD_LIB=""
 	echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
 echo "configure:2411: checking for pthread_create in -lpthread" >&5
@@ -2482,6 +2483,9 @@
   PTHREAD_LIB="-lpthreads"
 else
   echo "$ac_t""no" 1>&6
+fi
+fi
+fi
 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
 echo "configure:2487: checking for pthread_create in -lc_r" >&5
 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
@@ -2489,7 +2493,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lc_r  $LIBS"
+LIBS="-pthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 2495 "configure"
 #include "confdefs.h"
@@ -2517,7 +2521,7 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  PTHREAD_LIB="-lc_r"
+  PTHREAD_LIB="-pthread"
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
@@ -2571,11 +2575,6 @@
 		    
 fi
 
-		
-fi
-
-	
-fi
 
 	
 	
@@ -5882,7 +5881,7 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   CATOBJEXT=.mo




share/locale/de/LC_MESSAGES/screem.mo
share/locale/fr/LC_MESSAGES/screem.mo
share/locale/pl/LC_MESSAGES/screem.mo
share/screem/glade/css.glade
share/screem/glade/extern_browsers.glade
share/screem/glade/imageWizard.glade
share/screem/glade/linkWizard.glade

share/screem/glade/sitetemplate.glade
share/screem/glade/todo.glade
share/screem/plugins/colourWizard.a
share/screem/plugins/cssWizard.a
share/screem/plugins/entityWizard.a
share/screem/plugins/entityWizard.la
share/screem/plugins/externBrowsers.a
share/screem/plugins/externBrowsers.la
share/screem/plugins/galleryWizard.a
share/screem/plugins/galleryWizard.la
share/screem/plugins/imageWizard.a
share/screem/plugins/imageWizard.la
share/screem/plugins/linkWizard.a
share/screem/plugins/linkWizard.la
share/screem/plugins/mailWizard.a
share/screem/plugins/mailWizard.la
share/screem/plugins/ssiWizard.a
share/screem/plugins/ssiWizard.la
share/screem/plugins/tableWizard.a
share/screem/plugins/tableWizard.la
share/screem/plugins/uploadWizard.a
share/screem/plugins/uploadWizard.la
share/screem/screem.tagtree
share/screem/splash/1.png
share/screem/splash/2.png

share/screem/splash/4.png
@dirrm share/screem/glade
@dirrm share/screem/plugins
@dirrm share/screem/resources/Applets
@dirrm share/screem/resources/Images
@dirrm share/screem/resources/Javascript
@dirrm share/screem/resources/PHP3
@dirrm share/screem/resources
@dirrm share/screem/splash
@dirrm share/screem

Added Link Here

(-)patches/patch-ac (+11 lines)
1	--- plugins/uploadWizard/Makefile.in Mon Jan 3 09:34:07 2000
2	+++ plugins/uploadWizard/Makefile.in.new Sat Mar 18 16:25:24 2000
3	@@ -151,7 +151,7 @@
4
5
6	uploadWizard_la_LDFLAGS = -avoid-version -module
7	-uploadWizard_la_LIBADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) -lpthread
8	+uploadWizard_la_LIBADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) @PTHREAD_LIB@
9	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
10	CONFIG_HEADER = ../../config.h
11	CONFIG_CLEAN_FILES =

Return to bug 17477

Lines 1-21 Link Here

(-)Makefile (-5 / +6 lines)
1	# New ports collection makefile for: SCREEM	1	# New ports collection makefile for: SCREEM
2	# Version required: 0.1.92	2	# Version required: 0.2.1
3	# Date created: 05 Nov 1999	3	# Date created: 05 Nov 1999
4	# Whom: Will Andrews <andrews@technologist.com>	4	# Whom: Will Andrews <andrews@technologist.com>
5	#	5	#
6	# $FreeBSD: ports/www/screem/Makefile,v 1.1 1999/12/27 02:18:02 steve Exp $	6	# $FreeBSD: ports/www/screem/Makefile,v 1.1 1999/12/27 02:18:02 steve Exp $
7	#	7	#
8		8
9	DISTNAME= screem-0.1.92	9	DISTNAME= screem-0.2.1
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://www.screem.org/src/	11	MASTER_SITES= ftp://download.sourceforge.net/pub/sourceforge/screem/ \
		12	http://www.screem.org/src/
12		13
13	MAINTAINER= andrews@technologist.com	14	MAINTAINER= andrews@technologist.com
14		15
15	LIB_DEPENDS= glade.2:${PORTSDIR}/devel/libglade \	16	LIB_DEPENDS= glade.2:${PORTSDIR}/devel/libglade
16	pthread.13:${PORTSDIR}/devel/pth-devel
17		17
18	LIBGLADE_CONFIG?= ${LOCALBASE}/bin/libglade-config	18	LIBGLADE_CONFIG?= ${LOCALBASE}/bin/libglade-config
		19	USE_LIBTOOL= yes
19	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
20	USE_GMAKE= yes	21	USE_GMAKE= yes
21	USE_X_PREFIX= yes	22	USE_X_PREFIX= yes

Lines 1-6 Link Here

(-)patches/patch-ab (-3 / +71 lines)
1	--- configure Thu Oct 28 15:09:16 1999	1	--- configure Mon Jan 3 09:33:01 2000
2	+++ configure.new Sat Nov 13 15:01:06 1999	2	+++ configure.new Sat Mar 18 16:23:46 2000
3	@@ -5686,7 +5686,7 @@	3	@@ -1922,8 +1922,8 @@
		4	LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
		5	LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
		6	DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
		7	-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
		8	-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
		9	+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
		10	+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
		11	\|\| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
		12
		13	# Reload cache, that may have been modified by ltconfig
		14	@@ -1937,7 +1937,7 @@
		15
		16
		17	# This can be used to rebuild libtool when needed
		18	-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
		19	+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
		20
		21	# Always use our own libtool.
		22	LIBTOOL='$(SHELL) $(top_builddir)/libtool'
		23	@@ -2405,6 +2405,7 @@
		24	fi
		25
		26
		27	+if false; then
		28	PTHREAD_LIB=""
		29	echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
		30	echo "configure:2411: checking for pthread_create in -lpthread" >&5
		31	@@ -2482,6 +2483,9 @@
		32	PTHREAD_LIB="-lpthreads"
		33	else
		34	echo "$ac_t""no" 1>&6
		35	+fi
		36	+fi
		37	+fi
		38	echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
		39	echo "configure:2487: checking for pthread_create in -lc_r" >&5
		40	ac_lib_var=`echo c_r'_'pthread_create \| sed 'y%./+-%__p_%'`
		41	@@ -2489,7 +2493,7 @@
		42	echo $ac_n "(cached) $ac_c" 1>&6
		43	else
		44	ac_save_LIBS="$LIBS"
		45	-LIBS="-lc_r $LIBS"
		46	+LIBS="-pthread $LIBS"
		47	cat > conftest.$ac_ext <<EOF
		48	#line 2495 "configure"
		49	#include "confdefs.h"
		50	@@ -2517,7 +2521,7 @@
		51	fi
		52	if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
		53	echo "$ac_t""yes" 1>&6
		54	- PTHREAD_LIB="-lc_r"
		55	+ PTHREAD_LIB="-pthread"
		56	else
		57	echo "$ac_t""no" 1>&6
		58	echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
		59	@@ -2571,11 +2575,6 @@
		60
		61	fi
		62
		63	-
		64	-fi
		65	-
		66	-
		67	-fi
68
69
70
71	@@ -5882,7 +5881,7 @@
4	cat conftest.$ac_ext >&5	72	cat conftest.$ac_ext >&5
5	rm -rf conftest*	73	rm -rf conftest*
6	CATOBJEXT=.mo	74	CATOBJEXT=.mo

Lines 6-11 Link Here

(-)pkg/PLIST (-10 / +7 lines)
6	share/locale/de/LC_MESSAGES/screem.mo	6	share/locale/de/LC_MESSAGES/screem.mo
7	share/locale/fr/LC_MESSAGES/screem.mo	7	share/locale/fr/LC_MESSAGES/screem.mo
8	share/locale/pl/LC_MESSAGES/screem.mo	8	share/locale/pl/LC_MESSAGES/screem.mo
		9	share/screem/glade/css.glade
9	share/screem/glade/extern_browsers.glade	10	share/screem/glade/extern_browsers.glade
10	share/screem/glade/imageWizard.glade	11	share/screem/glade/imageWizard.glade
11	share/screem/glade/linkWizard.glade	12	share/screem/glade/linkWizard.glade
Lines 16-40 Link Here
16	share/screem/glade/sitetemplate.glade	17	share/screem/glade/sitetemplate.glade
17	share/screem/glade/todo.glade	18	share/screem/glade/todo.glade
18	share/screem/plugins/colourWizard.a	19	share/screem/plugins/colourWizard.a
19	share/screem/plugins/colourWizard.la	20	share/screem/plugins/cssWizard.a
20	share/screem/plugins/entityWizard.a	21	share/screem/plugins/entityWizard.a
21	share/screem/plugins/entityWizard.la
22	share/screem/plugins/externBrowsers.a	22	share/screem/plugins/externBrowsers.a
23	share/screem/plugins/externBrowsers.la
24	share/screem/plugins/galleryWizard.a	23	share/screem/plugins/galleryWizard.a
25	share/screem/plugins/galleryWizard.la
26	share/screem/plugins/imageWizard.a	24	share/screem/plugins/imageWizard.a
27	share/screem/plugins/imageWizard.la
28	share/screem/plugins/linkWizard.a	25	share/screem/plugins/linkWizard.a
29	share/screem/plugins/linkWizard.la
30	share/screem/plugins/mailWizard.a	26	share/screem/plugins/mailWizard.a
31	share/screem/plugins/mailWizard.la
32	share/screem/plugins/ssiWizard.a	27	share/screem/plugins/ssiWizard.a
33	share/screem/plugins/ssiWizard.la
34	share/screem/plugins/tableWizard.a	28	share/screem/plugins/tableWizard.a
35	share/screem/plugins/tableWizard.la
36	share/screem/plugins/uploadWizard.a	29	share/screem/plugins/uploadWizard.a
37	share/screem/plugins/uploadWizard.la
38	share/screem/screem.tagtree	30	share/screem/screem.tagtree
39	share/screem/splash/1.png	31	share/screem/splash/1.png
40	share/screem/splash/2.png	32	share/screem/splash/2.png
Lines 42-46 Link Here
42	share/screem/splash/4.png	34	share/screem/splash/4.png
43	@dirrm share/screem/glade	35	@dirrm share/screem/glade
44	@dirrm share/screem/plugins	36	@dirrm share/screem/plugins
		37	@dirrm share/screem/resources/Applets
		38	@dirrm share/screem/resources/Images
		39	@dirrm share/screem/resources/Javascript
		40	@dirrm share/screem/resources/PHP3
		41	@dirrm share/screem/resources
45	@dirrm share/screem/splash	42	@dirrm share/screem/splash
46	@dirrm share/screem	43	@dirrm share/screem