diff options
| author | lioux <lioux@FreeBSD.org> | 2002-09-03 12:01:28 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2002-09-03 12:01:28 +0800 |
| commit | f0467c8911efd661bde644142a59910edc2e1d87 (patch) | |
| tree | f4a62e9ba6415998f19c2d8ac8979a1d23dbb708 /x11/electricsheep | |
| parent | 95e9a13cc0adaf94c1a4165887bd13db324bbae7 (diff) | |
| download | freebsd-ports-gnome-f0467c8911efd661bde644142a59910edc2e1d87.tar.gz freebsd-ports-gnome-f0467c8911efd661bde644142a59910edc2e1d87.tar.zst freebsd-ports-gnome-f0467c8911efd661bde644142a59910edc2e1d87.zip | |
o Drop PERL in favor of REINPLACE_CMD
o Turn patch into a Makefile regexp
o CC/CFLAGS safeness fixes
o libjpeg is not needed as dependency
Submitted by: maintainer
Diffstat (limited to 'x11/electricsheep')
| -rw-r--r-- | x11/electricsheep/Makefile | 18 | ||||
| -rw-r--r-- | x11/electricsheep/files/patch-electricsheep.c | 12 |
2 files changed, 11 insertions, 19 deletions
diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile index b6f749042652..69ac33c5f0b2 100644 --- a/x11/electricsheep/Makefile +++ b/x11/electricsheep/Makefile @@ -12,22 +12,26 @@ MASTER_SITES= http://www-2.cs.cmu.edu/~spot/cache/ MAINTAINER= dyeske@yahoo.com -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage \ xsetbg:${PORTSDIR}/graphics/xli \ curl:${PORTSDIR}/ftp/curl USE_X_PREFIX= yes GNU_CONFIGURE= yes - -pre-patch: - @${PERL} -pi -e 's|/usr/include/X11|${X11BASE}/include|g; \ - s|/usr/lib/libjpeg.so.62|${LOCALBASE}/lib/libjpeg.so|g;' \ - ${WRKSRC}/video_out/Makefile +USE_REINPLACE= yes post-patch: - @${PERL} -pi -e 's|/usr/local/share|${PREFIX}/share/electricsheep|g;' \ + @${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/share/electricsheep|g; \ + s|setpgrp()|setpgrp(getpid(), getpid())|g' \ ${WRKSRC}/electricsheep.c + @${REINPLACE_CMD} -e 's|/usr/include/X11|${X11BASE}/include|g; \ + s|-I/usr/include||g; \ + s|gcc|${CC}|g; \ + s|^CC|#CC|g; \ + s|/usr/lib/libjpeg.so.62||g' \ + ${WRKSRC}/video_out/Makefile + @${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|g' \ + ${WRKSRC}/flame/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/electricsheep ${PREFIX}/bin diff --git a/x11/electricsheep/files/patch-electricsheep.c b/x11/electricsheep/files/patch-electricsheep.c deleted file mode 100644 index e4f21a9b0085..000000000000 --- a/x11/electricsheep/files/patch-electricsheep.c +++ /dev/null @@ -1,12 +0,0 @@ -$FreeBSD$ ---- electricsheep.c.orig Tue Jul 3 14:55:00 2001 -+++ electricsheep.c Tue Feb 12 12:58:42 2002 -@@ -1223,7 +1223,7 @@ - - /* create our own group so all workers/children may be killed together - without hassle */ -- if (-1 == setpgrp()) -+ if (-1 == setpgrp(getpid(), getpid())) - perror("setpgrp"); - signal(SIGTERM, handle_sig_term); - signal(SIGINT, handle_sig_term); |