From 2035d13f50150f932d2ad14aa624bcbbbd03effa Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 3 Jul 2014 17:28:39 +0000 Subject: [PATCH] - Switch to USES=libtool, drop .la files - Strip libraries - Stagify - Remove overcomplicated examples handling - if needed, these should be provided as a separate port --- graphics/quesa/Makefile | 55 ++++------------------------------------ graphics/quesa/pkg-plist | 22 +--------------- 2 files changed, 6 insertions(+), 71 deletions(-) diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile index 8ac81618c826..9a3a23702c76 100644 --- a/graphics/quesa/Makefile +++ b/graphics/quesa/Makefile @@ -3,69 +3,24 @@ PORTNAME= quesa PORTVERSION= 1.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF -.ifdef (WITH_EXAMPLES) -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${PORTNAME}examples-${PORTVERSION}${EXTRACT_SUFX} -.endif MAINTAINER= ports@FreeBSD.org COMMENT= High level 3D graphics library compatible with Apple's QuickDraw(TM) -USE_AUTOTOOLS= libtool +USES= libtool +GNU_CONFIGURE= yes USE_GL= glut USE_XORG= x11 ice xmu xi -.ifdef (WITH_EXAMPLES) -USE_GNOME= gtk12 -.endif +INSTALL_TARGET= install-strip USE_LDCONFIG= yes -WRKSRC_EXAMPLES= ${WRKDIR}/${PORTNAME}examples-${PORTVERSION} - -NO_STAGE= yes -.include - -.if !defined (WITH_EXAMPLES) -PLIST_SUB= WITH_EXAMPLES="@comment " -.else -PLIST_SUB= WITH_EXAMPLES="" -.endif - -.ifndef (WITH_EXAMPLES) -pre-everything:: - @${ECHO_CMD} "" - @${ECHO_CMD} "Define WITH_EXAMPLES=yes to build and install Quesa example programs" - @${ECHO_CMD} "" -.endif - -.ifdef (WITH_EXAMPLES) -post-patch: - @${REINPLACE_CMD} -e 's|-I/usr/local/include/quesa|-I${WRKSRC}/APIincludes|g; \ - s|-L/usr/local/lib|-L${LOCALBASE}/lib -L${WRKSRC}|g; \ - s|prefix = /usr/local/Quesa|prefix = ${EXAMPLESDIR}|' \ - ${WRKSRC_EXAMPLES}/Makefile.in -.endif - pre-configure: @${REINPLACE_CMD} -e 's|-std=c99||g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|isfinite|finite|g' \ ${WRKSRC}/Source/Core/System/E3IOData.c \ ${WRKSRC}/Source/Core/System/E3View.c -.ifdef (WITH_EXAMPLES) -post-configure: - cd ${WRKSRC_EXAMPLES} && \ - ${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} - -post-build: - cd ${WRKSRC_EXAMPLES} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET} - -post-install: - cd ${WRKSRC_EXAMPLES} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} -.endif - -.include +.include diff --git a/graphics/quesa/pkg-plist b/graphics/quesa/pkg-plist index 6ff3c9a104f0..9188fb4266d0 100644 --- a/graphics/quesa/pkg-plist +++ b/graphics/quesa/pkg-plist @@ -23,27 +23,7 @@ include/quesa/QuesaTransform.h include/quesa/QuesaView.h include/quesa/QuesaViewer.h lib/libquesa.a -lib/libquesa.la lib/libquesa.so lib/libquesa.so.0 -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/1.tga -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/2.tga -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/3.tga -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/4.tga -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/5.tga -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/6.tga -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Images/Quesa.tga -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Models/F15.3dmf -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Models/F18.3dmf -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Models/PodRacer.3dmf -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/Models/QuesaLogo.3dmf -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/bin/cameratest -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/bin/dumpgroup -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/bin/geomtest -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/bin/importtest -%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/bin/lighttest -%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/bin -%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Models -%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/Images -%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%% +lib/libquesa.so.0.0.0 @dirrm include/quesa