Install the pkg-config files with a -devel suffix to avoid a conflict with

mozilla-gtk2.  Teach galeon2 to use these new files.  Note, any other app
that depends on these files not having the optional -devel suffix will
need to be re-educated as well.
This commit is contained in:
Joe Marcus Clarke 2003-04-24 05:46:09 +00:00
parent 755907503e
commit 73f9d1897c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=79561
6 changed files with 18 additions and 17 deletions

View file

@ -76,6 +76,7 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@${FIND} ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
's|-lpthread|${PTHREAD_LIBS}|g'

View file

@ -6,7 +6,7 @@
#
PORTNAME= mozilla
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 0
CATEGORIES= www

View file

@ -6,7 +6,7 @@
#
PORTNAME= mozilla
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 0
CATEGORIES= www

View file

@ -135,8 +135,8 @@ CONFIGURE_ARGS+= --disable-composer
.if defined(WITH_GTK2)
CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
PKGCONFIG_FILES= mozilla-gtkmozembed.pc mozilla-js.pc mozilla-xpcom.pc \
mozilla-nspr.pc mozilla-nss.pc
PKGCONFIG_FILES= mozilla-gtkmozembed mozilla-js mozilla-xpcom \
mozilla-nspr mozilla-nss
EXTRA_PATCHES= ${FILESDIR}/xim_dekita2.patch
.else
CONFIGURE_ARGS+= --enable-default-toolkit=gtk
@ -226,7 +226,7 @@ pre-install:
${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
${ECHO_CMD} libdata/pkgconfig/$$pcfile >> ${PLIST} ; \
${ECHO_CMD} libdata/pkgconfig/$${pcfile}-devel.pc >> ${PLIST} ; \
done
.endif
@ -248,8 +248,8 @@ do-install:
fi
.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
${INSTALL_DATA} ${WRKSRC}/build/unix/$$pcfile \
${PREFIX}/libdata/pkgconfig ; \
${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
${PREFIX}/libdata/pkgconfig/$${pcfile}-devel.pc ; \
done
.endif

View file

@ -135,8 +135,8 @@ CONFIGURE_ARGS+= --disable-composer
.if defined(WITH_GTK2)
CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
PKGCONFIG_FILES= mozilla-gtkmozembed.pc mozilla-js.pc mozilla-xpcom.pc \
mozilla-nspr.pc mozilla-nss.pc
PKGCONFIG_FILES= mozilla-gtkmozembed mozilla-js mozilla-xpcom \
mozilla-nspr mozilla-nss
EXTRA_PATCHES= ${FILESDIR}/xim_dekita2.patch
.else
CONFIGURE_ARGS+= --enable-default-toolkit=gtk
@ -226,7 +226,7 @@ pre-install:
${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
${ECHO_CMD} libdata/pkgconfig/$$pcfile >> ${PLIST} ; \
${ECHO_CMD} libdata/pkgconfig/$${pcfile}-devel.pc >> ${PLIST} ; \
done
.endif
@ -248,8 +248,8 @@ do-install:
fi
.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
${INSTALL_DATA} ${WRKSRC}/build/unix/$$pcfile \
${PREFIX}/libdata/pkgconfig ; \
${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
${PREFIX}/libdata/pkgconfig/$${pcfile}-devel.pc ; \
done
.endif

View file

@ -135,8 +135,8 @@ CONFIGURE_ARGS+= --disable-composer
.if defined(WITH_GTK2)
CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
PKGCONFIG_FILES= mozilla-gtkmozembed.pc mozilla-js.pc mozilla-xpcom.pc \
mozilla-nspr.pc mozilla-nss.pc
PKGCONFIG_FILES= mozilla-gtkmozembed mozilla-js mozilla-xpcom \
mozilla-nspr mozilla-nss
EXTRA_PATCHES= ${FILESDIR}/xim_dekita2.patch
.else
CONFIGURE_ARGS+= --enable-default-toolkit=gtk
@ -226,7 +226,7 @@ pre-install:
${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
${ECHO_CMD} libdata/pkgconfig/$$pcfile >> ${PLIST} ; \
${ECHO_CMD} libdata/pkgconfig/$${pcfile}-devel.pc >> ${PLIST} ; \
done
.endif
@ -248,8 +248,8 @@ do-install:
fi
.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
${INSTALL_DATA} ${WRKSRC}/build/unix/$$pcfile \
${PREFIX}/libdata/pkgconfig ; \
${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
${PREFIX}/libdata/pkgconfig/$${pcfile}-devel.pc ; \
done
.endif