Skip to content

Commit

Permalink
devel/bsddialog: Update to 0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
alfonsosiciliano committed Apr 22, 2022
1 parent 9c80943 commit 5df7b7f
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 100 deletions.
19 changes: 16 additions & 3 deletions devel/bsddialog/Makefile
@@ -1,5 +1,5 @@
PORTNAME= bsddialog
PORTVERSION= 0.0.0.g20211213
PORTVERSION= 0.2
CATEGORIES= devel

MAINTAINER= bapt@FreeBSD.org
Expand All @@ -9,7 +9,20 @@ LICENSE= BSD2CLAUSE

USE_GITLAB= yes
GL_ACCOUNT= alfix
GL_COMMIT= 98afee468ccd515c9082dc668f80092ca4553825
GL_COMMIT= c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c

.include <bsd.port.mk>
LIBDIR= ${WRKSRC}/lib
HEADERS= ${LIBDIR}/bsddialog.h \
${LIBDIR}/bsddialog_progressview.h \
${LIBDIR}/bsddialog_theme.h

do-install:
${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/include
${INSTALL_LIB} ${LIBDIR}/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/
${INSTALL} -l rs ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
${INSTALL_DATA} ${LIBDIR}/lib${PORTNAME}.a ${STAGEDIR}/${PREFIX}/lib
${INSTALL_MAN} ${LIBDIR}/${PORTNAME}.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/

.include <bsd.port.mk>
6 changes: 3 additions & 3 deletions devel/bsddialog/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1642434705
SHA256 (alfix-bsddialog-98afee468ccd515c9082dc668f80092ca4553825_GL0.tar.gz) = 9e1e64137b9c93e1c305e8a9f17e5fc16984fe797a0c90b036a3bbbdf4583b67
SIZE (alfix-bsddialog-98afee468ccd515c9082dc668f80092ca4553825_GL0.tar.gz) = 51722
TIMESTAMP = 1649359564
SHA256 (alfix-bsddialog-c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c_GL0.tar.gz) = af5fd0a4cca5f109e6bdcc0d7a6ac73e4f959c50056e6f331c52899036cc2bc7
SIZE (alfix-bsddialog-c4b7fed3cd5ce3b6a5aa77ff194e0a86f830bf4c_GL0.tar.gz) = 60929
40 changes: 7 additions & 33 deletions devel/bsddialog/files/patch-Makefile
@@ -1,37 +1,11 @@
--- Makefile.orig 2021-11-22 01:09:04 UTC
--- Makefile.orig 2022-04-07 21:39:48 UTC
+++ Makefile
@@ -7,15 +7,15 @@ OUTPUT= bsddialog
SOURCES= bsddialog.c
OBJECTS= ${SOURCES:.c=.o}
LIBPATH= ${.CURDIR}/lib
-LIBBSDDIALOG= ${LIBPATH}/libbsddialog.so
+LIBBSDDIALOG= ${LIBPATH}/libbsddialog.a

-CFLAGS= -Wall -I${LIBPATH}
-LDFLAGS= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
+CFLAGS+= -Wall -I${LIBPATH}
@@ -15,7 +15,7 @@ CFLAGS+= -I${LIBPATH} -std=gnu99 -Wall -Wextra -Werror
CFLAGS= -g -Wall -I${LIBPATH}
LIBDEBUG= -DDEBUG
.endif
-LDFLAGS+= -Wl,-rpath=${LIBPATH} -L${LIBPATH} -lbsddialog
+LDFLAGS+= -L${LIBPATH} -lbsddialog

-BINDIR= /usr/local/bin
+BINDIR= ${PREFIX}/bin
BINDIR= /usr/local/bin
MAN= ${OUTPUT}.1
GZIP= gzip -cn
-MANDIR= /usr/local/share/man/man1
+MANDIR= ${PREFIX}/share/man/man1

INSTALL= install
RM= rm -f
@@ -36,9 +36,10 @@ ${LIBBSDDIALOG}:
${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}

install:
- ${INSTALL} -s -m 555 ${OUTPUT} ${BINDIR}
- ${GZIP} ${MAN} > ${MAN}.gz
- ${INSTALL} -m 444 ${MAN}.gz ${MANDIR}
+ ${INSTALL} -s -m 555 ${OUTPUT} ${DESTDIR}${BINDIR}
+ ${MAKE} -C ${LIBPATH} install
+ #${GZIP} ${MAN} > ${MAN}.gz
+ #${INSTALL} -m 444 ${MAN}.gz ${DESTDIR}${MANDIR}

unistall:
${RM} ${BINDIR}/${OUTPUT}
60 changes: 0 additions & 60 deletions devel/bsddialog/files/patch-lib_Makefile

This file was deleted.

5 changes: 4 additions & 1 deletion devel/bsddialog/pkg-plist
@@ -1,6 +1,9 @@
bin/bsddialog
include/bsddialog.h
include/bsddialog_progressview.h
include/bsddialog_theme.h
lib/libbsddialog.a
lib/libbsddialog.so
lib/libbsddialog.so.0.0.1
lib/libbsddialog.so.0.2
man/man1/bsddialog.1.gz
man/man3/bsddialog.3.gz

0 comments on commit 5df7b7f

Please sign in to comment.