Index: head/www/epiphany/Makefile =================================================================== --- head/www/epiphany/Makefile (revision 131154) +++ head/www/epiphany/Makefile (revision 131155) @@ -1,103 +1,107 @@ # Ports collection Makefile for: epiphany # Date created: 24 April 2003 # Whom: Joe Marcus Clarke # # $FreeBSD$ # PORTNAME= epiphany PORTVERSION= 1.6.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.6 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An extremely lightweight and simple web browser for GNOME 2 BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} MOZILLA= mozilla HEADERS_SUFX= .if !defined(WITH_MOZILLA) MOZILLA= mozilla HEADERS_SUFX= .else +.if ${WITH_MOZILLA}=="firefox" +MOZILLA= firefox +.else .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2" MOZILLA= mozilla-devel HEADERS_SUFX= -devel .else MOZILLA= mozilla HEADERS_SUFX= .endif .endif +.endif USE_BZIP2= yes USE_X_PREFIX= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils USE_LIBTOOL_VER=15 USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_OMF= yes -CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \ - --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" +CONFIGURE_ARGS= --with-mozilla=${MOZILLA} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1 PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" MAN1= epiphany.1 .include NO_WERROR= yes # allow build with more warnings enabled .if defined(NO_WERROR) CONFIGURE_ARGS+= --enable-compile-warnings=no .endif .if ${OSVERSION} < 500000 .if ${MOZILLA}=="mozilla-devel" USE_GCC= 3.4 .endif .endif pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} " By default epiphany uses www/mozilla for html rendering, but you can" @${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:" @${ECHO_MSG} + @${ECHO_MSG} " firefox " @${ECHO_MSG} " mozilla-devel " @${ECHO_MSG} "" post-patch: @${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g ; \ s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g ; \ s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g ; \ s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \ ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-lpthread|${PTHREAD_LIBS}|g' @${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' post-configure: @${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g ; \ s|%%MOZILLA%%|${MOZILLA}|g ; \ s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' <${FILESDIR}/epiphany \ > ${WRKDIR}/epiphany post-install: @${MV} -f ${PREFIX}/bin/epiphany ${PREFIX}/bin/epiphany-bin ${INSTALL_SCRIPT} ${WRKDIR}/epiphany ${PREFIX}/bin @-update-desktop-database .include Property changes on: head/www/epiphany/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.70 \ No newline at end of property +1.71 \ No newline at end of property Index: head/www/epiphany-extensions/Makefile =================================================================== --- head/www/epiphany-extensions/Makefile (revision 131154) +++ head/www/epiphany-extensions/Makefile (revision 131155) @@ -1,94 +1,100 @@ # Ports collection Makefile for: epiphany-extensions # Date created: 30 December 2003 # Whom: Joe Marcus Clarke # # $FreeBSD$ # PORTNAME= epiphany PORTVERSION= 1.6.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/1.6 PKGNAMESUFFIX= -extensions DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A set of add-ons for the Epiphany web browser BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany \ ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany \ ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} MOZILLA= mozilla HEADERS_SUFX= .if !defined(WITH_MOZILLA) MOZILLA= mozilla HEADERS_SUFX= .else +.if ${WITH_MOZILLA}=="firefox" +MOZILLA= firefox +.else .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2" MOZILLA= mozilla-devel HEADERS_SUFX= -devel .else MOZILLA= mozilla HEADERS_SUFX= .endif .endif +.endif USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack gnometarget USE_LIBTOOL_VER=15 USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS= --with-extensions="all" +CONFIGURE_ARGS= --with-extensions="all" \ + --with-mozilla=${MOZILLA} PLIST_SUB= VERSION="1.6" EPHY_VERSION="1.6" .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) .undef WITHOUT_OPENSP WITH_OPENSP= yes .endif .include .if exists(${LOCALBASE}/lib/libosp.so) WITH_OPENSP= yes .endif .if defined(WITH_OPENSP) CONFIGURE_ARGS+= --enable-opensp=yes .else CONFIGURE_ARGS+= --disable-opensp .endif .if ${OSVERSION} < 500000 .if ${MOZILLA}=="mozilla-devel" USE_GCC= 3.4 .endif .endif pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} " By default epiphany-extensions builds with www/mozilla support, but you can" @${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:" @${ECHO_MSG} + @${ECHO_MSG} " firefox " @${ECHO_MSG} " mozilla-devel " @${ECHO_MSG} "" @${ECHO_MSG} "Epiphany-extensions also supports the following tunable option(s):" @${ECHO_MSG} " WITH_OPENSP=yes Enable support for OpenSP SGML validation" @${ECHO_MSG} "" post-patch: @${REINPLACE_CMD} -e \ 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \ s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g; \ s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g; \ s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \ ${WRKSRC}/configure .include Property changes on: head/www/epiphany-extensions/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property