svn commit: r306555 - head/graphics/barbecue
Thierry Thomas
thierry at FreeBSD.org
Sun Oct 28 16:03:55 UTC 2012
Author: thierry
Date: Sun Oct 28 16:03:54 2012
New Revision: 306555
URL: http://svn.freebsd.org/changeset/ports/306555
Log:
- Update to 1.5-beta1;
- Optionify;
- Adding support for Tomcat6 and Tomcat7.
+ Release maintainership.
PR: ports/173015
Submitted by: nemysis (at) gmx.ch
Feature safe: yes
Added:
head/graphics/barbecue/pkg-plist (contents, props changed)
Modified:
head/graphics/barbecue/Makefile (contents, props changed)
head/graphics/barbecue/distinfo (contents, props changed)
Modified: head/graphics/barbecue/Makefile
==============================================================================
--- head/graphics/barbecue/Makefile Sun Oct 28 15:33:09 2012 (r306554)
+++ head/graphics/barbecue/Makefile Sun Oct 28 16:03:54 2012 (r306555)
@@ -6,13 +6,15 @@
#
PORTNAME= barbecue
-PORTVERSION= 1.0.6d
-PORTREVISION= 4
+DISTVERSION= 1.5-beta1
CATEGORIES= graphics print java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}/
+DIST_SUBDIR= java
-MAINTAINER= thierry at FreeBSD.org
-COMMENT= A Java barcode generator
+MAINTAINER= ports at FreeBSD.org
+COMMENT= Java barcode generator
+
+LICENSE= BSD
RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom
@@ -20,40 +22,57 @@ USE_JAVA= yes
JAVA_VERSION= 1.5+
NO_BUILD= yes
-JARFILES= ${PORTNAME}-${PORTVERSION}.jar
-PLIST_FILES+= %%JAVAJARDIR%%/${JARFILES:S|-${PORTVERSION}||} \
- %%JAVAJARDIR%%/LICENSE.barbecue.txt
-
-.if defined(WITH_TOMCAT55)
-RUN_DEPENDS+= ${LOCALBASE}/tomcat5.5/bin/bootstrap.jar:${PORTSDIR}/www/tomcat55
-JAKARTA_HOME= ${LOCALBASE}/tomcat5.5
-PLIST_FILES+= ${JAKARTA_HOME:S|^${LOCALBASE}/||}/webapps/${PORTNAME}.war
-.endif
+JARFILES= ${PORTNAME}-${DISTVERSION}.jar
+
+TOMCATDIR= ${PREFIX}/${TOMCATVER}
+APPHOME= ${LOCALBASE}/${TOMCATVER}
+WEBAPPDIR= ${TOMCATDIR}/webapps
PORTDOCS= *
+PORTEXAMPLES= *
+
+PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||}
+
+OPTIONS_SINGLE= AS
+OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7
+OPTIONS_DEFAULT= TOMCAT6
+
+.include <bsd.port.options.mk>
-pre-everything::
-.if !defined(WITH_TOMCAT55)
- @${ECHO_MSG} '*********************************************************'
- @${ECHO_MSG} '* To use Barbecue as a servlet, define WITH_TOMCAT55. *'
- @${ECHO_MSG} '*********************************************************'
+.if ${PORT_OPTIONS:MTOMCAT6}
+TOMCATVER= apache-tomcat-6.0
+BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+.endif
+
+.if ${PORT_OPTIONS:MTOMCAT7}
+TOMCATVER= apache-tomcat-7.0
+BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
+RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
.endif
post-extract:
- ${MV} ${WRKSRC}/${JARFILES} ${WRKSRC}/${JARFILES:S|-${PORTVERSION}||}
+ ${MV} ${WRKSRC}/${JARFILES} ${WRKSRC}/${JARFILES:S|-${DISTVERSION}||}
+ ${MKDIR} ${WRKDIR}/${PORTNAME}
+ ${TAR} xf ${WRKSRC}/${PORTNAME}.war -C ${WRKDIR}/${PORTNAME}
do-install:
- ${INSTALL_DATA} ${JARFILES:S|-${PORTVERSION}||:S|^|${WRKSRC}/|} ${JAVAJARDIR}
- ${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${JAVAJARDIR}/LICENSE.barbecue.txt
-.if defined(WITH_TOMCAT55)
- ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.war ${JAKARTA_HOME}/webapps
+ ${INSTALL_DATA} ${JARFILES:S|-${DISTVERSION}||:S|^|${WRKSRC}/|} ${JAVAJARDIR}
+
+.if ${PORT_OPTIONS:MTOMCAT6} || ${PORT_OPTIONS:MTOMCAT7}
+ ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${WEBAPPDIR}/${PORTNAME}
+ (cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTNAME})
+ ${TOUCH} ${WEBAPPDIR}/${PORTNAME}/WEB-INF/classes/net/sourceforge/barbecue/postnet/.empty
.endif
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
- @${CP} -R ${WRKSRC}/docs/* ${DOCSDIR}
- @${CP} -R ${WRKSRC}/examples ${DOCSDIR}
- @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
+ (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR})
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+ (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
.endif
.include <bsd.port.mk>
Modified: head/graphics/barbecue/distinfo
==============================================================================
--- head/graphics/barbecue/distinfo Sun Oct 28 15:33:09 2012 (r306554)
+++ head/graphics/barbecue/distinfo Sun Oct 28 16:03:54 2012 (r306555)
@@ -1,2 +1,2 @@
-SHA256 (barbecue-1.0.6d.tar.gz) = 48868ecde3570b9c9c62684199d8a5d1c4954ef78f16ad9d740756bfbb2189ae
-SIZE (barbecue-1.0.6d.tar.gz) = 421847
+SHA256 (java/barbecue-1.5-beta1.tar.gz) = 500421de383b2f0867fe039f22077c45850e7fe581608fb25bd3899b4a870a17
+SIZE (java/barbecue-1.5-beta1.tar.gz) = 641262
Added: head/graphics/barbecue/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/barbecue/pkg-plist Sun Oct 28 16:03:54 2012 (r306555)
@@ -0,0 +1,91 @@
+%%TOMCATDIR%%/webapps/barbecue/META-INF/MANIFEST.MF
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/LICENSE.txt
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/META-INF/MANIFEST.MF
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/Barcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/BarcodeException.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/BarcodeFactory.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/BarcodeImageHandler.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/BarcodePortlet.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/BarcodeServlet.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/BlankModule.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/CompositeModule.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/Main.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/Module.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/Modulo10.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/SeparatorModule.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/env/DefaultEnvironment.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/env/Environment.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/env/EnvironmentFactory.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/env/HeadlessEnvironment.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/env/NonAWTEnvironment.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/formatter/BarcodeFormatter.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/formatter/FormattingException.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/formatter/SVGFormatter.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/LinearBarcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/codabar/CodabarBarcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/codabar/ModuleFactory.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128/Accumulator.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128/CharBuffer.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128/Code128Barcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128/CodeChangeModule.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128/ModuleFactory.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128/ShiftModule.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code39/Code39Barcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code39/ModuleFactory.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/ean/BooklandBarcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/ean/EAN13Barcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/ean/EAN13ModuleFactory.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/ean/UCCEAN128Barcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/postnet/ModuleFactory.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/postnet/PostNetBarcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/postnet/PostNetModule.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/twoOfFive/Int2of5Barcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/twoOfFive/Int2of5ModuleFactory.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/twoOfFive/Std2of5Barcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/twoOfFive/Std2of5ModuleFactory.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/upc/ModuleFactory.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/upc/UPCABarcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/AbstractOutput.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/CenteredLabelLayout.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/DefaultLabelLayout.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/EPSOutput.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/GraphicsOutput.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/LabelLayout.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/LabelLayoutFactory.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/MarginLabelLayout.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/Output.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/OutputException.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/SVGOutput.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/SizingOutput.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/postnet/.empty
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/twod/pdf417/PDF417Barcode.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/twod/pdf417/PDF417Data.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/twod/pdf417/PDF417Module.class
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/lib/jdom.jar
+%%TOMCATDIR%%/webapps/barbecue/WEB-INF/web.xml
+share/java/classes/barbecue.jar
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/lib
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/twod/pdf417
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/twod
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/postnet
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/upc
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/twoOfFive
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/postnet
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/ean
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code39
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/codabar
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/formatter
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/env
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net/sourceforge
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/net
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes/META-INF
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF/classes
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/WEB-INF
+ at dirrm %%TOMCATDIR%%/webapps/barbecue/META-INF
+ at dirrm %%TOMCATDIR%%/webapps/barbecue
+ at dirrmtry %%TOMCATDIR%%/webapps
+ at dirrmtry %%TOMCATDIR%%
More information about the svn-ports-head
mailing list