diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-11-15 20:07:28 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-11-15 20:07:28 +0000 |
commit | d3863e248a04349b847f2daa44461b7773f79c21 (patch) | |
tree | 7fb0c12e89ba85ced5c11c40442443813ab16088 | |
parent | 6161de9f22cbf4e8641d80d553d4b653a1296b8f (diff) | |
download | ports-d3863e248a04349b847f2daa44461b7773f79c21.tar.gz ports-d3863e248a04349b847f2daa44461b7773f79c21.zip |
Notes
-rw-r--r-- | comms/ghfaxviewer/Makefile | 11 | ||||
-rw-r--r-- | comms/yawmppp/Makefile | 9 |
2 files changed, 11 insertions, 9 deletions
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile index 18158e09d883..2148e3ca02cb 100644 --- a/comms/ghfaxviewer/Makefile +++ b/comms/ghfaxviewer/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= halifax MAINTAINER= domi@saargate.de -COMMENT= a GNOME compliant fax viewer which ist capable of displaying TIFF G3 faxes +COMMENT= GNOME compliant fax viewer capable of displaying TIFF G3 faxes LIB_DEPENDS= gnomeprint.16:${PORTSDIR}/print/gnomeprint \ gconf-1.1:${PORTSDIR}/devel/gconf \ @@ -21,6 +21,7 @@ LIB_DEPENDS= gnomeprint.16:${PORTSDIR}/print/gnomeprint \ USE_GMAKE= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GNOME= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -29,10 +30,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= halifax.1 ghfaxviewer.1 pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${PERL} -pi -e \ - 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|\(\$$(datadir)/\)gnome/|\1|g ; \ + s|\$$(datadir)/locale|$$(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/comms/yawmppp/Makefile b/comms/yawmppp/Makefile index f22eb7db6398..5bd4b3e24e8e 100644 --- a/comms/yawmppp/Makefile +++ b/comms/yawmppp/Makefile @@ -14,6 +14,7 @@ MAINTAINER= pat@FreeBSD.org COMMENT= A Window Maker dockapp that helps with easy use of pppd USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gtk12 @@ -25,14 +26,14 @@ CONFIGURE_ARGS= --x-includes="${X11BASE}/include" \ MAN1= yawmppp.1x pre-patch: - @${PERL} -pi -e "s@-g -O2@${CFLAGS}@g; s@-O2 -Wall@${CFLAGS} -Wall@g; \ + @${REINPLACE_CMD} -e "s@-g -O2@${CFLAGS}@g; s@-O2 -Wall@${CFLAGS} -Wall@g; \ s@-O2@${CFLAGS}@g" ${WRKSRC}/*/Makefile.in \ ${WRKSRC}/configure ${WRKSRC}/*/*/Makefile.in - @${PERL} -pi -e 's!\/usr\/local!${PREFIX}!; \ + @${REINPLACE_CMD} -e 's!\/usr\/local!${PREFIX}!; \ s!/usr/bin!${PREFIX}/bin!' ${WRKSRC}/src/ycommon.c - @${PERL} -pi.orig -e 's|/etc/ppp/yagetmodemspeed|${PREFIX}/bin/yagetmodemspeed|' \ + @${REINPLACE_CMD} -e 's|/etc/ppp\(/yagetmodemspeed\)|${PREFIX}/bin\1|' \ ${WRKSRC}/src/gtksetup/applet.c - @${PERL} -pi.orig -e 's|tac|cat|' ${WRKSRC}/src/dockapp/getmodemspeed.c + @${REINPLACE_CMD} -e 's|tac|cat|' ${WRKSRC}/src/dockapp/getmodemspeed.c do-install: .for file in dockapp/yagetmodemspeed dockapp/${PORTNAME} gtklog/${PORTNAME}.log \ |