diff options
| author | marcus <marcus@FreeBSD.org> | 2004-02-13 15:30:21 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-02-13 15:30:21 +0800 |
| commit | aaa2c217140a563470c800271a992047e7aa769e (patch) | |
| tree | aa9a0c708dc5b562bbd21999eda87254a9b99b10 /www/flock | |
| parent | fa2b10701e2dc13bfa15cce8176036b493a53c41 (diff) | |
| download | freebsd-ports-gnome-aaa2c217140a563470c800271a992047e7aa769e.tar.gz freebsd-ports-gnome-aaa2c217140a563470c800271a992047e7aa769e.tar.zst freebsd-ports-gnome-aaa2c217140a563470c800271a992047e7aa769e.zip | |
Remove the ugly libnspr hack, and be a little more clever when adding
libiconv support. While this approach adds an extra patch, it insures
that the built-in nspr will used without the need for additional messy
symlinks.
Diffstat (limited to 'www/flock')
| -rw-r--r-- | www/flock/Makefile | 8 | ||||
| -rw-r--r-- | www/flock/files/patch-configure | 38 |
2 files changed, 41 insertions, 5 deletions
diff --git a/www/flock/Makefile b/www/flock/Makefile index cd389ba7cae1..90c95bf19f59 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -25,7 +25,8 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 ALL_TARGET= default -CONFIGURE_ENV= WITH_GTK2=yes +CONFIGURE_ENV= WITH_GTK2=yes \ + LOCALBASE=${LOCALBASE} FAKEDIR= ${WRKDIR}/fake FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME} HAS_CONFIGURE= yes @@ -77,7 +78,7 @@ LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/Xft CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib +LDFLAGS+= -L${X11BASE}/lib LIBS+= ${PTHREAD_LIBS} EXTRA_SCRIPTS= ${PORTNAME}.rb @@ -145,7 +146,6 @@ pre-install: .for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS} @${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor - @${ECHO_CMD} lib/firefox/lib/mozilla-1.6/libnspr4.so.1 >> ${PLIST} @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ @@ -174,8 +174,6 @@ post-install: ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \ 's|${FAKEDIR}|${PREFIX}|g' - ${LN} -sf ${LOCAL_PREFIX}/lib/mozilla-1.6/libnspr4.so \ - ${LOCAL_PREFIX}/lib/mozilla-1.6/libnspr4.so.1 -if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ diff --git a/www/flock/files/patch-configure b/www/flock/files/patch-configure new file mode 100644 index 000000000000..9e60372adb33 --- /dev/null +++ b/www/flock/files/patch-configure @@ -0,0 +1,38 @@ +--- configure.orig Fri Feb 13 01:06:29 2004 ++++ configure Fri Feb 13 01:07:17 2004 +@@ -9181,7 +9181,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-liconv $LIBS" ++LIBS="-L$LOCALBASE/lib -liconv $LIBS" + cat > conftest.$ac_ext <<EOF + #line 9187 "configure" + #include "confdefs.h" +@@ -9212,7 +9212,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- _ICONV_LIBS="$_ICONV_LIBS -liconv" ++ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 +@@ -9222,7 +9222,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-liconv $LIBS" ++LIBS="-L$LOCALBASE/lib -liconv $LIBS" + cat > conftest.$ac_ext <<EOF + #line 9228 "configure" + #include "confdefs.h" +@@ -9253,7 +9253,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- _ICONV_LIBS="$_ICONV_LIBS -liconv" ++ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" + else + echo "$ac_t""no" 1>&6 + fi |