ports/173015: [PATCH] graphics/barbecue: Update to 1.5-beta1, Tomcat 6.0, OptionsNG
nemysis
nemysis at gmx.ch
Wed Oct 24 08:40:01 UTC 2012
>Number: 173015
>Category: ports
>Synopsis: [PATCH] graphics/barbecue: Update to 1.5-beta1, Tomcat 6.0, OptionsNG
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 24 08:40:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:
- Update to 1.5-beta1
Added file(s):
- pkg-plist
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue
Makefile changed:
+COMMENT= Java barcode generator
+JARFILES= ${PORTNAME}-${DISTVERSION}.jar
+OPTIONS_DEFINE= TOMCAT6
+OPTIONS_DEFAULT= TOMCAT6
+.include <bsd.port.options.mk>
+.if defined(WITH_TOMCAT6)
Changed
post-extract:
do-install:
+.if ${PORT_OPTIONS:MTOMCAT6}
+.if ${PORT_OPTIONS:MEXAMPLES}
Port maintainer (thierry at FreeBSD.org) is cc'd.
Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
portlint -A
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
0 fatal errors and 1 warning found.
port test: clean
Build log
https://redports.org/buildarchive/20121023171844-36560/
>Fix:
--- barbecue-1.5.b1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/barbecue/Makefile ./Makefile
--- /usr/ports/graphics/barbecue/Makefile 2011-08-16 10:26:32.000000000 +0200
+++ ./Makefile 2012-10-23 19:11:22.000000000 +0200
@@ -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
+COMMENT= Java barcode generator
+
+LICENSE= BSD
RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom
@@ -20,40 +22,47 @@
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
PORTDOCS= *
-pre-everything::
-.if !defined(WITH_TOMCAT55)
- @${ECHO_MSG} '*********************************************************'
- @${ECHO_MSG} '* To use Barbecue as a servlet, define WITH_TOMCAT55. *'
- @${ECHO_MSG} '*********************************************************'
+OPTIONS_DEFINE= TOMCAT6
+OPTIONS_DEFAULT= TOMCAT6
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_TOMCAT6)
+PLIST_SUB+= TOMCAT6=""
+.else
+PLIST_SUB+= TOMCAT6="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MTOMCAT6}
+BUILD_DEPENDS+= ${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
+WEBAPPDIR= ${PREFIX}/apache-tomcat-6.0/webapps
.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}
+ ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${WEBAPPDIR}/${PORTNAME}
+ @(cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTNAME})
.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>
diff -ruN --exclude=CVS /usr/ports/graphics/barbecue/distinfo ./distinfo
--- /usr/ports/graphics/barbecue/distinfo 2011-07-03 16:11:01.000000000 +0200
+++ ./distinfo 2012-10-23 19:07:59.000000000 +0200
@@ -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
diff -ruN --exclude=CVS /usr/ports/graphics/barbecue/pkg-plist ./pkg-plist
--- /usr/ports/graphics/barbecue/pkg-plist 1970-01-01 01:00:00.000000000 +0100
+++ ./pkg-plist 2012-10-23 19:14:30.000000000 +0200
@@ -0,0 +1,95 @@
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/META-INF/MANIFEST.MF
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/LICENSE.txt
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/META-INF/MANIFEST.MF
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/Barcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/BarcodeException.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/BarcodeFactory.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/BarcodeImageHandler.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/BarcodePortlet.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/BarcodeServlet.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/BlankModule.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/CompositeModule.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/Main.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/Module.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/Modulo10.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/SeparatorModule.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/env/DefaultEnvironment.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/env/Environment.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/env/EnvironmentFactory.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/env/HeadlessEnvironment.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/env/NonAWTEnvironment.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/formatter/BarcodeFormatter.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/formatter/FormattingException.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/formatter/SVGFormatter.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/LinearBarcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/codabar/CodabarBarcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/codabar/ModuleFactory.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128/Accumulator.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128/CharBuffer.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128/Code128Barcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128/CodeChangeModule.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128/ModuleFactory.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128/ShiftModule.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code39/Code39Barcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code39/ModuleFactory.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/ean/BooklandBarcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/ean/EAN13Barcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/ean/EAN13ModuleFactory.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/ean/UCCEAN128Barcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/postnet/ModuleFactory.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/postnet/PostNetBarcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/postnet/PostNetModule.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/twoOfFive/Int2of5Barcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/twoOfFive/Int2of5ModuleFactory.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/twoOfFive/Std2of5Barcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/twoOfFive/Std2of5ModuleFactory.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/upc/ModuleFactory.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/upc/UPCABarcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/AbstractOutput.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/CenteredLabelLayout.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/DefaultLabelLayout.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/EPSOutput.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/GraphicsOutput.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/LabelLayout.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/LabelLayoutFactory.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/MarginLabelLayout.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/Output.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/OutputException.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/SVGOutput.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output/SizingOutput.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/twod/pdf417/PDF417Barcode.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/twod/pdf417/PDF417Data.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/twod/pdf417/PDF417Module.class
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/lib/jdom.jar
+%%TOMCAT6%%apache-tomcat-6.0/webapps/barbecue/WEB-INF/web.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Example.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/PrintingExample.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/servlet-parameters.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/using-the-servlet.txt
+share/java/classes/barbecue.jar
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/lib
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/twod/pdf417
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/twod
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/postnet
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/output
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/upc
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/twoOfFive
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/postnet
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/ean
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code39
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/code128
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear/codabar
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/linear
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/formatter
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue/env
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge/barbecue
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net/sourceforge
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/net
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes/META-INF
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF/classes
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/WEB-INF
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue/META-INF
+%%TOMCAT6%%@dirrm apache-tomcat-6.0/webapps/barbecue
+%%TOMCAT6%%@dirrmtry apache-tomcat-6.0/webapps
+%%TOMCAT6%%@dirrmtry apache-tomcat-6.0
--- barbecue-1.5.b1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list