Date: Thu, 14 Aug 2014 16:02:17 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364852 - in head/german/steak: . files Message-ID: <201408141602.s7EG2Hr9067743@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Thu Aug 14 16:02:17 2014 New Revision: 364852 URL: http://svnweb.freebsd.org/changeset/ports/364852 QAT: https://qat.redports.org/buildarchive/r364852/ Log: 1: Stagify. 2: convert to OPTIONS. Added: head/german/steak/files/patch-Poll__poll.c - copied unchanged from r364845, head/german/steak/files/patch-Poll:poll.c Deleted: head/german/steak/files/patch-Poll:poll.c Modified: head/german/steak/Makefile head/german/steak/pkg-plist Modified: head/german/steak/Makefile ============================================================================== --- head/german/steak/Makefile Thu Aug 14 15:22:00 2014 (r364851) +++ head/german/steak/Makefile Thu Aug 14 16:02:17 2014 (r364852) @@ -3,7 +3,7 @@ PORTNAME= steak PORTVERSION= 1.7.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= german MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Steak%20${PORTVERSION} \ http://www.tm.informatik.uni-frankfurt.de/%7Erazi/steak/program/ @@ -14,42 +14,45 @@ COMMENT= English <-> German dictionary u RUN_DEPENDS= ispell:${PORTSDIR}/textproc/aspell-ispell -USE_XORG= xt +USES= tar:bzip2 MAKE_JOBS_UNSAFE= yes +WRKSRC= ${WRKDIR}/Steak +OPTIONS_DEFINE= GTK1 +OPTIONS_DEFAULT= GTK1 -.if defined(WITHOUT_XSTEAK) -USE_XORG= x11 -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MGTK1} +USE_XORG= xt USE_GNOME= gtk12 MAKE_ARGS= -D xsteak -.endif -WRKSRC= ${WRKDIR}/Steak -USES= tar:bzip2 - -.if defined(WITHOUT_XSTEAK) -PLIST_SUB+= NOXSTEAK:="@comment " +PLIST_SUB+= XSTEAK="" .else -PLIST_SUB+= NOXSTEAK:="" +USE_XORG= x11 +PLIST_SUB+= XSTEAK="@comment " .endif -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e "s,\$$HOME/bin/Steak/Datensatz,${PREFIX}/share/steak/Datensatz,; \ s,BINDIR=\$$HOME/bin/Steak,BINDIR=${DATADIR},; \ s,$$BINDIR/help.txt,${DATADIR}/help.txt,g" ${WRKSRC}/woerterbuch - ${REINPLACE_CMD} -e "s,/usr/X11R6/,${LOCALBASE}/,g" ${WRKSRC}/Printbuffer/Makefile + ${REINPLACE_CMD} -e "s,/usr/X11R6/,${LOCALBASE}/,g; s,CC = gcc,CC ?= gcc," ${WRKSRC}/Printbuffer/Makefile + ${REINPLACE_CMD} -e "s,CC = gcc,CC ?= gcc," ${WRKSRC}/Poll/Makefile + ${REINPLACE_CMD} -e "s,CC = gcc,CC ?= gcc," ${WRKSRC}/SpaceFilter/Makefile + ${REINPLACE_CMD} -e "s,gcc,${CC}," ${WRKSRC}/Xsteak/Makefile_gtk_1.2 do-install: -.if !defined(WITHOUT_XSTEAK) - ${INSTALL_PROGRAM} ${WRKSRC}/Xsteak/xsteak ${PREFIX}/bin/ +.if ${PORT_OPTIONS:MGTK1} + ${INSTALL_PROGRAM} ${WRKSRC}/Xsteak/xsteak ${STAGEDIR}${PREFIX}/bin/ .endif - ${INSTALL_SCRIPT} ${WRKSRC}/woerterbuch ${PREFIX}/bin/steak - ${MKDIR} ${DATADIR}/Datensatz - ${INSTALL_DATA} ${WRKSRC}/Datensatz/* ${DATADIR}/Datensatz + ${INSTALL_SCRIPT} ${WRKSRC}/woerterbuch ${STAGEDIR}${PREFIX}/bin/steak + @${MKDIR} ${STAGEDIR}${DATADIR}/Datensatz + ${INSTALL_DATA} ${WRKSRC}/Datensatz/* ${STAGEDIR}${DATADIR}/Datensatz cd ${WRKSRC}; ${INSTALL_DATA} README README.eng help.txt \ mini_steak_icon.xpm pinguin_steak_icon.xpm \ - .Steakconfig ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/Xpm/* ${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/iso2txt ${DATADIR} - cd ${WRKSRC}; ${INSTALL_PROGRAM} poll printbuffer spacefilter ${DATADIR} + .Steakconfig ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/Xpm/* ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/iso2txt ${STAGEDIR}${DATADIR} + cd ${WRKSRC}; ${INSTALL_PROGRAM} poll printbuffer spacefilter ${STAGEDIR}${DATADIR} + .include <bsd.port.mk> Copied: head/german/steak/files/patch-Poll__poll.c (from r364845, head/german/steak/files/patch-Poll:poll.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/german/steak/files/patch-Poll__poll.c Thu Aug 14 16:02:17 2014 (r364852, copy of r364845, head/german/steak/files/patch-Poll:poll.c) @@ -0,0 +1,11 @@ +--- Poll/poll.c.orig Mon Jul 29 01:35:10 2002 ++++ Poll/poll.c Sun Jan 26 10:59:31 2003 +@@ -26,7 +26,7 @@ + + + /*signal(SIGCLD, SIG_IGN);*/ +- signal(SIGCLD, parent_terminate); ++ signal(SIGCHLD, parent_terminate); + + /*printf("pid des Prozesses = %d, Parent-pid des Prozesses = %d\n\n",getpid(), getppid());*/ + Modified: head/german/steak/pkg-plist ============================================================================== --- head/german/steak/pkg-plist Thu Aug 14 15:22:00 2014 (r364851) +++ head/german/steak/pkg-plist Thu Aug 14 16:02:17 2014 (r364852) @@ -1,5 +1,5 @@ bin/steak -%%NOXSTEAK:%%bin/xsteak +%%XSTEAK%%bin/xsteak %%DATADIR%%/iso2txt %%DATADIR%%/poll %%DATADIR%%/printbuffer
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408141602.s7EG2Hr9067743>