diff options
154 files changed, 20 insertions, 556 deletions
diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile index aa0db7faed98..b319d2e7b8c7 100644 --- a/accessibility/gnome-mag/Makefile +++ b/accessibility/gnome-mag/Makefile @@ -25,8 +25,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/accessibility/gnomemag/Makefile b/accessibility/gnomemag/Makefile index aa0db7faed98..b319d2e7b8c7 100644 --- a/accessibility/gnomemag/Makefile +++ b/accessibility/gnomemag/Makefile @@ -25,8 +25,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 7f19dd5e3015..d378827fd289 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -40,10 +40,6 @@ RUN_DEPENDS+= rar:${PORTSDIR}/archivers/rar RUN_DEPENDS+= bzip:${PORTSDIR}/archivers/bzip .endif -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile index 7f19dd5e3015..d378827fd289 100644 --- a/archivers/fileroller/Makefile +++ b/archivers/fileroller/Makefile @@ -40,10 +40,6 @@ RUN_DEPENDS+= rar:${PORTSDIR}/archivers/rar RUN_DEPENDS+= bzip:${PORTSDIR}/archivers/bzip .endif -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 4b6f919a23e4..824b52f560f1 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -30,8 +30,4 @@ USE_GNOME= gnomeprefix gnomehack gnomehier gail gnomedesktop CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/audio/gnomemedia/Makefile b/audio/gnomemedia/Makefile index 0b10604b743e..bffba85be93b 100644 --- a/audio/gnomemedia/Makefile +++ b/audio/gnomemedia/Makefile @@ -26,8 +26,4 @@ CONFIGURE_ARGS= --without-ncurses CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 4b6f919a23e4..824b52f560f1 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -30,8 +30,4 @@ USE_GNOME= gnomeprefix gnomehack gnomehier gail gnomedesktop CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile index ebbf6e7d914b..5428bfc418e4 100644 --- a/databases/gnome-db/Makefile +++ b/databases/gnome-db/Makefile @@ -28,8 +28,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION} -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/databases/gnomedb/Makefile b/databases/gnomedb/Makefile index ebbf6e7d914b..5428bfc418e4 100644 --- a/databases/gnomedb/Makefile +++ b/databases/gnomedb/Makefile @@ -28,8 +28,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION} -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile index d99e4592625c..7dfe86ace624 100644 --- a/databases/libgda/Makefile +++ b/databases/libgda/Makefile @@ -31,8 +31,6 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION} post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ 's|share/idl|share/gnome/idl|g' diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index 0f8799e503b4..7322953ce5af 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -73,8 +73,4 @@ pre-everything:: @${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP." .endif -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index 0f8799e503b4..7322953ce5af 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -73,8 +73,4 @@ pre-everything:: @${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP." .endif -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 5d103a1f3dd4..f639f35818d4 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -25,8 +25,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index e8a9887405e8..3b12b1e7b345 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -25,8 +25,4 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile index ccbff07e7146..ce86287891e2 100644 --- a/deskutils/gnome-pim/Makefile +++ b/deskutils/gnome-pim/Makefile @@ -52,8 +52,6 @@ pre-extract: @${ECHO_MSG} post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure .for file in vcc.y vobject.c @${REINPLACE_CMD} -e "s/malloc[.]h/stdlib.h/g" ${WRKSRC}/libversit/${file} .endfor diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 9907f148b419..0eeb3034d04c 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -31,8 +31,4 @@ MAN1= gnome-calculator.1 \ gnome-character-map.1 gnome-dictionary.1 \ gnome-search-tool.1 gnome-system-log.1 gdialog.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile index ccbff07e7146..ce86287891e2 100644 --- a/deskutils/gnomepim/Makefile +++ b/deskutils/gnomepim/Makefile @@ -52,8 +52,6 @@ pre-extract: @${ECHO_MSG} post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure .for file in vcc.y vobject.c @${REINPLACE_CMD} -e "s/malloc[.]h/stdlib.h/g" ${WRKSRC}/libversit/${file} .endfor diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index 9907f148b419..0eeb3034d04c 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -31,8 +31,4 @@ MAN1= gnome-calculator.1 \ gnome-character-map.1 gnome-dictionary.1 \ gnome-search-tool.1 gnome-system-log.1 gdialog.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/deskutils/libmrproject/Makefile b/deskutils/libmrproject/Makefile index c4fb45a42186..221736bb9da2 100644 --- a/deskutils/libmrproject/Makefile +++ b/deskutils/libmrproject/Makefile @@ -25,10 +25,6 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/libmrproject.sh > ${PREFIX}/etc/rc.d/000.libmrproject.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/000.libmrproject.sh diff --git a/deskutils/mrproject/Makefile b/deskutils/mrproject/Makefile index 0705a34a899d..616c5c4919d1 100644 --- a/deskutils/mrproject/Makefile +++ b/deskutils/mrproject/Makefile @@ -24,10 +24,6 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mrproject.sh > ${PREFIX}/etc/rc.d/000.mrproject.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/000.mrproject.sh diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile index 0705a34a899d..616c5c4919d1 100644 --- a/deskutils/planner/Makefile +++ b/deskutils/planner/Makefile @@ -24,10 +24,6 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mrproject.sh > ${PREFIX}/etc/rc.d/000.mrproject.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/000.mrproject.sh diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index 908c90ff5cb1..b891ee7d3a52 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -26,8 +26,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's#-lpthread#${PTHREAD_LIBS}#g ; \ - s#DATADIRNAME=lib#DATADIRNAME=share#g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/src/Makefile.in diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile index 63a6a751829c..1ffae2fb33ca 100644 --- a/devel/bonobo-conf/Makefile +++ b/devel/bonobo-conf/Makefile @@ -24,8 +24,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index 4b24cca5c10a..4e6fdfb827a5 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -29,8 +29,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index 6c5ccbbb96b4..769484703274 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -23,8 +23,4 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile index 6c5ccbbb96b4..769484703274 100644 --- a/devel/bugbuddy/Makefile +++ b/devel/bugbuddy/Makefile @@ -23,8 +23,4 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile index 9d6bde6ac647..8ead46f79df7 100644 --- a/devel/gconf/Makefile +++ b/devel/gconf/Makefile @@ -30,8 +30,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/gide/Makefile b/devel/gide/Makefile index 4e0ab38d5613..d4217578fb43 100644 --- a/devel/gide/Makefile +++ b/devel/gide/Makefile @@ -31,9 +31,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gide.1 pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + @${PERL} -pi -e \ + 's|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/glade/Makefile b/devel/glade/Makefile index eac2fd1571a6..f36a9ef502f9 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -23,9 +23,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + @${REINPLACE_CMD} -e \ + 's|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|[$$][(]top_builddir[)]/intl/libintl.a|-lintl|g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile index 7de9faca28da..0684b4a250c3 100644 --- a/devel/glade2/Makefile +++ b/devel/glade2/Makefile @@ -25,8 +25,4 @@ USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile index 81979b511d2e..cf5359be0fb4 100644 --- a/devel/gnome-build/Makefile +++ b/devel/gnome-build/Makefile @@ -26,8 +26,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile index 227e75dcfb19..1a0c69c64ad5 100644 --- a/devel/gnome-crash/Makefile +++ b/devel/gnome-crash/Makefile @@ -22,8 +22,4 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 19b32290554c..225db7b0369a 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -48,7 +48,6 @@ LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile index 1cb3447521e5..58740eda5c16 100644 --- a/devel/gnome-vfs1/Makefile +++ b/devel/gnome-vfs1/Makefile @@ -34,8 +34,6 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name 'xml-i18n-*' | xargs ${REINPLACE_CMD} -e \ 's|/usr/local/bin/perl|${PERL}|g' @${REINPLACE_CMD} -e 's|\%\%LOCALBASE\%\%|${LOCALBASE}|g' \ diff --git a/devel/gnomebuild/Makefile b/devel/gnomebuild/Makefile index 81979b511d2e..cf5359be0fb4 100644 --- a/devel/gnomebuild/Makefile +++ b/devel/gnomebuild/Makefile @@ -26,8 +26,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/gnomecrash/Makefile b/devel/gnomecrash/Makefile index 227e75dcfb19..1a0c69c64ad5 100644 --- a/devel/gnomecrash/Makefile +++ b/devel/gnomecrash/Makefile @@ -22,8 +22,4 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/gnomedebug/Makefile b/devel/gnomedebug/Makefile index f0b0a96f5deb..20187d6732f1 100644 --- a/devel/gnomedebug/Makefile +++ b/devel/gnomedebug/Makefile @@ -26,8 +26,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile index 1cb3447521e5..58740eda5c16 100644 --- a/devel/gnomevfs/Makefile +++ b/devel/gnomevfs/Makefile @@ -34,8 +34,6 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name 'xml-i18n-*' | xargs ${REINPLACE_CMD} -e \ 's|/usr/local/bin/perl|${PERL}|g' @${REINPLACE_CMD} -e 's|\%\%LOCALBASE\%\%|${LOCALBASE}|g' \ diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 19b32290554c..225db7b0369a 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -48,7 +48,6 @@ LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 69a11e46390a..096163f99cb9 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -28,8 +28,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" MAKE_ENV= gnomelocaledir=${PREFIX}/share/locale -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 9ef65f167344..bc962afe4b64 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -20,16 +20,12 @@ LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile USE_PERL5= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomelibs +USE_GNOME= gnomelibs gnomehack INSTALLS_SHLIB= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-install: install-info --section="Programming \& development tools" \ --entry="* libgtop: (libgtop). libgtop programming manual" \ diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile index 410cc5dc823f..e21094cc3f8c 100644 --- a/devel/libsigc++/Makefile +++ b/devel/libsigc++/Makefile @@ -21,10 +21,7 @@ COMMENT= Callback Framework for C++ USE_LIBTOOL= yes INSTALLS_SHLIB= yes USE_REINPLACE= yes - -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure +USE_GNOME= gnomehack post-install: .if !defined(NOPORTDOCS) diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile index 808b11c57acd..5596d75ea0a3 100644 --- a/devel/oaf/Makefile +++ b/devel/oaf/Makefile @@ -32,8 +32,4 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= oafd.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/soup/Makefile b/devel/soup/Makefile index a2554d679ff4..1eddf029c79c 100644 --- a/devel/soup/Makefile +++ b/devel/soup/Makefile @@ -25,8 +25,4 @@ CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 3c414d6c31d3..5cda9f06193b 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -26,8 +26,4 @@ MAKE_ENV= OLD_PO_FILE_INPUT=1 MAN1= gedit.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile index 73de69fe174b..f85f9e778842 100644 --- a/editors/gedit2/Makefile +++ b/editors/gedit2/Makefile @@ -31,8 +31,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gedit.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile index e5c24c8df98d..8632c4a66dac 100644 --- a/editors/ghex/Makefile +++ b/editors/ghex/Makefile @@ -21,8 +21,4 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile index 859c66ef4aec..a70721a7cc66 100644 --- a/editors/ghex2/Makefile +++ b/editors/ghex2/Makefile @@ -25,8 +25,4 @@ USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile index 935e82620ff7..f58020bdefee 100644 --- a/editors/glimmer/Makefile +++ b/editors/glimmer/Makefile @@ -36,8 +36,6 @@ PYTHON_LIBS= -lssl -lcrypto PYTHON_LIBS+= -lutil -lreadline -lcrypt -lpython post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|-lpython|${PYTHON_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-lpython|${PYTHON_LIBS}|g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile index 1e87a92534c6..06e56558165d 100644 --- a/finance/gnucash-devel/Makefile +++ b/finance/gnucash-devel/Makefile @@ -47,8 +47,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAN1= gnc-prices.1 gnucash.1 -post-patch: - @${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 1e87a92534c6..06e56558165d 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -47,8 +47,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAN1= gnc-prices.1 gnucash.1 -post-patch: - @${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/ftp/gtm/Makefile b/ftp/gtm/Makefile index acec9ac282b3..975b6e953130 100644 --- a/ftp/gtm/Makefile +++ b/ftp/gtm/Makefile @@ -31,8 +31,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gtm.1 gtm_applet.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/games/atomix/Makefile b/games/atomix/Makefile index c48d33ad9b7a..d65e6da742f5 100644 --- a/games/atomix/Makefile +++ b/games/atomix/Makefile @@ -20,8 +20,4 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile index 5ff36ccdc433..ac19436bc0f1 100644 --- a/games/bombermaze/Makefile +++ b/games/bombermaze/Makefile @@ -24,8 +24,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CFLAGS+= -fpermissive -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index d552b9d6051b..48a9091f16cc 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -30,8 +30,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile index 31e29cd2ae12..e8306574f6b4 100644 --- a/games/gnomegames/Makefile +++ b/games/gnomegames/Makefile @@ -30,8 +30,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ LIBS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ 's|malloc[.]h|stdlib.h|g' diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index d552b9d6051b..48a9091f16cc 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -30,8 +30,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/games/gnomoku/Makefile b/games/gnomoku/Makefile index 1e527020c5e4..bdf2a7e7d45f 100644 --- a/games/gnomoku/Makefile +++ b/games/gnomoku/Makefile @@ -23,8 +23,4 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-fpermissive -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 2c6892aee0ee..4879f830405a 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -38,8 +38,4 @@ PLIST_SUB= PYTHON:="" PLIST_SUB= PYTHON:="@comment " .endif -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile index 8b135f9bfe6a..32aa1bbaaf43 100644 --- a/graphics/electriceyes/Makefile +++ b/graphics/electriceyes/Makefile @@ -22,10 +22,6 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-install: ${MV} ${PREFIX}/bin/ee ${PREFIX}/bin/ElectricEyes diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index baef4fa47cf9..c0beb90593fe 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -22,8 +22,4 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile index 416c2c69ad88..42b8c0b10844 100644 --- a/graphics/eog2/Makefile +++ b/graphics/eog2/Makefile @@ -26,8 +26,4 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/graphics/frontline/Makefile b/graphics/frontline/Makefile index 233f98c477b0..8aff378fadc6 100644 --- a/graphics/frontline/Makefile +++ b/graphics/frontline/Makefile @@ -24,8 +24,4 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 547f87d24442..d75f3f70b62f 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -27,8 +27,4 @@ CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index e3c2c5f2967f..b7638323f862 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -55,8 +55,4 @@ pre-everything:: @${ECHO_MSG} " WITH_GIMP=yes Build an svg plugin for gimp-devel (default: auto)" @${ECHO_MSG} "" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.post.mk> diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile index 6f9e5bc64ec5..3c5186300938 100644 --- a/graphics/sodipodi/Makefile +++ b/graphics/sodipodi/Makefile @@ -27,8 +27,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 MAN1= sodipodi.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index d9d7aea8c80e..cb9e225b7554 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -74,9 +74,4 @@ pre-everything:: @${ECHO_MSG} "WITH_TCL=yes for tcl support" .endif -post-patch: - @${REINPLACE_CMD} \ - -e 's|-lpthread|${PTHREAD_LIBS}|g;' \ - ${WRKSRC}/configure - .include <bsd.port.post.mk> diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile index d9d7aea8c80e..cb9e225b7554 100644 --- a/irc/xchat2/Makefile +++ b/irc/xchat2/Makefile @@ -74,9 +74,4 @@ pre-everything:: @${ECHO_MSG} "WITH_TCL=yes for tcl support" .endif -post-patch: - @${REINPLACE_CMD} \ - -e 's|-lpthread|${PTHREAD_LIBS}|g;' \ - ${WRKSRC}/configure - .include <bsd.port.post.mk> diff --git a/lang/gnomebasic/Makefile b/lang/gnomebasic/Makefile index e30e6f54ccda..9a42f7fe8ca8 100644 --- a/lang/gnomebasic/Makefile +++ b/lang/gnomebasic/Makefile @@ -24,8 +24,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index 44bf1ba5434b..7db142576818 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -37,9 +37,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ MAN1= balsa.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' \ - ${WRKSRC}/configure ${WRKSRC}/libmutt/configure - .include <bsd.port.mk> diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile index 4d2db5c4b6ab..b1ddd612b9a1 100644 --- a/mail/balsa2/Makefile +++ b/mail/balsa2/Makefile @@ -47,9 +47,4 @@ LIB_DEPENDS+= gpgme.9:${PORTSDIR}/security/gpgme CONFIGURE_ARGS+= --enable-gpgme .endif -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' \ - ${WRKSRC}/configure ${WRKSRC}/libmutt/configure - .include <bsd.port.mk> diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index 532ea5f274ac..e16a135df4d7 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -25,8 +25,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 0129f898bd3a..616808a45f4b 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -36,10 +36,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ PLIST_SUB= VERSION=${PORTVERSION}-bonobo -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-install: .for dir in share/gnome lib @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${dir}/gnumeric diff --git a/math/guppi/Makefile b/math/guppi/Makefile index 35ccc8431bd6..0462219eb5a6 100644 --- a/math/guppi/Makefile +++ b/math/guppi/Makefile @@ -37,8 +37,4 @@ PLIST_SUB= VERSION="${PORTVERSION}" post-extract: @cd ${PORTSDIR}/math/gnumeric && ${MAKE} patch -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile index 34cc7cfe1244..27932db97bda 100644 --- a/misc/gnome-user-docs/Makefile +++ b/misc/gnome-user-docs/Makefile @@ -27,8 +27,4 @@ USE_REINPLACE= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack gnomehier -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/misc/gnomeuserdocs2/Makefile b/misc/gnomeuserdocs2/Makefile index 34cc7cfe1244..27932db97bda 100644 --- a/misc/gnomeuserdocs2/Makefile +++ b/misc/gnomeuserdocs2/Makefile @@ -27,8 +27,4 @@ USE_REINPLACE= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack gnomehier -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile index 96af594ddf0f..0908ecccf3ac 100644 --- a/misc/gnomeutils/Makefile +++ b/misc/gnomeutils/Makefile @@ -32,8 +32,4 @@ MAN1= gcalc.1 gcharmap.1 gcolorsel.1 gdialog.1 gdict.1 gdiskfree.1 \ stripchart.1 MAN8= gshutdown.8 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile index 9907f148b419..0eeb3034d04c 100644 --- a/misc/gnomeutils2/Makefile +++ b/misc/gnomeutils2/Makefile @@ -31,8 +31,4 @@ MAN1= gnome-calculator.1 \ gnome-character-map.1 gnome-dictionary.1 \ gnome-search-tool.1 gnome-system-log.1 gdialog.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/misc/metatheme2/Makefile b/misc/metatheme2/Makefile index 7b666213ced2..55c6810441dd 100644 --- a/misc/metatheme2/Makefile +++ b/misc/metatheme2/Makefile @@ -22,6 +22,7 @@ LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= gnomehack USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes @@ -33,8 +34,6 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION} pre-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ s|[(]datadir[)]/locale|(prefix)/share/locale|g' diff --git a/multimedia/acme/Makefile b/multimedia/acme/Makefile index 1288394b4c6f..e72a5266919a 100644 --- a/multimedia/acme/Makefile +++ b/multimedia/acme/Makefile @@ -25,8 +25,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/acme.c diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile index b7b8d81008c1..a84f5de3c166 100644 --- a/net-im/gnomeicu/Makefile +++ b/net-im/gnomeicu/Makefile @@ -46,9 +46,7 @@ CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ CFLAGS="${CFLAGS}" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|gnet|gnet-glib2|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|gnet|gnet-glib2|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|GNOME_PARAM_GNOME_DATADIR|GNOME_PARAM_APP_DATADIR|g' \ ${WRKSRC}/src/gnomeicu.c diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile index b7b8d81008c1..a84f5de3c166 100644 --- a/net-im/gnomeicu2/Makefile +++ b/net-im/gnomeicu2/Makefile @@ -46,9 +46,7 @@ CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ CFLAGS="${CFLAGS}" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|gnet|gnet-glib2|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|gnet|gnet-glib2|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|GNOME_PARAM_GNOME_DATADIR|GNOME_PARAM_APP_DATADIR|g' \ ${WRKSRC}/src/gnomeicu.c diff --git a/net/gabber/Makefile b/net/gabber/Makefile index b87859dc8129..1f78219a1f8e 100644 --- a/net/gabber/Makefile +++ b/net/gabber/Makefile @@ -39,10 +39,6 @@ MAN1= gabber.1 BROKEN= "Crashes or hangs on 5.x" .endif -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - pre-build: @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f diff --git a/net/gnet-glib2/Makefile b/net/gnet-glib2/Makefile index 2ccdb23ae2eb..9c5e6137aacf 100644 --- a/net/gnet-glib2/Makefile +++ b/net/gnet-glib2/Makefile @@ -23,9 +23,6 @@ CONFIGURE_ARGS= --enable-glib2 MAN1= gnet-glib2-config.1 post-patch: -# fix pthreads detection - @${REINPLACE_CMD} -E -e 's,-lpthread|-lc_r,${PTHREAD_LIBS},' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # remove "release" information from lib name @${REINPLACE_CMD} -E -e 's|-release[ ]+\$$\(LT_RELEASE\)||g' \ ${WRKSRC}/src/Makefile.in diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile index 2ccdb23ae2eb..9c5e6137aacf 100644 --- a/net/gnet2/Makefile +++ b/net/gnet2/Makefile @@ -23,9 +23,6 @@ CONFIGURE_ARGS= --enable-glib2 MAN1= gnet-glib2-config.1 post-patch: -# fix pthreads detection - @${REINPLACE_CMD} -E -e 's,-lpthread|-lc_r,${PTHREAD_LIBS},' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # remove "release" information from lib name @${REINPLACE_CMD} -E -e 's|-release[ ]+\$$\(LT_RELEASE\)||g' \ ${WRKSRC}/src/Makefile.in diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile index 9a6204ef53b4..de8333584590 100644 --- a/net/gnomeicu/Makefile +++ b/net/gnomeicu/Makefile @@ -44,8 +44,4 @@ CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ CFLAGS="${CFLAGS}" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile index b7b8d81008c1..a84f5de3c166 100644 --- a/net/gnomeicu/gnomeicu/Makefile +++ b/net/gnomeicu/gnomeicu/Makefile @@ -46,9 +46,7 @@ CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ CFLAGS="${CFLAGS}" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|gnet|gnet-glib2|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|gnet|gnet-glib2|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|GNOME_PARAM_GNOME_DATADIR|GNOME_PARAM_APP_DATADIR|g' \ ${WRKSRC}/src/gnomeicu.c diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile index b7b8d81008c1..a84f5de3c166 100644 --- a/net/gnomeicu2/Makefile +++ b/net/gnomeicu2/Makefile @@ -46,9 +46,7 @@ CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ CFLAGS="${CFLAGS}" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|gnet|gnet-glib2|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|gnet|gnet-glib2|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|GNOME_PARAM_GNOME_DATADIR|GNOME_PARAM_APP_DATADIR|g' \ ${WRKSRC}/src/gnomeicu.c diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile index 9210c825aeae..ec535dc426a8 100644 --- a/net/netspeed_applet/Makefile +++ b/net/netspeed_applet/Makefile @@ -23,8 +23,4 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/news/pan/Makefile b/news/pan/Makefile index ca8095687e96..071284ce772a 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -29,8 +29,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ CONFIGURE_ARGS= --enable-html CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/news/pan2/Makefile b/news/pan2/Makefile index 0e3cddd81068..6983bb1c19f8 100644 --- a/news/pan2/Makefile +++ b/news/pan2/Makefile @@ -31,9 +31,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ CONFIGURE_ARGS= --enable-html post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|gnet-config|gnet-glib2-config|g ; \ + @${REINPLACE_CMD} -e 's|gnet-config|gnet-glib2-config|g ; \ s|gnet/gnet\.h|gnet-glib2/gnet.h|g' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ 's|gnet/gnet\.h|gnet-glib2/gnet.h|g' diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile index 7b1a2e062895..7689e05dadfd 100644 --- a/palm/gnome-pilot-conduits/Makefile +++ b/palm/gnome-pilot-conduits/Makefile @@ -30,8 +30,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \ ${WRKSRC}/mal-conduit/mal/client/unix/MAL31DBConfig.c diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile index c08715effd37..bed8943f9bcd 100644 --- a/palm/gnome-pilot/Makefile +++ b/palm/gnome-pilot/Makefile @@ -32,8 +32,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gpilot-install-file.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/palm/gnomepilot-conduits/Makefile b/palm/gnomepilot-conduits/Makefile index a339a00d0f90..672fd93846f7 100644 --- a/palm/gnomepilot-conduits/Makefile +++ b/palm/gnomepilot-conduits/Makefile @@ -27,8 +27,4 @@ CONFIGURE_ARGS= --with-pisock=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile index 7b1a2e062895..7689e05dadfd 100644 --- a/palm/gnomepilot-conduits2/Makefile +++ b/palm/gnomepilot-conduits2/Makefile @@ -30,8 +30,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \ ${WRKSRC}/mal-conduit/mal/client/unix/MAL31DBConfig.c diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile index 8a3e82b8302e..23035c012be4 100644 --- a/palm/gnomepilot/Makefile +++ b/palm/gnomepilot/Makefile @@ -34,8 +34,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gpilot-install-file.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile index c08715effd37..bed8943f9bcd 100644 --- a/palm/gnomepilot2/Makefile +++ b/palm/gnomepilot2/Makefile @@ -32,8 +32,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gpilot-install-file.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/print/ggv/Makefile b/print/ggv/Makefile index 3753758bbfa7..1454571a83eb 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -26,8 +26,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -post-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index 1929a36f847e..50ebce79d61c 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -32,10 +32,6 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-install: @${TOUCH} ${PREFIX}/etc/gnome/fonts/gnome-print-x11.fontmap diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile index 1929a36f847e..50ebce79d61c 100644 --- a/print/gnomeprint/Makefile +++ b/print/gnomeprint/Makefile @@ -32,10 +32,6 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-install: @${TOUCH} ${PREFIX}/etc/gnome/fonts/gnome-print-x11.fontmap diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index da80e11d6d9e..636d8624265e 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -28,8 +28,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PLIST_SUB= VERSION=${PORTVERSION} post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name '*.[ch]' | xargs ${REINPLACE_CMD} -e \ 's|<malloc[.]h>|<stdlib.h>|' diff --git a/print/libgnomeprint20/Makefile b/print/libgnomeprint20/Makefile index 56d0fbf1f042..969938700afc 100644 --- a/print/libgnomeprint20/Makefile +++ b/print/libgnomeprint20/Makefile @@ -27,8 +27,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name '*.[ch]' | xargs ${REINPLACE_CMD} -e \ 's|<malloc[.]h>|<stdlib.h>|' diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index b1ee3f6b2c0d..f27977da5934 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -25,8 +25,4 @@ USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index c135dd016b4a..a740f6b1916c 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -27,8 +27,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile index 8efa470395eb..31209216df68 100644 --- a/sysutils/gnome-control-center1/Makefile +++ b/sysutils/gnome-control-center1/Makefile @@ -25,8 +25,4 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile index 3437052c8543..62faa2bee7eb 100644 --- a/sysutils/gnome-pkgview/Makefile +++ b/sysutils/gnome-pkgview/Makefile @@ -23,8 +23,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/src/config-path.c diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index ee71719aaa42..9eac079eed93 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -27,8 +27,4 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lutil" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile index 8efa470395eb..31209216df68 100644 --- a/sysutils/gnomecontrolcenter/Makefile +++ b/sysutils/gnomecontrolcenter/Makefile @@ -25,8 +25,4 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index c135dd016b4a..a740f6b1916c 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -27,8 +27,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index ee71719aaa42..9eac079eed93 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -27,8 +27,4 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lutil" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile index 3fed3b2fc382..4af9ca01fbe2 100644 --- a/sysutils/gtop/Makefile +++ b/sysutils/gtop/Makefile @@ -24,8 +24,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" MAKE_ENV= OLD_PO_FILE_INPUT=1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile index d78fd232f6a4..1461edc7415a 100644 --- a/sysutils/medusa/Makefile +++ b/sysutils/medusa/Makefile @@ -29,8 +29,4 @@ MAN5= medusa.conf.5 medusa-file-index-stoplist.5 MAN7= medusa-search-uri.7 MAN8= medusa-searchd.8 -post-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile index 0a95c2120b4d..4a81eca7962f 100644 --- a/textproc/gtkspell/Makefile +++ b/textproc/gtkspell/Makefile @@ -25,8 +25,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/textproc/gtkspell2/Makefile b/textproc/gtkspell2/Makefile index 0a95c2120b4d..4a81eca7962f 100644 --- a/textproc/gtkspell2/Makefile +++ b/textproc/gtkspell2/Makefile @@ -25,8 +25,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 28e02a8d5c38..4fbb6700ac6b 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -80,7 +80,4 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/catalog.c ${WRKSRC}/xmlcatalog.c - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index 02d29007d471..aecc263d0a05 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -62,8 +62,6 @@ MTREE_FILE= /etc/mtree/BSD.x11-4.dist .endif post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ 's|[(]LN_S[)] -f -n|(LN_S) -f|g' @${REINPLACE_CMD} -e 's|/usr/share/locale|${PREFIX}/share/locale|g' \ diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 45eb73df6b6a..9ed8809c1902 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -74,9 +74,7 @@ pre-everything:: @${ECHO_MSG} "" 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 + @${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${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 \ diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 85d7284b1e83..6ddcc7311054 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -12,8 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= gnome@FreeBSD.org -COMMENT= A GNOME Web browser based on gecko (the Mozilla rendering engine) - +COMMENT= A GNOME Web browser based on gecko (the Mozilla rendering engine) BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \ ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv @@ -93,8 +92,6 @@ pre-everything:: @${ECHO_MSG} "" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|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 \ diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 4fa8c5674f36..ce9599e785fd 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -36,10 +36,6 @@ VERSION= ${PORTNAME}-${PORTVERSION} LIB_DEPENDS+= soup.6:${PORTSDIR}/devel/soup .endif -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-configure: @${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index eb455c33c42b..7473e02b1560 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -26,8 +26,4 @@ USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index 5fa75f41539c..9c9533593144 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -40,8 +40,4 @@ CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \ MAN1= nautilus-xml-migrate.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index 947ac50b2f3b..0bf6c2b25e1f 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -34,10 +34,6 @@ CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \ --with-freetype2-include-place=${LOCALBASE}/include/freetype2 MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-install: @${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile index df8c38a73779..0058bf0b7600 100644 --- a/x11-toolkits/bakery/Makefile +++ b/x11-toolkits/bakery/Makefile @@ -26,8 +26,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index d36475490472..d7affdac430d 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -27,8 +27,4 @@ CONFIGURE_ARGS= --enable-shared --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile index af992924bead..8ddd07a436fe 100644 --- a/x11-toolkits/eel2/Makefile +++ b/x11-toolkits/eel2/Makefile @@ -29,8 +29,4 @@ CONFIGURE_ARGS= --enable-shared --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile index 4b679ad22361..aabc3cd2502d 100644 --- a/x11-toolkits/gal/Makefile +++ b/x11-toolkits/gal/Makefile @@ -33,10 +33,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PLIST_SUB= VERSION=${PORTVERSION} -.if !target(post-patch) -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure -.endif - .include <bsd.port.mk> diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile index d0a76cce00ca..1dbdfaea4362 100644 --- a/x11-toolkits/gdl/Makefile +++ b/x11-toolkits/gdl/Makefile @@ -22,8 +22,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile index 4bec04023ee6..a4d1552dc834 100644 --- a/x11-toolkits/gtksourceview/Makefile +++ b/x11-toolkits/gtksourceview/Makefile @@ -25,8 +25,4 @@ USE_GNOME= gnomeprefix gnomehack libgnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lgnuregex" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index c83bf25d651c..88582245f6bd 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -25,8 +25,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 3337160b650d..5f7bd8656712 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -27,8 +27,4 @@ USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-toolkits/libgnomeprintui20/Makefile b/x11-toolkits/libgnomeprintui20/Makefile index a7a8ded5d96a..bb0635ce5eb5 100644 --- a/x11-toolkits/libgnomeprintui20/Makefile +++ b/x11-toolkits/libgnomeprintui20/Makefile @@ -30,8 +30,4 @@ USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index 2bc2cf8f0951..273302bfbdaa 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -31,8 +31,4 @@ USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile index 8c714a705b15..f20cd3b25e7c 100644 --- a/x11-toolkits/libzvt/Makefile +++ b/x11-toolkits/libzvt/Makefile @@ -28,8 +28,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 75b5468fe854..e33c61128113 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -29,8 +29,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile index 7bac070f9ad6..4f0b8d4dab3e 100644 --- a/x11-wm/sawfish/Makefile +++ b/x11-wm/sawfish/Makefile @@ -56,9 +56,7 @@ CONFIGURE_ARGS+=--disable-capplet \ .endif post-patch: - @${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + @${REINPLACE_CMD} -e 's|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|[(]top_builddir[)]/intl/libintl.a|-lintl|g' ${WRKSRC}/configure post-install: diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile index 53d7ec1e40bc..5331ee59c024 100644 --- a/x11-wm/sawfish2/Makefile +++ b/x11-wm/sawfish2/Makefile @@ -44,9 +44,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//} post-patch: - @${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + @${REINPLACE_CMD} -e 's|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|[$$][(]top_builddir[)]/intl/libintl.a|-lintl|g' ${WRKSRC}/configure post-install: diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index e3fe64b509bc..ab029bd1f11c 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -49,10 +49,6 @@ post-extract: @${SED} -e "s,%%PREFIX%%,${PREFIX},g" \ ${FILESDIR}/gdm.sh.sample > ${WRKSRC}/gdm.sh.sample -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 5224fb320070..dec64e5483e3 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -36,8 +36,4 @@ PLIST_SUB= BATTERY="@comment " PLIST_SUB= BATTERY="" .endif -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.post.mk> diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 63ade0c1b7d2..8ae160c83395 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -32,8 +32,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gnome-about.1 post-patch: - @${REINPLACE_CMD} -E -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|GNOME_VENDOR=.*$$|GNOME_VENDOR="FreeBSD GNOME Project"| ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -E -e 's|GNOME_VENDOR=.*$$|GNOME_VENDOR="FreeBSD GNOME Project"|' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 7bee2ee59ad2..e9f3e08cacdf 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -41,8 +41,6 @@ MAN1= dns-helper.1 gconfigger.1 gnome-bug.1 gnome-config.1 \ MAN5= gnome-mime.5 post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/gnome-config.in ${WRKSRC}/libgnome/gnome-util.c diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index eeab7d719f29..f8d30ecc3b77 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -31,8 +31,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAN1= gnome-panel.1 gnome-panel-preferences.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 051b3ac8b369..125b45fae2a9 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -29,8 +29,4 @@ MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \ gnome-session-save.1 MAN5= default.session.5 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11/gnomeapplets/Makefile b/x11/gnomeapplets/Makefile index 5b47e24daac9..63563113ece2 100644 --- a/x11/gnomeapplets/Makefile +++ b/x11/gnomeapplets/Makefile @@ -45,8 +45,4 @@ PLIST_SUB= BATTERY="" MAN1+= battery_applet.1 .endif -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.post.mk> diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index 5224fb320070..dec64e5483e3 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -36,8 +36,4 @@ PLIST_SUB= BATTERY="@comment " PLIST_SUB= BATTERY="" .endif -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.post.mk> diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile index 9edb8fac4ca5..e9e3b1a9e6ac 100644 --- a/x11/gnomecore/Makefile +++ b/x11/gnomecore/Makefile @@ -38,8 +38,4 @@ MAN1= deskguide_applet.1 gmenu.1 gnome-about.1 gnome-convert.1 \ session-properties-capplet.1 MAN5= default.session.5 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile index 63ade0c1b7d2..8ae160c83395 100644 --- a/x11/gnomedesktop/Makefile +++ b/x11/gnomedesktop/Makefile @@ -32,8 +32,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gnome-about.1 post-patch: - @${REINPLACE_CMD} -E -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|GNOME_VENDOR=.*$$|GNOME_VENDOR="FreeBSD GNOME Project"| ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -E -e 's|GNOME_VENDOR=.*$$|GNOME_VENDOR="FreeBSD GNOME Project"|' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 7bee2ee59ad2..e9f3e08cacdf 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -41,8 +41,6 @@ MAN1= dns-helper.1 gconfigger.1 gnome-bug.1 gnome-config.1 \ MAN5= gnome-mime.5 post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/gnome-config.in ${WRKSRC}/libgnome/gnome-util.c diff --git a/x11/gnomemag/Makefile b/x11/gnomemag/Makefile index aa0db7faed98..b319d2e7b8c7 100644 --- a/x11/gnomemag/Makefile +++ b/x11/gnomemag/Makefile @@ -25,8 +25,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile index eeab7d719f29..f8d30ecc3b77 100644 --- a/x11/gnomepanel/Makefile +++ b/x11/gnomepanel/Makefile @@ -31,8 +31,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAN1= gnome-panel.1 gnome-panel-preferences.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile index 051b3ac8b369..125b45fae2a9 100644 --- a/x11/gnomesession/Makefile +++ b/x11/gnomesession/Makefile @@ -29,8 +29,4 @@ MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \ gnome-session-save.1 MAN5= default.session.5 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index 6a3f118224c8..98791038bb0d 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -30,8 +30,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11/xalf/Makefile b/x11/xalf/Makefile index 61279360849a..1ac776ba871d 100644 --- a/x11/xalf/Makefile +++ b/x11/xalf/Makefile @@ -24,8 +24,4 @@ INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index df4a9cc1e4e7..b300b169837d 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -23,7 +23,7 @@ USE_XPM= yes USE_MESA= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomehier libglade2 +USE_GNOME= gnomehier libglade2 gnomehack GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --with-xml \ --with-hackdir=${PREFIX}/bin/xscreensaver-hacks \ @@ -67,8 +67,6 @@ MAN1= anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \ xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1 post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|malloc[.]h|stdlib.h|g' \ ${WRKSRC}/hacks/glx/extrusion.c @${REINPLACE_CMD} -e 's|
||' \ diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 7b9d284cd255..0a110d1fe6f9 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -26,8 +26,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|\@prefix\@/share|\@datadir\@|g' \ ${WRKSRC}/stylesheets/docbook/catalog.in |