Index: branches/2017Q4/archivers/arj/Makefile =================================================================== --- branches/2017Q4/archivers/arj/Makefile (revision 452585) +++ branches/2017Q4/archivers/arj/Makefile (revision 452586) @@ -1,46 +1,62 @@ # Created by: Konstantin Reznichenko # $FreeBSD$ PORTNAME= arj PORTVERSION= 3.10.22 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= archivers -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.78_3.10%20build%2022 +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.78_3.10%20build%2022:source \ + DEBIAN_POOL:patch +DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz:source \ + ${PORTNAME}_${PORTVERSION}-16.debian.tar.xz:patch MAINTAINER= garga@FreeBSD.org COMMENT= Open source implementation of the ARJ archiver LICENSE= GPLv2 PORTSCOUT= skipv:3.10g +EXTRA_PATCHES= ${WRKDIR}/debian/patches/*.patch +IGNORE_PATCHES= 002_no_remove_static_const.patch \ + doc_refer_robert_k_jung.patch \ + gnu_build_cross.patch \ + gnu_build_fix.patch \ + gnu_build_flags.patch \ + gnu_build_pie.patch \ + gnu_build_strip.patch \ + hurd_no_fcntl_getlk.patch +PATCH_STRIP= -p1 + USES= alias gmake USE_AUTOTOOLS= autoconf CONFIGURE_WRKSRC= ${WRKSRC}/gnu MAKEFILE= GNUmakefile MAKE_ARGS= LOCALE="${LANGUAGE}" ALL_TARGET= prepare all STRIP= # empty -MAKE_JOBS_UNSAFE= yes CFLAGS+= -fPIC LANGUAGE?= en PORTDOCS= * OPTIONS_DEFINE= DOCS + +pre-patch: + @${RM} ${IGNORE_PATCHES:S,^,${WRKDIR}/debian/patches/,} post-patch: @${REINPLACE_CMD} -e 's!/etc!${LOCALBASE}/etc!' \ ${WRKSRC}/arj.c ${WRKSRC}/file_reg.c ${WRKSRC}/rearj.c @${REINPLACE_CMD} -e 's!-O2!!' ${WRKSRC}/gnu/configure.in @${REINPLACE_CMD} -e 's!^static !!' ${WRKSRC}/integr.c post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} COPYING debug.txt \ ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/resource/en && ${INSTALL_DATA} arjl.txt arjs.txt \ history.txt readme.txt unix.txt ${STAGEDIR}${DOCSDIR} .include Index: branches/2017Q4/archivers/arj/distinfo =================================================================== --- branches/2017Q4/archivers/arj/distinfo (revision 452585) +++ branches/2017Q4/archivers/arj/distinfo (revision 452586) @@ -1,2 +1,5 @@ +TIMESTAMP = 1508345026 SHA256 (arj-3.10.22.tar.gz) = 589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db SIZE (arj-3.10.22.tar.gz) = 431467 +SHA256 (arj_3.10.22-16.debian.tar.xz) = 2d9cc5aeb2ac44d000d2e3399846f1c3ce468e17e3af4bfb505b9a6eaf88a502 +SIZE (arj_3.10.22-16.debian.tar.xz) = 19452 Index: branches/2017Q4/archivers/arj/files/patch-arj__proc.c =================================================================== --- branches/2017Q4/archivers/arj/files/patch-arj__proc.c (revision 452585) +++ branches/2017Q4/archivers/arj/files/patch-arj__proc.c (nonexistent) @@ -1,80 +0,0 @@ ---- arj_proc.c.orig 2005-06-21 19:53:12 UTC -+++ arj_proc.c -@@ -585,7 +585,7 @@ int search_for_extension(char *name, cha - /* Returns the exact amount of data that could be safely written to the - destination volume */ - --unsigned long get_volfree(unsigned int increment) -+unsigned long get_volfree(unsigned long increment) - { - unsigned long pvol; - unsigned int arjsec_overhead; -@@ -605,7 +605,7 @@ unsigned long get_volfree(unsigned int i - remain=volume_limit-ftell(aostream)-pvol-(long)arjsec_overhead- - (long)out_bytes-(long)cpos-(long)ext_voldata- - MULTIVOLUME_RESERVE-t_volume_offset; -- return((unsigned long)min(remain, (unsigned long)increment)); -+ return((unsigned long)min(remain, increment)); - } - - /* Performs various checks when multivolume data is packed to predict an -@@ -2466,14 +2466,14 @@ static int get_str_from_jq() - *tsptr='\0'; - endptr=tsptr; - tsptr=sptr; -- while((unsigned int)tsptr<(unsigned int)endptr&&patterns>8 , p+1); -@@ -2931,7 +2931,7 @@ void mput_word(unsigned int w, char FAR - - /* Model-independent routine to store 4 bytes in far RAM */ - --void mput_dword(unsigned long d, char FAR *p) -+void mput_dword(uint32_t d, char FAR *p) - { - mput_word(d&0xFFFF, p); - mput_word(d>>16 , p+2); Property changes on: branches/2017Q4/archivers/arj/files/patch-arj__proc.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q4/archivers/arj/files/patch-arj__proc.h =================================================================== --- branches/2017Q4/archivers/arj/files/patch-arj__proc.h (revision 452585) +++ branches/2017Q4/archivers/arj/files/patch-arj__proc.h (nonexistent) @@ -1,50 +0,0 @@ ---- arj_proc.h.orig 2004-01-25 10:39:30 UTC -+++ arj_proc.h -@@ -8,15 +8,17 @@ - #ifndef ARJ_PROC_INCLUDED - #define ARJ_PROC_INCLUDED - -+#include -+ - /* Helper macros */ - --#define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF) --#define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c) -+#define mget_byte(p) (*(uint8_t FAR *)(p)&0xFF) -+#define mput_byte(c, p) *(uint8_t FAR *)(p)=(uint8_t)(c) - #ifndef WORDS_BIGENDIAN --#define mget_word(p) (*(unsigned short *)(p)&0xFFFF) --#define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w)) --#define mget_dword(p) (*(unsigned long *)(p)) --#define mput_dword(w,p) (*(unsigned long *)(p)=(unsigned long)(w)) -+#define mget_word(p) (*(uint16_t *)(p)&0xFFFF) -+#define mput_word(w,p) (*(uint16_t *)(p)=(uint16_t)(w)) -+#define mget_dword(p) (*(uint32_t *)(p)) -+#define mput_dword(w,p) (*(uint32_t *)(p)=(uint32_t)(w)) - #endif - - /* Prototypes */ -@@ -31,7 +33,7 @@ void copy_bytes(unsigned long nbytes); - int translate_path(char *name); - void restart_proc(char *dest); - int search_for_extension(char *name, char *ext_list); --unsigned long get_volfree(unsigned int increment); -+unsigned long get_volfree(unsigned long increment); - unsigned int check_multivolume(unsigned int increment); - void store(); - void hollow_encode(); -@@ -61,10 +63,10 @@ void unpack_mem(struct mempack *mempack) - void strip_lf(char *str); - char *ltrim(char *str); - #ifdef WORDS_BIGENDIAN --unsigned int mget_word(char FAR *p); --unsigned long mget_dword(char FAR *p); --void mput_word(unsigned int w, char FAR *p); --void mput_dword(unsigned long d, char FAR *p); -+uint16_t mget_word(char FAR *p); -+uint32_t mget_dword(char FAR *p); -+void mput_word(uint16_t w, char FAR *p); -+void mput_dword(uint32_t d, char FAR *p); - #endif - - #endif Property changes on: branches/2017Q4/archivers/arj/files/patch-arj__proc.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q4/archivers/arj/files/patch-fardata.c =================================================================== --- branches/2017Q4/archivers/arj/files/patch-fardata.c (revision 452585) +++ branches/2017Q4/archivers/arj/files/patch-fardata.c (nonexistent) @@ -1,29 +0,0 @@ ---- fardata.c.orig 2004-04-17 11:39:42 UTC -+++ fardata.c -@@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, .. - - /* Length-limited strlen() */ - --static int strnlen(const char FAR *s, int count) -+static int _strnlen(const char FAR *s, int count) - { - const char FAR *sc; - -@@ -569,7 +569,7 @@ int vcprintf(int ccode, FMSG *fmt, va_li - if(!s) - s="(null)"; - #endif -- len=strnlen(s, precision); -+ len=_strnlen(s, precision); - if(!(flags&LEFT)) - { - while(lentm_year+1900, stm->tm_mon+1, stm->tm_mday, + stm->tm_hour, stm->tm_min, stm->tm_sec)); + } Property changes on: branches/2017Q4/archivers/arj/files/patch-arjtypes.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 452585) +++ branches/2017Q4 (revision 452586) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r452421