From a29e9f9da7ff66b19bca4930caa3ffcf32afd429 Mon Sep 17 00:00:00 2001 From: alane Date: Sun, 10 Nov 2002 18:05:10 +0000 Subject: * PORTREVISION ==> 7. * Allow building under -CURRENT. * Changes in LDFLAGS and CPPFLAGS passed to configure. * Removed stale javascript dirs (venkman) from plist. * Updated mkdistfile to remove more unneeded dirs. Used to make a new distfile from a cvs checkout. For maintainers only, really. * Disable bi-directional text in config. * Remove dupes from mozconfig.in. The problem with the martian file selection dialogs is gone. I am not sure of the cause, but apparently it had to do with either which version of the NSPR libs phoenix runs with or the link order of libraries. I don't care, as long as it doesn't do it, 'cause I do not read Martian. Should be running against its own set of NSPR libs now. (Note: you can't just use ldd to check this since the startup scripts play all kinds of fun games.) You are advised to remove $HOME/.phoenix before running the new version. --- www/flock/Makefile | 26 +++++++++++--------------- www/flock/files/mkdistfile | 6 ++++++ www/flock/files/mozconfig.in | 10 +++++----- www/flock/pkg-message | 26 ++++++++++++-------------- www/flock/pkg-plist | 17 +++-------------- 5 files changed, 37 insertions(+), 48 deletions(-) (limited to 'www/flock') diff --git a/www/flock/Makefile b/www/flock/Makefile index e1f36bdd8f87..03a82750137a 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -9,15 +9,14 @@ PORTNAME= phoenix PORTVERSION= 0.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www # pita MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor MAINTAINER= phoenix@freebsd.org # alane@fbsd and trevor@fbsd -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ @@ -39,18 +38,21 @@ HAS_CONFIGURE= yes USE_GNOMENG= yes USE_GNOME= gtk12 orbit +CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= -L${X11BASE}/lib LIBS+= ${PTHREAD_LIBS} NO_MTREE= yes WRKSRC= ${WRKDIR}/mozilla LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME} -MAKE_ENV+= XP_UNIX=1 -MAKE_ARGS+= XP_UNIX=1 .include .if !defined(PERL_LEVEL) +.if !exists(${LOCALBASE}/bin/perl) +PERL_LEVEL=0 +.endif # !exists(${LOCALBASE}/bin/perl) perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|} _perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|} perl_minor=${_perl_minor:C|^.*(...)|\1|} @@ -66,20 +68,12 @@ PERL_LEVEL=${perl_major}${perl_minor}${perl_patch} SITE_PERL?= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -.if ${OSVERSION} > 500038 - -BROKEN= "on -CURRENT, can only be used with local files. You can run" -BROKEN+="make with -DNO_IGNORE to override this message" - -.endif - .if ${PERL_LEVEL} < 500601 .undef NO_IGNORE BROKEN= "right now, we can only support the ports versions of Perl." BROKEN+="We are working on the problem. Sorry for the inconvenience." BROKEN+="If you have installed a Perl port, and are getting this message," BROKEN+="please make sure you have issued the command 'use.perl port'" - .endif # ${PERL_LEVEL} < 500601 pre-extract:: @@ -88,7 +82,9 @@ pre-extract:: @${ECHO_MSG} post-extract:: - @${SED} -e 's|@CFLAGS@|${CFLAGS}|' \ + @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ + -e 's|@CFLAGS@|${CFLAGS}|' \ + -e 's|@LDFLAGS@|${LDFLAGS}|' \ -e 's|@LIBS@|${LIBS}|' \ -e 's|@X11BASE@|${X11BASE}|' \ -e 's|@LOCALBASE@|${LOCALBASE}|' \ @@ -110,7 +106,7 @@ post-install: @${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \ ${PREFIX}/bin/phoenix-config @${CAT} ${PKGMESSAGE} 2>/dev/null; sleep 5 - @${RM} -fr ${LOCAL_PREFIX}/share + @${RM} -fr ${LOCAL_PREFIX}/share/idl @${RM} -fr ${LOCAL_PREFIX}/include .include diff --git a/www/flock/files/mkdistfile b/www/flock/files/mkdistfile index 08647ff78961..27f838bc2939 100644 --- a/www/flock/files/mkdistfile +++ b/www/flock/files/mkdistfile @@ -130,6 +130,12 @@ cat >>$exfile <<'EOF' */package */package/* */.cvsignore +*/windows +*/windows/* +*/os2 +*/os2/* +*/solaris +*/solaris/* mozilla/apache mozilla/calendar mozilla/cck diff --git a/www/flock/files/mozconfig.in b/www/flock/files/mozconfig.in index c93a5d2dec05..88823ea75c24 100644 --- a/www/flock/files/mozconfig.in +++ b/www/flock/files/mozconfig.in @@ -11,15 +11,14 @@ ac_add_options --disable-mailnews ac_add_options --disable-composer ###################################################################### # FBSD specific -export CPPFLAGS="-I@X11BASE@/include -I@LOCALBASE@/include" +export CPPFLAGS="@CPPFLAGS@" export CFLAGS="@CFLAGS@" export LIBS="@LIBS@" -export LDFLAGS="-L@X11BASE@/lib -L@LOCALBASE@/lib" -export DSOFLAGS="${LDFLAGS}" +export LDFLAGS="@LDFLAGS@" export CONFIG_SH=/bin/sh export XP_UNIX=1 -test -x /usr/bin/perl && export PERL=/usr/bin/perl \ - || export PERL=/usr/local/bin/perl +mk_add_options XP_UNIX=1 +export PERL=/usr/local/bin/perl mk_add_options PERL=$PERL export GTK_CONFIG=@X11BASE@/bin/gtk12-config mk_add_options GTK_CONFIG=$GTK_CONFIG @@ -49,4 +48,5 @@ ac_add_options --disable-dtd-debug ac_add_options --disable-auto-deps ac_add_options --disable-pedantic ac_add_options --disable-jsd +ac_add_options --disable-bidi ###################################################################### diff --git a/www/flock/pkg-message b/www/flock/pkg-message index 61aa55e8f559..a6925d3a71f1 100644 --- a/www/flock/pkg-message +++ b/www/flock/pkg-message @@ -1,8 +1,6 @@ ====================================================================== -As of version 0.4_4, this port appears to be stable. It will work with -either of the port versions of perl, provided you do "use.perl port". -It may work with the base system version of perl; I (AlanE) have not -tested this. +As of version 0.4_7, this port appears to be stable *again*. It will work +with either of the port versions of perl, provided you do "use.perl port". NOTE: if you use the lang/perl5.8 port, please remove the File::Spec package with the command "pkg_deinstall -f p5-File-Spec". If you are @@ -15,16 +13,16 @@ bug reports to any other addresses. Please include the following information with any bug report: -1. Date/time stamp from www/phoenix/Makefile. -2. Perl version used (/usr/bin/perl --version). -3. If a port, did you do "use.perl port"? If no, why didn't you - follow the instructions provided? -4. If perl 5.8, did you remove the p5-File-Spec port? If no, why - didn't you follow the instructions provided? -5. Where/when did the problem occur: configuring, building, or - running phoenix? -6. Can you reproduce the problem? If so, how? If not, why do you - think we can fix it? +* Output from 'uname -a'. +* Date/time stamp from www/phoenix/Makefile. +* Perl version used (/usr/bin/perl --version or + /usr/local/bin/perl --version for -current). +* If perl 5.8, did you remove the p5-File-Spec port? If no, why + didn't you follow the instructions provided? +* Where/when did the problem occur: configuring, building, or + running phoenix? +* Can you reproduce the problem? If so, how? If not, why do you + think we can fix it? Thank you for your help in testing and reporting bugs, and we hope you enjoy using Phoenix. diff --git a/www/flock/pkg-plist b/www/flock/pkg-plist index e15ddeb2410a..40773744e90c 100644 --- a/www/flock/pkg-plist +++ b/www/flock/pkg-plist @@ -453,6 +453,7 @@ lib/phoenix/lib/pkgconfig/mozilla-js.pc lib/phoenix/lib/pkgconfig/mozilla-nspr.pc lib/phoenix/lib/pkgconfig/mozilla-nss.pc lib/phoenix/lib/pkgconfig/mozilla-xpcom.pc +lib/phoenix/share/aclocal/nspr.m4 @comment ====create empty dirs @exec /bin/mkdir -p %D/lib/phoenix/lib/mozilla-1.2b/chrome/US/locale/US/browser-region @exec /bin/mkdir -p %D/lib/phoenix/lib/mozilla-1.2b/chrome/US/locale/US/communicator-region/wallet @@ -607,13 +608,7 @@ lib/phoenix/lib/pkgconfig/mozilla-xpcom.pc @exec /bin/mkdir -p %D/lib/phoenix/lib/mozilla-1.2b/chrome/toolkit/content/global-region @exec /bin/mkdir -p %D/lib/phoenix/lib/mozilla-1.2b/chrome/toolkit/content/global/bindings @exec /bin/mkdir -p %D/lib/phoenix/lib/mozilla-1.2b/chrome/toolkit/content/global/widgets -@exec /bin/mkdir -p %D/lib/phoenix/lib/mozilla-1.2b/chrome/venkman/content/venkman/tests -@exec /bin/mkdir -p %D/lib/phoenix/lib/mozilla-1.2b/chrome/venkman/locale/en-US/venkman -@exec /bin/mkdir -p %D/lib/phoenix/lib/mozilla-1.2b/chrome/venkman/skin/modern/venkman/images @comment ====remove empty dirs? -@unexec /bin/rmdir %D/lib/phoenix/lib/mozilla-1.2b/chrome/venkman/skin/modern/venkman/images || true -@unexec /bin/rmdir %D/lib/phoenix/lib/mozilla-1.2b/chrome/venkman/locale/en-US/venkman || true -@unexec /bin/rmdir %D/lib/phoenix/lib/mozilla-1.2b/chrome/venkman/content/venkman/tests || true @unexec /bin/rmdir %D/lib/phoenix/lib/mozilla-1.2b/chrome/toolkit/content/global/widgets || true @unexec /bin/rmdir %D/lib/phoenix/lib/mozilla-1.2b/chrome/toolkit/content/global/bindings || true @unexec /bin/rmdir %D/lib/phoenix/lib/mozilla-1.2b/chrome/toolkit/content/global-region || true @@ -768,6 +763,8 @@ lib/phoenix/lib/pkgconfig/mozilla-xpcom.pc @unexec /bin/rmdir %D/lib/phoenix/lib/mozilla-1.2b/chrome/US/locale/US/communicator-region/wallet || true @unexec /bin/rmdir %D/lib/phoenix/lib/mozilla-1.2b/chrome/US/locale/US/browser-region || true @comment ====remove non-empty dirs +@dirrm lib/phoenix/share/aclocal +@dirrm lib/phoenix/share @dirrm lib/phoenix/lib/pkgconfig @dirrm lib/phoenix/lib/mozilla-1.2b/searchplugins @dirrm lib/phoenix/lib/mozilla-1.2b/res/throbber @@ -793,14 +790,6 @@ lib/phoenix/lib/pkgconfig/mozilla-xpcom.pc @dirrm lib/phoenix/lib/mozilla-1.2b/defaults/autoconfig @dirrm lib/phoenix/lib/mozilla-1.2b/defaults @dirrm lib/phoenix/lib/mozilla-1.2b/components -@dirrm lib/phoenix/lib/mozilla-1.2b/chrome/venkman/skin/modern/venkman -@dirrm lib/phoenix/lib/mozilla-1.2b/chrome/venkman/skin/modern -@dirrm lib/phoenix/lib/mozilla-1.2b/chrome/venkman/skin -@dirrm lib/phoenix/lib/mozilla-1.2b/chrome/venkman/locale/en-US -@dirrm lib/phoenix/lib/mozilla-1.2b/chrome/venkman/locale -@dirrm lib/phoenix/lib/mozilla-1.2b/chrome/venkman/content/venkman -@dirrm lib/phoenix/lib/mozilla-1.2b/chrome/venkman/content -@dirrm lib/phoenix/lib/mozilla-1.2b/chrome/venkman @dirrm lib/phoenix/lib/mozilla-1.2b/chrome/toolkit/content/global @dirrm lib/phoenix/lib/mozilla-1.2b/chrome/toolkit/content @dirrm lib/phoenix/lib/mozilla-1.2b/chrome/toolkit -- cgit