Date: Mon, 18 Nov 2013 06:00:29 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334146 - in head/games/cake: . files Message-ID: <201311180600.rAI60TTt048186@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Nov 18 06:00:29 2013 New Revision: 334146 URL: http://svnweb.freebsd.org/changeset/ports/334146 Log: - Modernize LIB_DEPENDS syntax, sort the knobs - Stagify, cleanup patch-Makefile, drop MAKE_ARGS Modified: head/games/cake/Makefile head/games/cake/files/patch-Makefile Modified: head/games/cake/Makefile ============================================================================== --- head/games/cake/Makefile Mon Nov 18 05:53:34 2013 (r334145) +++ head/games/cake/Makefile Mon Nov 18 06:00:29 2013 (r334146) @@ -13,19 +13,18 @@ COMMENT= Quake3 map viewer (and powerful LICENSE= GPLv2 -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg -USE_XORG= x11 xext xmu xt xi sm ice +USES= gmake USE_GL= glut +USE_XORG= x11 xext xmu xt xi sm ice +USE_ZIP= yes # Need to pass `-l', but PATCH_ARGS+= won't work because of PATCH_ARGS?= # in bsd.port.mk PATCH_ARGS= -d ${PATCH_WRKSRC} -N -s -E ${PATCH_STRIP} -l -USE_GMAKE= yes -USE_ZIP= yes ALL_TARGET= main -MAKE_ARGS+= CXX=${CXX} PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC= ${WRKDIR}/cake_src PLIST_FILES= bin/cake @@ -46,13 +45,7 @@ post-patch: .SILENT # Fix for GCC 4.x ${REINPLACE_CMD} -e 's/Mat3x2:://' ${WRKSRC}/cake/math.h -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/main ${PREFIX}/bin/cake - -post-install: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} + ${INSTALL_PROGRAM} ${WRKSRC}/main ${STAGEDIR}${PREFIX}/bin/cake .include <bsd.port.mk> Modified: head/games/cake/files/patch-Makefile ============================================================================== --- head/games/cake/files/patch-Makefile Mon Nov 18 05:53:34 2013 (r334145) +++ head/games/cake/files/patch-Makefile Mon Nov 18 06:00:29 2013 (r334146) @@ -8,12 +8,12 @@ -LDFLAGS += -L/usr/lib -L/usr/local/lib -lglut -lGLU -lGL -L/usr/X11R6/lib -lm -ldl -LDFLAGS += -lpthread -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -LDFLAGS += -lcurses -ljpeg -lz -lfmod-3.63 -+INCLUDES = -I/usr/include -I$(LOCALBASE)/include ++INCLUDES = -I$(LOCALBASE)/include +CXX ?= g++ +CXXFLAGS += -Wall $(INCLUDES) + -+LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lglut -lGLU -lGL -+LDFLAGS += $(PTHREAD_LIBS) -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE ++LDFLAGS += -L$(LOCALBASE)/lib -lglut -lGLU -lGL ++LDFLAGS += -pthread -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE +#LDFLAGS += -lcurses -ljpeg -lz -lfmod-3.63 +LDFLAGS += -ljpeg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311180600.rAI60TTt048186>