On 2011-05-13, Christopher Zimmermann <madro...@zakweb.de> wrote: > So, heres the finished pdftk port. > > One last thing I'm uncertain about is whether to specify -O2 in GCJFLAGS > or rather not do so. Compile time gets about factor 10x slower, but > binary size is reduced from ~8M to ~3.5M.
Here's a diff on top. I'm using the system definitions for some of the variables and defaulting GCJFLAGS to CXXFLAGS and picking up opt values that way. Also added WANTLIB. Systrace problem doesn't affect the build and also affects classpath so should probably be looked at in the gcc port and/or module sometime, that's not a showstopper. But we need a change to gcc4.port.mk so the LIB_DEPENDS for the gcj lib can be added in the module rather than hardcoded in the ports using it (I've done that temporarily here but it's wrong). So I'll send a new tar.gz after I've looked at that. diff -uNp -r pdftk.orig/Makefile pdftk/Makefile --- pdftk.orig/Makefile Fri May 13 13:43:45 2011 +++ pdftk/Makefile Fri May 13 17:01:11 2011 @@ -11,15 +11,18 @@ MAINTAINER= Christopher Zimmermann <madro...@zakweb.or DISTFILES= $(DISTNAME)-src.zip MASTER_SITES= http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ -# GPL +# GPLv2+ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +WANTLIB += c gcj m pthread z + MODULES= converters/libiconv gcc4 MODGCC4_ARCHES= * MODGCC4_LANGS= java c++ +LIB_DEPENDS= gcj->=4.2,<4.3|gcj->=4.2v0,<4.3v0:lang/gcc/4.2,-java,java WRKDIST= ${WRKDIR}/$(DISTNAME)-dist WRKSRC= $(WRKDIST)/pdftk @@ -27,16 +30,12 @@ WRKSRC= $(WRKDIST)/pdftk USE_GMAKE= Yes MAKE_FILE= Makefile.Base +GCJ?= gcj +GCJH?= gcjh +GJAR?= ejar -CXX= g++ -GCJ= gcj -GCJH= gcjh -GJAR= ejar -AR= ar -RM= rm - CONFIG= $(MACHINE)-unknown-openbsd$(OSREV) -GCJFLAGS= -O2 +GCJFLAGS?= ${CXXFLAGS} CPPFLAGS+= -fdollars-in-identifiers \ -DPATH_DELIM=0x2f \ -DASK_ABOUT_WARNINGS=false \ @@ -44,7 +43,6 @@ CPPFLAGS+= -fdollars-in-identifiers \ -I$(LOCALBASE)/include/c++/4.2.4 \ -I$(LOCALBASE)/lib/gcc/$(CONFIG)/4.2.4/include CXXFLAGS+= -L$(LOCALBASE)/lib -ARFLAGS+= rs LDLIBS+= -lgcj -liconv -lz -pthread MAKE_ENV+= CXX="$(CXX)" \ @@ -52,13 +50,12 @@ MAKE_ENV+= CXX="$(CXX)" \ GCJH="$(GCJH)" \ GJAR="$(GJAR)" \ AR="$(AR)" \ - RM="$(RM)" \ + RM=rm \ GCJFLAGS="$(GCJFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" \ CXXFLAGS="$(CXXFLAGS)" \ - ARFLAGS="$(ARFLAGS)" \ + ARFLAGS="${ARFLAGS} rs" \ LDLIBS="$(LDLIBS)" - do-install: $(INSTALL_PROGRAM) $(WRKSRC)/pdftk $(PREFIX)/bin > > Please commit? > > Christopher > > --------------050803020300050605020308 > Content-Type: application/octet-stream; name="pdftk.tgz" > Content-Disposition: attachment; filename="pdftk.tgz" > Content-Transfer-Encoding: base64 > > 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 > yzXpY/Xnn8s97GEPe9jDHl4T/gsmY+lpACgAAA== > --------------050803020300050605020308-- > >
